Merge branch 'gz-gui7' into fix_tests

CMakeLists.txt

@@ -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

@@ -280,6 +280,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:/gazebosim/gz-gui/pull/475)
+
+1. Fix image display test.
+ * [Pull request #468](https:/gazebosim/gz-gui/pull/468)
+
+1. Update cmd/CMakeLists to conform with all other gz libraries.
+ * [Pull request #478](https:/gazebosim/gz-gui/pull/478)
+
+1. Add key publisher test.
+ * [Pull request #477](https:/gazebosim/gz-gui/pull/477)
+
+1. Add pointer check in Application::RemovePlugin.
+ * [Pull request #501](https:/gazebosim/gz-gui/pull/501)
+
+1. ign -> gz Migrate Ignition Headers : gz-gui.
+ * [Pull request #466](https:/gazebosim/gz-gui/pull/466)
+
+1. Fix INTEGRATION_camera_tracking test.
+ * [Pull request #519](https:/gazebosim/gz-gui/pull/519)
+
+1. Update maintainer email.
+ * [Pull request #521](https:/gazebosim/gz-gui/pull/521)
+
+1. Add Camera FPS plugin.
+ * [Pull request #523](https:/gazebosim/gz-gui/pull/523)
+
+1. Rename COPYING to LICENSE.
+ * [Pull request #525](https:/gazebosim/gz-gui/pull/525)
+
+1. CI workflow: use checkout v3.
+ * [Pull request #526](https:/gazebosim/gz-gui/pull/526)
+ * [Pull request #536](https:/gazebosim/gz-gui/pull/536)
+
+1. Fix data race issues in CameraTracking plugin.
+ * [Pull request #537](https:/gazebosim/gz-gui/pull/537)
+
 ### Gazebo GUI 6.7.0 (2022-12-02)
 
 1. Set View Camera controller from plugin configuration

src/plugins/camera_tracking/CameraTracking.cc

@@ -241,14 +241,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();
 }
 
@@ -297,6 +295,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();
@@ -434,13 +434,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();