diff --git a/Migration.md b/Migration.md index 467c930b09..298ae2c31b 100644 --- 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 index bcb45f8826..820f3e7038 100644 --- 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 index d8fbddf61b..76b2f77eb3 100644 --- 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 index 0ffead2bbe..7b13fa8de5 100644 --- 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/Gui_TEST.cc b/src/gui/Gui_TEST.cc index 2833b33221..d11e789e70 100644 --- a/src/gui/Gui_TEST.cc +++ b/src/gui/Gui_TEST.cc @@ -189,7 +189,7 @@ TEST_F(GuiTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(QuickStart)) return true; }; node.Advertise("/gazebo/worlds", worldsCb); - igndbg << "Worlds advertised" << std::endl; + gzdbg << "Worlds advertised" << std::endl; // Starting world callback bool startingWorldCalled{false}; @@ -202,7 +202,7 @@ TEST_F(GuiTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(QuickStart)) std::string topic{"/gazebo/starting_world"}; node.Subscribe(topic, topicCb); - igndbg << "Subscribed to [" << topic << "]" << std::endl; + gzdbg << "Subscribed to [" << topic << "]" << std::endl; // Custom config // TODO(chapulina) Make it not Linux-specific @@ -215,7 +215,7 @@ TEST_F(GuiTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(QuickStart)) // Thread to check and close quick start dialog std::thread checkingThread([&]() { - igndbg << "Started checking thread" << std::endl; + gzdbg << "Started checking thread" << std::endl; for (int sleep = 0; (nullptr == gui::App( ) || gui::App()->allWindows().empty() || @@ -226,7 +226,7 @@ TEST_F(GuiTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(QuickStart)) } ASSERT_NE(nullptr, gui::App()); ASSERT_EQ(1, gui::App()->allWindows().count()); - igndbg << "Found app" << std::endl; + gzdbg << "Found app" << std::endl; auto handler = gui::App()->Engine()->findChild(); ASSERT_NE(nullptr, handler); @@ -261,7 +261,7 @@ TEST_F(GuiTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(QuickStart)) nullptr /* _sdfFile */, true /* _waitGui */); EXPECT_NE(nullptr, app); - igndbg << "GUI created" << std::endl; + gzdbg << "GUI created" << std::endl; EXPECT_TRUE(worldsCalled); EXPECT_TRUE(startingWorldCalled); diff --git a/src/gui/QuickStartHandler.hh b/src/gui/QuickStartHandler.hh index dc10124c71..e4648b5bb8 100644 --- a/src/gui/QuickStartHandler.hh +++ b/src/gui/QuickStartHandler.hh @@ -20,8 +20,8 @@ #include #include -#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 index 81c558dc98..5bf1b91b81 100644 --- 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 index 9c81fd84c7..714cdbf077 100644 --- a/test/integration/apply_link_wrench_system.cc +++ b/test/integration/apply_link_wrench_system.cc @@ -23,6 +23,7 @@ #include #include #include +#include #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")); diff --git a/test/integration/reset_detachable_joint.cc b/test/integration/reset_detachable_joint.cc index 5fc2120b7e..7bb5896541 100644 --- a/test/integration/reset_detachable_joint.cc +++ b/test/integration/reset_detachable_joint.cc @@ -171,9 +171,10 @@ void TestPlugin::PreUpdate(const UpdateInfo &_info, auto pose = worldPose(this->objectModelEntity, _ecm); - if (pose.Y() < -0.01 && !this->errorLogged) { + if (pose.Y() < -0.01 && !this->errorLogged) + { this->errorLogged = true; - ignerr << "Object moved unexpectedly to left of table! \n"; + gzerr << "Object moved unexpectedly to left of table! \n"; } // The plugin behavior below is only for the first time the simulation runs,