From 1391a2ede0b8ff1bbda3bc0cdaea4ed34f72e099 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 26 Aug 2020 16:10:05 +0200 Subject: [PATCH 1/8] Using std::chrono instead of common::Time Signed-off-by: ahcorde --- src/plugins/world_stats/WorldStats.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc index 97752632d..89ebb9f60 100644 --- a/src/plugins/world_stats/WorldStats.cc +++ b/src/plugins/world_stats/WorldStats.cc @@ -151,22 +151,22 @@ void WorldStats::ProcessMsg() { std::lock_guard lock(this->dataPtr->mutex); - ignition::common::Time time; + std::chrono::system_clock::time_point time_point; if (this->dataPtr->msg.has_sim_time()) { - time.sec = this->dataPtr->msg.sim_time().sec(); - time.nsec = this->dataPtr->msg.sim_time().nsec(); - - this->SetSimTime(QString::fromStdString(time.FormattedString())); + time_point = math::secNsecToTimePoint( + this->dataPtr->msg.sim_time().sec(), + this->dataPtr->msg.sim_time().nsec()); + this->SetSimTime(QString::fromStdString(math::timePointToString(time_point))); } if (this->dataPtr->msg.has_real_time()) { - time.sec = this->dataPtr->msg.real_time().sec(); - time.nsec = this->dataPtr->msg.real_time().nsec(); - - this->SetRealTime(QString::fromStdString(time.FormattedString())); + time_point = math::secNsecToTimePoint( + this->dataPtr->msg.real_time().sec(), + this->dataPtr->msg.real_time().nsec()); + this->SetRealTime(QString::fromStdString(math::timePointToString(time_point))); } { From d8f6787a3ca3451a49e5fed625433d8c9eea392b Mon Sep 17 00:00:00 2001 From: ahcorde Date: Thu, 27 Aug 2020 13:09:37 +0200 Subject: [PATCH 2/8] make linters happy Signed-off-by: ahcorde --- src/plugins/world_stats/WorldStats.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc index 89ebb9f60..a2b530f22 100644 --- a/src/plugins/world_stats/WorldStats.cc +++ b/src/plugins/world_stats/WorldStats.cc @@ -158,7 +158,8 @@ void WorldStats::ProcessMsg() time_point = math::secNsecToTimePoint( this->dataPtr->msg.sim_time().sec(), this->dataPtr->msg.sim_time().nsec()); - this->SetSimTime(QString::fromStdString(math::timePointToString(time_point))); + this->SetSimTime(QString::fromStdString( + math::timePointToString(time_point))); } if (this->dataPtr->msg.has_real_time()) @@ -166,7 +167,8 @@ void WorldStats::ProcessMsg() time_point = math::secNsecToTimePoint( this->dataPtr->msg.real_time().sec(), this->dataPtr->msg.real_time().nsec()); - this->SetRealTime(QString::fromStdString(math::timePointToString(time_point))); + this->SetRealTime(QString::fromStdString( + math::timePointToString(time_point))); } { From 3aec2580f2e11fedcf2f2b1999a71557f6bc7ca9 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Tue, 1 Sep 2020 15:48:15 +0200 Subject: [PATCH 3/8] Change std::chrono::system_clock for std::chrono::steady_clock Signed-off-by: ahcorde --- src/plugins/world_stats/WorldStats.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc index a2b530f22..c2fc012ef 100644 --- a/src/plugins/world_stats/WorldStats.cc +++ b/src/plugins/world_stats/WorldStats.cc @@ -151,7 +151,7 @@ void WorldStats::ProcessMsg() { std::lock_guard lock(this->dataPtr->mutex); - std::chrono::system_clock::time_point time_point; + std::chrono::steady_clock::time_point time_point; if (this->dataPtr->msg.has_sim_time()) { From fe277f94f5299e66615835d14f1ec557ba2f84cf Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 2 Sep 2020 14:35:44 +0200 Subject: [PATCH 4/8] Deprecate common::Time related functions Signed-off-by: ahcorde --- include/ignition/gui/Conversions.hh | 2 ++ src/Conversions_TEST.cc | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/ignition/gui/Conversions.hh b/include/ignition/gui/Conversions.hh index 2730f9fbd..dceb08fc8 100644 --- a/include/ignition/gui/Conversions.hh +++ b/include/ignition/gui/Conversions.hh @@ -91,12 +91,14 @@ namespace ignition /// \param[in] _t The time to convert /// \return An ignition::common::Time object IGNITION_GUI_VISIBLE + IGN_DEPRECATED(4) common::Time convert(const msgs::Time &_t); /// \brief Convert an ignition::common::Time to an ignition::msgs::Time /// \param[in] _t The time to convert /// \return An ignition::msgs::Time object IGNITION_GUI_VISIBLE + IGN_DEPRECATED(4) msgs::Time convert(const common::Time &_t); } } diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc index 0960ddf99..23d1a026e 100644 --- a/src/Conversions_TEST.cc +++ b/src/Conversions_TEST.cc @@ -159,8 +159,14 @@ TEST(ConversionsTest, Time) ignition::msgs::Time t; t.set_sec(s); t.set_nsec(ns); - +#ifndef _WIN32 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif auto nt = convert(convert(t)); +#ifndef _WIN32 +# pragma GCC diagnostic pop +#endif EXPECT_DOUBLE_EQ(nt.sec(), t.sec()); EXPECT_DOUBLE_EQ(nt.nsec(), t.nsec()); } @@ -168,7 +174,14 @@ TEST(ConversionsTest, Time) // Common to msgs to common { common::Time t(s, ns); +#ifndef _WIN32 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wdeprecated-declarations" +#endif EXPECT_EQ(convert(convert(t)), t); +#ifndef _WIN32 +# pragma GCC diagnostic pop +#endif } } From 4a53103a7e9dbea90f5129d1f9d299755e0855a3 Mon Sep 17 00:00:00 2001 From: ahcorde Date: Wed, 2 Sep 2020 16:10:03 +0200 Subject: [PATCH 5/8] Fixed action Signed-off-by: ahcorde --- .github/ci/packages.apt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index 842e92304..fcdea73bd 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -25,3 +25,4 @@ qtbase5-dev qtdeclarative5-dev qtquickcontrols2-5-dev xvfb +python3-empy From d9bb607cf0d3258f810c064b646ce7072298b5fe Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Wed, 9 Sep 2020 20:00:34 -0700 Subject: [PATCH 6/8] Migration notes and style Signed-off-by: Louise Poubel --- .github/ci/packages.apt | 1 - Migration.md | 7 +++++++ include/ignition/gui/Conversions.hh | 4 ++++ src/plugins/world_stats/WorldStats.cc | 11 +++++------ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.github/ci/packages.apt b/.github/ci/packages.apt index fcdea73bd..842e92304 100644 --- a/.github/ci/packages.apt +++ b/.github/ci/packages.apt @@ -25,4 +25,3 @@ qtbase5-dev qtdeclarative5-dev qtquickcontrols2-5-dev xvfb -python3-empy diff --git a/Migration.md b/Migration.md index 930d78efe..0ecb06924 100644 --- a/Migration.md +++ b/Migration.md @@ -5,6 +5,13 @@ Deprecated code produces compile-time warnings. These warning serve as notification to users that their code should be upgraded. The next major release will remove the deprecated code. +## Ignition GUI 3.x to 4.x + +* Use rendering4, transport9 and msgs6. +* Deprecated `ignition::gui::convert` to `ignition::common::Time`. + Use `ignition::msgs::Convert` to `std::chrono::steady_clock::time_point` + instead. + ## Ignition GUI 2.x to 3.x * Use rendering3, transport8 and msgs5. diff --git a/include/ignition/gui/Conversions.hh b/include/ignition/gui/Conversions.hh index dceb08fc8..91c11999e 100644 --- a/include/ignition/gui/Conversions.hh +++ b/include/ignition/gui/Conversions.hh @@ -90,6 +90,8 @@ namespace ignition /// \brief Convert an ignition::msgs::Time to an ignition::common::Time /// \param[in] _t The time to convert /// \return An ignition::common::Time object + /// \deprecated Use ignition::msgs:Convert to + /// std::chrono::steady_clock::time_point IGNITION_GUI_VISIBLE IGN_DEPRECATED(4) common::Time convert(const msgs::Time &_t); @@ -97,6 +99,8 @@ namespace ignition /// \brief Convert an ignition::common::Time to an ignition::msgs::Time /// \param[in] _t The time to convert /// \return An ignition::msgs::Time object + /// \deprecated Use ignition::msgs:Convert to + /// std::chrono::steady_clock::time_point IGNITION_GUI_VISIBLE IGN_DEPRECATED(4) msgs::Time convert(const common::Time &_t); diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc index 7b54f70c2..d7afb486e 100644 --- a/src/plugins/world_stats/WorldStats.cc +++ b/src/plugins/world_stats/WorldStats.cc @@ -17,7 +17,6 @@ #include #include -#include #include #include "ignition/gui/Helpers.hh" @@ -183,24 +182,24 @@ void WorldStats::ProcessMsg() { std::lock_guard lock(this->dataPtr->mutex); - std::chrono::steady_clock::time_point time_point; + std::chrono::steady_clock::time_point timePoint; if (this->dataPtr->msg.has_sim_time()) { - time_point = math::secNsecToTimePoint( + timePoint = math::secNsecToTimePoint( this->dataPtr->msg.sim_time().sec(), this->dataPtr->msg.sim_time().nsec()); this->SetSimTime(QString::fromStdString( - math::timePointToString(time_point))); + math::timePointToString(timePoint))); } if (this->dataPtr->msg.has_real_time()) { - time_point = math::secNsecToTimePoint( + timePoint = math::secNsecToTimePoint( this->dataPtr->msg.real_time().sec(), this->dataPtr->msg.real_time().nsec()); this->SetRealTime(QString::fromStdString( - math::timePointToString(time_point))); + math::timePointToString(timePoint))); } { From 786a77b87e06096074d0fd0972eb190f1a8880a1 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 10 Sep 2020 10:06:18 -0700 Subject: [PATCH 7/8] Require math 6.5 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc2a31643..1355bd3cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ ign_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2) #-------------------------------------- # Find ignition-math -ign_find_package(ignition-math6 REQUIRED) +ign_find_package(ignition-math6 REQUIRED VERSION 6.5) set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR}) #-------------------------------------- From 57ada4796d0303c92d2bdf596d6ec641b345972e Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Thu, 10 Sep 2020 19:09:34 -0700 Subject: [PATCH 8/8] remove ci-bionic Signed-off-by: Louise Poubel --- .github/ci-bionic/after_make.sh | 11 ----------- .github/ci-bionic/dependencies.yaml | 5 ----- 2 files changed, 16 deletions(-) delete mode 100644 .github/ci-bionic/after_make.sh delete mode 100644 .github/ci-bionic/dependencies.yaml diff --git a/.github/ci-bionic/after_make.sh b/.github/ci-bionic/after_make.sh deleted file mode 100644 index 12726c879..000000000 --- a/.github/ci-bionic/after_make.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -l - -set -x - -# Install (needed for some tests) -make install - -Xvfb :1 -screen 0 1280x1024x24 & -export DISPLAY=:1.0 -export RENDER_ENGINE_VALUES=ogre2 -export MESA_GL_VERSION_OVERRIDE=3.3 diff --git a/.github/ci-bionic/dependencies.yaml b/.github/ci-bionic/dependencies.yaml deleted file mode 100644 index 4231e9b6c..000000000 --- a/.github/ci-bionic/dependencies.yaml +++ /dev/null @@ -1,5 +0,0 @@ -repositories: - ign-rendering: - type: git - url: https://github.com/ignitionrobotics/ign-rendering - version: master