Forward-port updates (#1633)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Aug 9, 2022 · eef117a · eef117a
1 parent ac6e9e0
commit eef117a
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 11 deletions.
diff --git a/Migration.md b/Migration.md
@@ -116,7 +116,7 @@ since pose information is being logged in the `changed_state` topic.
       + `ViewAndle`: Move camera to preset angles
 
 * The `gui.config` and `server.config` files are now located in a versioned
-  folder inside `$HOME/.ignition/gazebo`, i.e. `$HOME/.ignition/gazebo/6/gui.config`.
+  folder inside `$HOME/.gz/sim`, i.e. `$HOME/.gz/sim/6/gui.config`.
 
 * The `Component::Clone` method has been marked `const` to reflect that it
   should not mutate internal component state. Component implementations that

diff --git a/examples/plugin/custom_sensor_system/CMakeLists.txt b/examples/plugin/custom_sensor_system/CMakeLists.txt
@@ -20,7 +20,7 @@ include(FetchContent)
 FetchContent_Declare(
   sensors_clone
   GIT_REPOSITORY https://github.com/gazebosim/gz-sensors
-  GIT_TAG main
+  GIT_TAG gz-sensors7
 )
 FetchContent_Populate(sensors_clone)
 add_subdirectory(${sensors_clone_SOURCE_DIR}/examples/custom_sensor ${sensors_clone_BINARY_DIR})

diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc
@@ -1001,8 +1001,8 @@ TEST(Conversions, ParticleEmitter)
   emitter.SetMaxVelocity(0.2);
   emitter.SetSize(math::Vector3d(1, 2, 3));
   emitter.SetParticleSize(math::Vector3d(4, 5, 6));
-  emitter.SetColorStart(math::Color(0.1, 0.2, 0.3));
-  emitter.SetColorEnd(math::Color(0.4, 0.5, 0.6));
+  emitter.SetColorStart(math::Color(0.1f, 0.2f, 0.3f));
+  emitter.SetColorEnd(math::Color(0.4f, 0.5f, 0.6f));
   emitter.SetColorRangeImage("range_image");
   emitter.SetTopic("my_topic");
   emitter.SetRawPose(math::Pose3d(1, 2, 3, 0, 0, 0));

diff --git a/src/gui/Gui.cc b/src/gui/Gui.cc
@@ -127,7 +127,7 @@ std::string launchQuickStart(int &_argc, char **_argv,
     _argc, _argv, gz::gui::WindowType::kDialog);
   app->SetDefaultConfigPath(_defaultConfig);
 
-  auto quickStartHandler = new gui::QuickStartHandler();
+  auto quickStartHandler = new QuickStartHandler();
   quickStartHandler->setParent(app->Engine());
 
   auto dialog = new gz::gui::Dialog();

diff --git a/src/gui/QuickStartHandler.hh b/src/gui/QuickStartHandler.hh
@@ -20,8 +20,8 @@
 #include <QtCore>
 #include <string>
 
-#include "gz/sim/Export.hh"
 #include "gz/sim/config.hh"
+#include "gz/sim/gui/Export.hh"
 
 namespace gz
 {
@@ -32,7 +32,7 @@ inline namespace GZ_SIM_VERSION_NAMESPACE {
 namespace gui
 {
 /// \brief Class for handling quick start dialog
-class QuickStartHandler : public QObject
+class GZ_SIM_GUI_VISIBLE QuickStartHandler : public QObject
 {
   Q_OBJECT
 

diff --git a/src/systems/camera_video_recorder/CameraVideoRecorder.cc b/src/systems/camera_video_recorder/CameraVideoRecorder.cc
@@ -333,7 +333,6 @@ void CameraVideoRecorderPrivate::OnPostRender()
     {
       this->camera->Copy(this->cameraImage);
       std::chrono::steady_clock::time_point t;
-        std::chrono::steady_clock::now();
       if (this->recordVideoUseSimTime)
         t = std::chrono::steady_clock::time_point(this->simTime);
       else

diff --git a/test/integration/apply_link_wrench_system.cc b/test/integration/apply_link_wrench_system.cc
@@ -23,6 +23,7 @@
 #include <gz/common/Console.hh>
 #include <gz/common/Util.hh>
 #include <gz/transport/Node.hh>
+#include <gz/utils/ExtraTestMacros.hh>
 
 #include "gz/sim/components/Model.hh"
 #include "gz/sim/components/Name.hh"
@@ -48,7 +49,7 @@ class ApplyLinkWrenchTestFixture : public InternalFixture<::testing::Test>
 };
 
 /////////////////////////////////////////////////
-TEST_F(ApplyLinkWrenchTestFixture, FromSdf)
+TEST_F(ApplyLinkWrenchTestFixture, GZ_UTILS_TEST_DISABLED_ON_WIN32(FromSdf))
 {
   TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
     "test", "worlds", "apply_link_wrench.sdf"));
@@ -106,7 +107,8 @@ TEST_F(ApplyLinkWrenchTestFixture, FromSdf)
 }
 
 /////////////////////////////////////////////////
-TEST_F(ApplyLinkWrenchTestFixture, PersistentFromTopic)
+TEST_F(ApplyLinkWrenchTestFixture,
+    GZ_UTILS_TEST_DISABLED_ON_WIN32(PersistentFromTopic))
 {
   TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
     "test", "worlds", "apply_link_wrench.sdf"));
@@ -240,7 +242,8 @@ TEST_F(ApplyLinkWrenchTestFixture, PersistentFromTopic)
 }
 
 /////////////////////////////////////////////////
-TEST_F(ApplyLinkWrenchTestFixture, InstantaneousFromTopic)
+TEST_F(ApplyLinkWrenchTestFixture,
+    GZ_UTILS_TEST_DISABLED_ON_WIN32(InstantaneousFromTopic))
 {
   TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
     "test", "worlds", "apply_link_wrench.sdf"));