Merge branch 'gz-gui7' into pr-set-follow-camera-pgain

.github/workflows/triage.yml

@@ -10,10 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Add ticket to inbox
-        uses: technote-space/create-project-card-action@v1
+        uses: actions/[email protected]
         with:
-          PROJECT: Core development
-          COLUMN: Inbox
-          GITHUB_TOKEN: ${{ secrets.TRIAGE_TOKEN }}
-          CHECK_ORG_PROJECT: true
+          project-url: https://github.com/orgs/gazebosim/projects/7
+          github-token: ${{ secrets.TRIAGE_TOKEN }}
 

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-gui7 VERSION 7.1.0)
+project(gz-gui7 VERSION 7.2.1)
 
 #============================================================================
 # Find gz-cmake
@@ -30,11 +30,9 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======")
 
 #--------------------------------------
 # Find Protobuf
-set(REQ_PROTOBUF_VER 3)
 gz_find_package(GzProtobuf
-                 VERSION ${REQ_PROTOBUF_VER}
-                 REQUIRED
-                 PRETTY Protobuf)
+                REQUIRED
+                PRETTY Protobuf)
 
 #--------------------------------------
 # Find Tinyxml2

Changelog.md

@@ -2,8 +2,90 @@
 
 ### Gazebo GUI 7.X.X (202X-XX-XX)
 
-### Gazebo GUI 7.1.0 (2023-03-10)
+### Gazebo GUI 7.2.1 (2023-09-26)
+
+1. Fix segfaulting tests
+    * [Pull request #429](https://github.com/gazebosim/gz-gui/pull/429)
+
+1. Find any major version of Protobuf
+    * [Pull request #544](https://github.com/gazebosim/gz-gui/pull/544)
+
+1. Fix data race issues in CameraTracking plugin
+    * [Pull request #537](https://github.com/gazebosim/gz-gui/pull/537)
+
+1. Infrastructure
+    * [Pull request #560](https://github.com/gazebosim/gz-gui/pull/560)
+    * [Pull request #559](https://github.com/gazebosim/gz-gui/pull/559)
+    * [Pull request #536](https://github.com/gazebosim/gz-gui/pull/536)
+
+
+### Gazebo GUI 7.2.0 (2023-05-14)
+
+1. Add support for bayer images to get displayed in gazebo gui
+    * [Pull request #528](https://github.com/gazebosim/gz-gui/pull/528)
+
+1. Disable deprecation messages about onFoo connections
+    * [Pull request #534](https://github.com/gazebosim/gz-gui/pull/534)
+
+1. Apply low-pass filter to RTF display
+    * [Pull request #529](https://github.com/gazebosim/gz-gui/pull/529)
+
+1. Disable Teleop_TEST on macOS
+    * [Pull request #530](https://github.com/gazebosim/gz-gui/pull/530)
+
+1. ign -> gz Migrate config and log directories : gz-gui
+    * [Pull request #454](https://github.com/gazebosim/gz-gui/pull/454)
+
+1. 6 ➡️  7
+    * [Pull request #524](https://github.com/gazebosim/gz-gui/pull/524)
+
+1. CI workflow: use checkout v3
+    * [Pull request #526](https://github.com/gazebosim/gz-gui/pull/526)
+
+1. Rename COPYING to LICENSE
+    * [Pull request #525](https://github.com/gazebosim/gz-gui/pull/525)
+
+1. ign to gz
+    * [Pull request #524](https://github.com/gazebosim/gz-gui/pull/524)
+
+1. Add Camera FPS plugin
+    * [Pull request #523](https://github.com/gazebosim/gz-gui/pull/523)
+
+1. Update maintainer email
+    * [Pull request #521](https://github.com/gazebosim/gz-gui/pull/521)
+
+1. Fix INTEGRATION_camera_tracking test
+    * [Pull request #519](https://github.com/gazebosim/gz-gui/pull/519)
+
+1. 3.12.0 release
+    * [Pull request #508](https://github.com/gazebosim/gz-gui/pull/508)
+
+1. 3.12.0 pre1
+    * [Pull request #507](https://github.com/gazebosim/gz-gui/pull/507)
+
+1. ign -> gz Migrate Ignition Headers : gz-gui
+    * [Pull request #466](https://github.com/gazebosim/gz-gui/pull/466)
+
+1. Add pointer check in Application::RemovePlugin
+    * [Pull request #501](https://github.com/gazebosim/gz-gui/pull/501)
+
+1. Add key publisher test
+    * [Pull request #477](https://github.com/gazebosim/gz-gui/pull/477)
+
+1. Update cmd/CMakeLists to conform with all other gz libraries
+    * [Pull request #478](https://github.com/gazebosim/gz-gui/pull/478)
 
+1. Fix image display test
+    * [Pull request #468](https://github.com/gazebosim/gz-gui/pull/468)
+
+1. Add degree as an optional unit for rotation in GzPose
+    * [Pull request #475](https://github.com/gazebosim/gz-gui/pull/475)
+
+1. 🎈 3.11.2
+    * [Pull request #474](https://github.com/gazebosim/gz-gui/pull/474)
+
+
+### Gazebo GUI 7.1.0 (2023-03-10)
 
 1. Set View Camera controller from plugin configuration
     * [Pull request #506](https://github.com/gazebosim/gz-gui/pull/506)
@@ -215,6 +297,45 @@
 
 ## Gazebo GUI 6
 
+### Gazebo GUI 6.7.0 (2023-05-12)
+
+1. Add degree as an optional unit for rotation in GzPose.
+    * [Pull request #475](https://github.com/gazebosim/gz-gui/pull/475)
+
+1. Fix image display test.
+    * [Pull request #468](https://github.com/gazebosim/gz-gui/pull/468)
+
+1. Update cmd/CMakeLists to conform with all other gz libraries.
+    * [Pull request #478](https://github.com/gazebosim/gz-gui/pull/478)
+
+1. Add key publisher test.
+    * [Pull request #477](https://github.com/gazebosim/gz-gui/pull/477)
+
+1. Add pointer check in Application::RemovePlugin.
+    * [Pull request #501](https://github.com/gazebosim/gz-gui/pull/501)
+
+1. ign -> gz Migrate Ignition Headers : gz-gui.
+    * [Pull request #466](https://github.com/gazebosim/gz-gui/pull/466)
+
+1. Fix INTEGRATION_camera_tracking test.
+    * [Pull request #519](https://github.com/gazebosim/gz-gui/pull/519)
+
+1. Update maintainer email.
+    * [Pull request #521](https://github.com/gazebosim/gz-gui/pull/521)
+
+1. Add Camera FPS plugin.
+    * [Pull request #523](https://github.com/gazebosim/gz-gui/pull/523)
+
+1. Rename COPYING to LICENSE.
+    * [Pull request #525](https://github.com/gazebosim/gz-gui/pull/525)
+
+1. CI workflow: use checkout v3.
+    * [Pull request #526](https://github.com/gazebosim/gz-gui/pull/526)
+    * [Pull request #536](https://github.com/gazebosim/gz-gui/pull/536)
+
+1. Fix data race issues in CameraTracking plugin.
+    * [Pull request #537](https://github.com/gazebosim/gz-gui/pull/537)
+
 ### Gazebo GUI 6.7.0 (2022-12-02)
 
 1. Set View Camera controller from plugin configuration

src/Helpers_TEST.cc

@@ -194,11 +194,11 @@ TEST(HelpersTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(renderEngine))
   EXPECT_TRUE(renderEngineName().empty());
 
   // Set the render engine GUI name
-  mainWindow->SetRenderEngine("ogre");
+  mainWindow->SetRenderEngine("ogre2");
 
   // Has render engine
   EXPECT_FALSE(renderEngineName().empty());
-  EXPECT_EQ("ogre", renderEngineName());
+  EXPECT_EQ("ogre2", renderEngineName());
 
   // Set no render engine
   mainWindow->SetRenderEngine({});

src/plugins/camera_tracking/CameraTracking.cc

@@ -259,14 +259,12 @@ bool CameraTrackingPrivate::OnFollow(const msgs::StringMsg &_msg,
 /////////////////////////////////////////////////
 void CameraTrackingPrivate::OnMoveToComplete()
 {
-  std::lock_guard<std::mutex> lock(this->mutex);
   this->moveToTarget.clear();
 }
 
 /////////////////////////////////////////////////
 void CameraTrackingPrivate::OnMoveToPoseComplete()
 {
-  std::lock_guard<std::mutex> lock(this->mutex);
   this->moveToPoseValue.reset();
 }
 
@@ -329,6 +327,8 @@ bool CameraTrackingPrivate::OnMoveToPose(const msgs::GUICamera &_msg,
 /////////////////////////////////////////////////
 void CameraTrackingPrivate::OnRender()
 {
+  std::lock_guard<std::mutex> lock(this->mutex);
+
   if (nullptr == this->scene)
   {
     this->scene = rendering::sceneFromFirstRenderEngine();
@@ -466,13 +466,14 @@ CameraTracking::CameraTracking()
   this->dataPtr->timer = new QTimer(this);
   this->connect(this->dataPtr->timer, &QTimer::timeout, [=]()
   {
-   if (!this->dataPtr->camera)
-    return;
-   if (this->dataPtr->cameraPosePub.HasConnections())
-   {
-     auto poseMsg = msgs::Convert(this->dataPtr->camera->WorldPose());
-     this->dataPtr->cameraPosePub.Publish(poseMsg);
-   }
+    std::lock_guard<std::mutex> lock(this->dataPtr->mutex);
+    if (!this->dataPtr->camera)
+     return;
+    if (this->dataPtr->cameraPosePub.HasConnections())
+    {
+      auto poseMsg = msgs::Convert(this->dataPtr->camera->WorldPose());
+      this->dataPtr->cameraPosePub.Publish(poseMsg);
+    }
   });
   this->dataPtr->timer->setInterval(1000.0 / 50.0);
   this->dataPtr->timer->start();

src/plugins/minimal_scene/CMakeLists.txt

@@ -36,6 +36,6 @@ if (APPLE)
       MinimalSceneRhiMetal.mm
       PROPERTIES
       COMPILE_FLAGS
-          "-fobjc-arc"
+          "-fobjc-arc -Wno-nullability-completeness"
   )
 endif()

src/plugins/minimal_scene/MinimalScene.cc

@@ -687,6 +687,10 @@ void GzRenderer::Destroy()
 
     // TODO(anyone) If that was the last scene, terminate engine?
   }
+
+  // clean up in the rendering thread
+  this->dataPtr->camera.reset();
+  this->dataPtr->rayQuery.reset();
 }
 
 /////////////////////////////////////////////////