Merge branch 'main' into athenaz/texsize_in_sdf

gazebosim · Aug 13, 2024 · db34426 · db34426
2 parents 019b011 + c4f3ddc
commit db34426
Show file tree

Hide file tree

Showing 92 changed files with 898 additions and 1,031 deletions.
diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt
@@ -1,12 +1,12 @@
-libgz-cmake3-dev
-libgz-common5-dev
-libgz-math7-dev
-libgz-msgs10-dev
-libgz-plugin2-dev
-libgz-rendering8-dev
+libgz-cmake4-dev
+libgz-common6-dev
+libgz-math8-dev
+libgz-msgs11-dev
+libgz-plugin3-dev
+libgz-rendering9-dev
 libgz-tools2-dev
-libgz-transport13-dev
-libgz-utils2-dev
+libgz-transport14-dev
+libgz-utils3-dev
 libprotobuf-dev
 libprotoc-dev
 libtinyxml2-dev

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,12 +3,12 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-gui8 VERSION 8.3.0)
+project(gz-gui9 VERSION 9.0.0)
 
 #============================================================================
 # Find gz-cmake
 #============================================================================
-find_package(gz-cmake3 REQUIRED)
+find_package(gz-cmake4 REQUIRED)
 
 #============================================================================
 # Configure the project
@@ -40,38 +40,38 @@ gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2)
 
 #--------------------------------------
 # Find gz-utils
-gz_find_package(gz-utils2 REQUIRED)
-set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
+gz_find_package(gz-utils3 REQUIRED)
+set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-math
-gz_find_package(gz-math7 REQUIRED)
-set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
+gz_find_package(gz-math8 REQUIRED)
+set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-common
-gz_find_package(gz-common5 REQUIRED COMPONENTS profiler)
-set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
+gz_find_package(gz-common6 REQUIRED COMPONENTS profiler)
+set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-plugin
-gz_find_package(gz-plugin2 REQUIRED COMPONENTS loader register)
-set(GZ_PLUGIN_VER ${gz-plugin2_VERSION_MAJOR})
+gz_find_package(gz-plugin3 REQUIRED COMPONENTS loader register)
+set(GZ_PLUGIN_VER ${gz-plugin3_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-transport
-gz_find_package(gz-transport13 REQUIRED)
-set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
+gz_find_package(gz-transport14 REQUIRED)
+set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-rendering
-gz_find_package(gz-rendering8 REQUIRED)
-set(GZ_RENDERING_VER ${gz-rendering8_VERSION_MAJOR})
+gz_find_package(gz-rendering9 REQUIRED)
+set(GZ_RENDERING_VER ${gz-rendering9_VERSION_MAJOR})
 
 #--------------------------------------
 # Find gz-msgs
-gz_find_package(gz-msgs10 REQUIRED)
-set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
+gz_find_package(gz-msgs11 REQUIRED)
+set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
 
 # Find if command is available. This is used to enable tests.
 # Note that CLI files are installed regardless of whether the dependency is
@@ -81,15 +81,20 @@ set(GZ_TOOLS_VER 2)
 
 #--------------------------------------
 # Find QT
-gz_find_package (Qt5
+set(QT_MAJOR_VERSION 5)
+set(QT_MINOR_VERSION 15)
+gz_find_package (Qt${QT_MAJOR_VERSION}
+  VERSION ${QT_MAJOR_VERSION}.${QT_MINOR_VERSION}
   COMPONENTS
     Core
     Quick
     QuickControls2
     Widgets
+    Test
   REQUIRED
-  PKGCONFIG "Qt5Core Qt5Quick Qt5QuickControls2 Qt5Widgets"
-)
+  PKGCONFIG_VER_COMPARISON >=
+  PKGCONFIG "Qt${QT_MAJOR_VERSION}Core Qt${QT_MAJOR_VERSION}Quick Qt${QT_MAJOR_VERSION}QuickControls2 Qt${QT_MAJOR_VERSION}Widgets")
+add_compile_definitions(QT_DISABLE_DEPRECATED_UP_TO=0x050F00)
 
 set(GZ_GUI_PLUGIN_RELATIVE_INSTALL_DIR
   ${GZ_LIB_INSTALL_DIR}/gz-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+## Gazebo GUI 9
+
+### Gazebo GUI 9.0.0 (2023-XX-XX)
+
 ## Gazebo GUI 8
 
 ### Gazebo GUI 8.3.0 (2024-06-20)

diff --git a/README.md b/README.md
@@ -9,10 +9,10 @@
 
 Build | Status
 -- | --
-Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-gui/tree/gz-gui8/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-gui/tree/gz-gui8)
-Ubuntu Jammy  | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-ci-gz-gui8-jammy-amd64)](https://build.osrfoundation.org/job/gz_gui-ci-gz-gui8-jammy-amd64)
-Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-ci-gz-gui8-homebrew-amd64)](https://build.osrfoundation.org/job/gz_gui-ci-gz-gui8-homebrew-amd64)
-Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=gz_gui-8-win)](https://build.osrfoundation.org/job/gz_gui-8-win)
+Test coverage | [![codecov](https://codecov.io/gh/gazebosim/gz-gui/branch/main/graph/badge.svg)](https://codecov.io/gh/gazebosim/gz-gui/branch/main)
+Ubuntu Focal | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-focal-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-focal-amd64)
+Homebrew      | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ignition_gui-ci-main-homebrew-amd64)](https://build.osrfoundation.org/job/ignition_gui-ci-main-homebrew-amd64)
+Windows       | [![Build Status](https://build.osrfoundation.org/buildStatus/icon?job=ign_gui-ci-win)](https://build.osrfoundation.org/job/ign_gui-ci-win)
 
 Gazebo GUI builds on top of [Qt](https://www.qt.io/) to provide widgets which are
 useful when developing robotics applications, such as a 3D view, plots, dashboard, etc,
@@ -50,12 +50,12 @@ which can be used to add custom widgets.
 
 # Install
 
-See the [installation tutorial](https://gazebosim.org/api/gui/8/install.html).
+See the [installation tutorial](https://gazebosim.org/api/gui/9/install.html).
 
 # Usage
 
 Take a look at the
-[tutorials](https://gazebosim.org/api/gui/8/tutorials.html)
+[tutorials](https://gazebosim.org/api/gui/9/tutorials.html)
 for usage instructions and API documentation.
 
 ## Known issue of command line tools

diff --git a/examples/plugin/custom_context_menu/CMakeLists.txt b/examples/plugin/custom_context_menu/CMakeLists.txt
@@ -9,7 +9,7 @@ endif()
 set (CMAKE_AUTOMOC ON)
 
 # Find Qt5
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
@@ -18,12 +18,10 @@ find_package (Qt5
 )
 
 # Find the Gazebo GUI library
-find_package(gz-gui8 REQUIRED)
-set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
+find_package(gz-gui9 REQUIRED)
+set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
-
-QT5_ADD_RESOURCES(resources_RCC CustomContext.qrc)
+qt_add_resources(resources_RCC CustomContext.qrc)
 
 # Generate examples
 add_library(CustomContext SHARED ${headers_MOC}
@@ -32,8 +30,4 @@ add_library(CustomContext SHARED ${headers_MOC}
 )
 target_link_libraries(CustomContext
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/plugin/dialog_from_plugin/CMakeLists.txt b/examples/plugin/dialog_from_plugin/CMakeLists.txt
@@ -8,7 +8,6 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
 find_package (Qt5
   COMPONENTS
     Core
@@ -18,12 +17,10 @@ find_package (Qt5
 )
 
 # Find the Gazebo GUI library
-find_package(gz-gui8 REQUIRED)
-set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
+find_package(gz-gui9 REQUIRED)
+set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
-
-QT5_ADD_RESOURCES(resources_RCC DialogFromPlugin.qrc)
+qt_add_resources(resources_RCC DialogFromPlugin.qrc)
 
 # Generate examples
 add_library(DialogFromPlugin SHARED ${headers_MOC}
@@ -32,8 +29,4 @@ add_library(DialogFromPlugin SHARED ${headers_MOC}
 )
 target_link_libraries(DialogFromPlugin
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/plugin/gz_components/CMakeLists.txt b/examples/plugin/gz_components/CMakeLists.txt
@@ -8,20 +8,20 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
     QuickControls2
   REQUIRED
 )
 
-find_package(gz-gui8 REQUIRED)
-set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
+find_package(gz-gui9 REQUIRED)
+set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
 
-QT5_ADD_RESOURCES(resources_RCC GzComponents.qrc)
+qt_add_resources(resources_RCC GzComponents.qrc)
 
 # Generate examples
 add_library(GzComponents SHARED ${headers_MOC}
@@ -30,8 +30,4 @@ add_library(GzComponents SHARED ${headers_MOC}
 )
 target_link_libraries(GzComponents
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/plugin/hello_plugin/CMakeLists.txt b/examples/plugin/hello_plugin/CMakeLists.txt
@@ -8,8 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
@@ -18,12 +17,10 @@ find_package (Qt5
 )
 
 # Find the Gazebo GUI library
-find_package(gz-gui8 REQUIRED)
-set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
+find_package(gz-gui9 REQUIRED)
+set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
-
-QT5_ADD_RESOURCES(resources_RCC hello.qrc)
+qt_add_resources(resources_RCC hello.qrc)
 
 # Generate examples
 add_library(HelloPlugin SHARED ${headers_MOC}
@@ -32,8 +29,4 @@ add_library(HelloPlugin SHARED ${headers_MOC}
 )
 target_link_libraries(HelloPlugin
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/plugin/multiple_qml/CMakeLists.txt b/examples/plugin/multiple_qml/CMakeLists.txt
@@ -8,7 +8,6 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
 find_package (Qt5
   COMPONENTS
     Core
@@ -18,12 +17,12 @@ find_package (Qt5
 )
 
 # Find the Gazebo GUI library
-find_package(gz-gui8 REQUIRED)
-set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
+find_package(gz-gui9 REQUIRED)
+set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
 
-QT5_ADD_RESOURCES(resources_RCC MultipleQml.qrc)
+qt_add_resources(resources_RCC MultipleQml.qrc)
 
 # Generate examples
 add_library(MultipleQml SHARED ${headers_MOC}
@@ -32,8 +31,4 @@ add_library(MultipleQml SHARED ${headers_MOC}
 )
 target_link_libraries(MultipleQml
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/standalone/custom_drawer/CMakeLists.txt b/examples/standalone/custom_drawer/CMakeLists.txt
@@ -18,12 +18,10 @@ find_package (Qt5
 )
 
 # Find the Gazebo GUI library
-find_package(gz-gui8 REQUIRED)
-set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
+find_package(gz-gui9 REQUIRED)
+set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
-QT5_ADD_RESOURCES(resources_RCC custom_drawer.qrc)
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
+qt_add_resources(resources_RCC custom_drawer.qrc)
 
 # Generate example
 add_executable(custom_drawer
@@ -32,8 +30,4 @@ add_executable(custom_drawer
 )
 target_link_libraries(custom_drawer
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
diff --git a/examples/standalone/dialogs/CMakeLists.txt b/examples/standalone/dialogs/CMakeLists.txt
@@ -8,8 +8,7 @@ endif()
 
 set (CMAKE_AUTOMOC ON)
 
-# Find Qt5
-find_package (Qt5
+find_package (Qt5 5.15
   COMPONENTS
     Core
     Quick
@@ -18,20 +17,13 @@ find_package (Qt5
 )
 
 # Find the Gazebo GUI library
-find_package(gz-gui8 REQUIRED)
-set(GZ_GUI_VER ${gz-gui8_VERSION_MAJOR})
-
-set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GZ-GUI_CXX_FLAGS}")
+find_package(gz-gui9 REQUIRED)
+set(GZ_GUI_VER ${gz-gui9_VERSION_MAJOR})
 
 # Generate example
 add_executable(dialogs
   dialogs.cc
 )
 target_link_libraries(dialogs
   gz-gui${GZ_GUI_VER}::gz-gui${GZ_GUI_VER}
-  ${Qt5Core_LIBRARIES}
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-  ${Qt5QuickControls2_LIBRARIES}
 )
-
diff --git a/examples/standalone/marker/CMakeLists.txt b/examples/standalone/marker/CMakeLists.txt
@@ -3,14 +3,14 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(gz-gui-marker)
 
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-  find_package(gz-transport13 QUIET REQUIRED OPTIONAL_COMPONENTS log)
-  set(GZ_TRANSPORT_VER ${gz-transport13_VERSION_MAJOR})
+  find_package(gz-transport14 QUIET REQUIRED OPTIONAL_COMPONENTS log)
+  set(GZ_TRANSPORT_VER ${gz-transport14_VERSION_MAJOR})
 
-  find_package(gz-common5 REQUIRED)
-  set(GZ_COMMON_VER ${gz-common5_VERSION_MAJOR})
+  find_package(gz-common6 REQUIRED)
+  set(GZ_COMMON_VER ${gz-common6_VERSION_MAJOR})
 
-  find_package(gz-msgs10 REQUIRED)
-  set(GZ_MSGS_VER ${gz-msgs10_VERSION_MAJOR})
+  find_package(gz-msgs11 REQUIRED)
+  set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
 
   add_executable(marker marker.cc)
   target_link_libraries(marker