Merge branch 'ros2:rolling' into patch-8

Author: mosfet80

rviz2/CHANGELOG.rst

@@ -2,6 +2,12 @@
 Changelog for package rviz2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+14.3.1 (2024-10-11)
+-------------------
+
+14.3.0 (2024-10-03)
+-------------------
+
 14.2.6 (2024-08-28)
 -------------------
 

rviz2/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>rviz2</name>
-  <version>14.2.6</version>
+  <version>14.3.1</version>
   <description>
     3D visualization tool for ROS.
   </description>

rviz_assimp_vendor/CHANGELOG.rst

@@ -2,6 +2,12 @@
 Changelog for package rviz_assimp_vendor
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+14.3.1 (2024-10-11)
+-------------------
+
+14.3.0 (2024-10-03)
+-------------------
+
 14.2.6 (2024-08-28)
 -------------------
 

rviz_assimp_vendor/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>rviz_assimp_vendor</name>
-  <version>14.2.6</version>
+  <version>14.3.1</version>
   <description>
     Wrapper around assimp, providing nothing but a dependency on assimp, on some systems.
     On others, it provides a fixed CMake module or even an ExternalProject build of assimp.

rviz_common/CHANGELOG.rst

@@ -2,6 +2,14 @@
 Changelog for package rviz_common
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+14.3.1 (2024-10-11)
+-------------------
+* Handle time source exception (`#1285 <https://github.com/ros2/rviz/issues/1285>`_)
+* Contributors: Matthew Foran
+
+14.3.0 (2024-10-03)
+-------------------
+
 14.2.6 (2024-08-28)
 -------------------
 * Fully handle `Tool::processKeyEvent` return value (`#1270 <https://github.com/ros2/rviz/issues/1270>`_)

rviz_common/include/rviz_common/message_filter_display.hpp

@@ -33,6 +33,7 @@
 
 #include <tf2_ros/message_filter.h>
 #include <memory>
+#include <string>
 
 #include <message_filters/subscriber.hpp>
 
@@ -207,19 +208,33 @@ class MessageFilterDisplay : public _RosTopicDisplay
     auto msg = std::static_pointer_cast<const MessageType>(type_erased_msg);
 
     ++messages_received_;
+    rviz_common::properties::StatusProperty::Level topic_status_level =
+      rviz_common::properties::StatusProperty::Ok;
     QString topic_str = QString::number(messages_received_) + " messages received";
     // Append topic subscription frequency if we can lock rviz_ros_node_.
     std::shared_ptr<ros_integration::RosNodeAbstractionIface> node_interface =
       rviz_ros_node_.lock();
     if (node_interface != nullptr) {
-      const double duration =
-        (node_interface->get_raw_node()->now() - subscription_start_time_).seconds();
-      const double subscription_frequency =
-        static_cast<double>(messages_received_) / duration;
-      topic_str += " at " + QString::number(subscription_frequency, 'f', 1) + " hz.";
+      try {
+        const double duration =
+          (node_interface->get_raw_node()->now() - subscription_start_time_).seconds();
+        const double subscription_frequency =
+          static_cast<double>(messages_received_) / duration;
+        topic_str += " at " + QString::number(subscription_frequency, 'f', 1) + " hz.";
+      } catch (const std::runtime_error & e) {
+        if (std::string(e.what()).find("can't subtract times with different time sources") !=
+          std::string::npos)
+        {
+          topic_status_level = rviz_common::properties::StatusProperty::Warn;
+          topic_str += ". ";
+          topic_str += e.what();
+        } else {
+          throw;
+        }
+      }
     }
     setStatus(
-      properties::StatusProperty::Ok,
+      topic_status_level,
       "Topic",
       topic_str);
 

rviz_common/include/rviz_common/ros_topic_display.hpp

@@ -264,18 +264,32 @@ class RosTopicDisplay : public _RosTopicDisplay
 
     ++messages_received_;
     QString topic_str = QString::number(messages_received_) + " messages received";
+    rviz_common::properties::StatusProperty::Level topic_status_level =
+      rviz_common::properties::StatusProperty::Ok;
     // Append topic subscription frequency if we can lock rviz_ros_node_.
     std::shared_ptr<ros_integration::RosNodeAbstractionIface> node_interface =
       rviz_ros_node_.lock();
     if (node_interface != nullptr) {
-      const double duration =
-        (node_interface->get_raw_node()->now() - subscription_start_time_).seconds();
-      const double subscription_frequency =
-        static_cast<double>(messages_received_) / duration;
-      topic_str += " at " + QString::number(subscription_frequency, 'f', 1) + " hz.";
+      try {
+        const double duration =
+          (node_interface->get_raw_node()->now() - subscription_start_time_).seconds();
+        const double subscription_frequency =
+          static_cast<double>(messages_received_) / duration;
+        topic_str += " at " + QString::number(subscription_frequency, 'f', 1) + " hz.";
+      } catch (const std::runtime_error & e) {
+        if (std::string(e.what()).find("can't subtract times with different time sources") !=
+          std::string::npos)
+        {
+          topic_status_level = rviz_common::properties::StatusProperty::Warn;
+          topic_str += ". ";
+          topic_str += e.what();
+        } else {
+          throw;
+        }
+      }
     }
     setStatus(
-      properties::StatusProperty::Ok,
+      topic_status_level,
       "Topic",
       topic_str);
 

rviz_common/package.xml

@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>rviz_common</name>
-  <version>14.2.6</version>
+  <version>14.3.1</version>
   <description>
     Common rviz API, used by rviz plugins and applications.
   </description>

rviz_default_plugins/CHANGELOG.rst

@@ -2,6 +2,16 @@
 Changelog for package rviz_default_plugins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+14.3.1 (2024-10-11)
+-------------------
+* Handle time source exception (`#1285 <https://github.com/ros2/rviz/issues/1285>`_)
+* Contributors: Matthew Foran
+
+14.3.0 (2024-10-03)
+-------------------
+* replace deprecated encodings 'yuv422' and 'yuv422_yuy2' (`#1276 <https://github.com/ros2/rviz/issues/1276>`_)
+* Contributors: Christian Rauch
+
 14.2.6 (2024-08-28)
 -------------------
 * Update urdf model.h deprecation (`#1266 <https://github.com/ros2/rviz/issues/1266>`_)

rviz_default_plugins/include/rviz_default_plugins/displays/image/image_transport_display.hpp

@@ -34,6 +34,7 @@
 #define RVIZ_DEFAULT_PLUGINS__DISPLAYS__IMAGE__IMAGE_TRANSPORT_DISPLAY_HPP_
 
 #include <memory>
+#include <string>
 
 #include "get_transport_from_topic.hpp"
 #include "image_transport/image_transport.hpp"
@@ -171,18 +172,32 @@ class ImageTransportDisplay : public rviz_common::_RosTopicDisplay
 
     ++messages_received_;
     QString topic_str = QString::number(messages_received_) + " messages received";
+    rviz_common::properties::StatusProperty::Level topic_status_level =
+      rviz_common::properties::StatusProperty::Ok;
     // Append topic subscription frequency if we can lock rviz_ros_node_.
     std::shared_ptr<rviz_common::ros_integration::RosNodeAbstractionIface> node_interface =
       rviz_ros_node_.lock();
     if (node_interface != nullptr) {
-      const double duration =
-        (node_interface->get_raw_node()->now() - subscription_start_time_).seconds();
-      const double subscription_frequency =
-        static_cast<double>(messages_received_) / duration;
-      topic_str += " at " + QString::number(subscription_frequency, 'f', 1) + " hz.";
+      try {
+        const double duration =
+          (node_interface->get_raw_node()->now() - subscription_start_time_).seconds();
+        const double subscription_frequency =
+          static_cast<double>(messages_received_) / duration;
+        topic_str += " at " + QString::number(subscription_frequency, 'f', 1) + " hz.";
+      } catch (const std::runtime_error & e) {
+        if (std::string(e.what()).find("can't subtract times with different time sources") !=
+          std::string::npos)
+        {
+          topic_status_level = rviz_common::properties::StatusProperty::Warn;
+          topic_str += ". ";
+          topic_str += e.what();
+        } else {
+          throw;
+        }
+      }
     }
     setStatus(
-      rviz_common::properties::StatusProperty::Ok,
+      topic_status_level,
       "Topic",
       topic_str);