diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 782b099..aaafe14 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,6 +2,25 @@ Changelog for package plotjuggler_ros ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.3.2 (2025-12-21) +------------------ +* fix CI +* fail to compile +* fix +* add pre-commit step +* new formatting rules +* add formatting consistent with plotjuggler App +* Fix O(n^2) complexity in ROS2 topic selection dialog. (`#106 `_) +* Depend on ros_environment for Humble detection (`#107 `_) + PR `#98 `_ mistakenly removed ros_environment from package.xml. This broke + Humble detection, which had to be worked around in 9b03f97 ("try + detecting Humble in the build farm", 2025-06-10). + This PR adds ros_environment dependency back and removes the Humble + detection workaround. + This also helps with building the package using the Nix package + manager. +* Contributors: Davide Faconti, Michal Sojka, ksuszka + 2.2.0 (2025-05-21) ------------------ * jazzy+ diff --git a/package.xml b/package.xml index 14d9abd..6a97a99 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ plotjuggler_ros - 2.3.1 + 2.3.2 PlotJuggler plugin for ROS Davide Faconti diff --git a/src/TopicPublisherROS2/generic_publisher.h b/src/TopicPublisherROS2/generic_publisher.h index ec80caf..ac195df 100644 --- a/src/TopicPublisherROS2/generic_publisher.h +++ b/src/TopicPublisherROS2/generic_publisher.h @@ -28,7 +28,8 @@ class GenericPublisher : public rclcpp::PublisherBase #ifdef ROS_HUMBLE : rclcpp::PublisherBase(node_base, topic_name, type_support, rcl_publisher_get_default_options()) #else - : rclcpp::PublisherBase(node_base, topic_name, type_support, rcl_publisher_get_default_options(), callbacks_, true) + : rclcpp::PublisherBase(node_base, topic_name, type_support, rcl_publisher_get_default_options(), + rclcpp::PublisherEventCallbacks{}, true) #endif { } @@ -53,10 +54,6 @@ class GenericPublisher : public rclcpp::PublisherBase return std::make_shared(node.get_node_base_interface().get(), topic_name, *type_support); } - -#ifndef ROS_HUMBLE - rclcpp::PublisherEventCallbacks callbacks_; -#endif }; #endif // GENERIC_PUBLISHER_H diff --git a/src/TopicPublisherROS2/publisher_ros2.cpp b/src/TopicPublisherROS2/publisher_ros2.cpp index 7126d2d..217247f 100644 --- a/src/TopicPublisherROS2/publisher_ros2.cpp +++ b/src/TopicPublisherROS2/publisher_ros2.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -153,7 +154,7 @@ void TopicPublisherROS2::filterDialog() std::map checkbox; - for (const TopicInfo& info : _topics_info) + for (const TopicInfo& info : sorted_topics) { const std::string topic_name = info.topic_name; auto cb = new QCheckBox(dialog);