Merge branch 'main' into feat/sorting-republisher-topics

Author: facontidavide

package.xml

@@ -14,6 +14,7 @@
     <!-- ROS2 dependencies -->
     <buildtool_depend>ament_cmake</buildtool_depend>
 
+    <depend>ros_environment</depend>
     <depend>rclcpp</depend>
     <depend>rcpputils</depend>
     <depend>rosbag2_transport</depend>

src/CMakeLists.txt

@@ -48,7 +48,7 @@ target_link_libraries( TopicPublisherROS2 commonROS)
 message("AMENT_PREFIX_PATH = ${AMENT_PREFIX_PATH}")
 message("ROS_DISTRO (env) = $ENV{ROS_DISTRO}")
 
-if("${AMENT_PREFIX_PATH}" STREQUAL "/opt/ros/humble" OR "$ENV{ROS_DISTRO}" STREQUAL "humble")
+if("$ENV{ROS_DISTRO}" STREQUAL "humble")
         message(STATUS "Detected Humble")
         target_compile_definitions(DataLoadROS2 PUBLIC ROS_HUMBLE)
         target_compile_definitions(TopicPublisherROS2 PUBLIC ROS_HUMBLE)

src/DataStreamROS2/datastream_ros2.cpp

@@ -134,8 +134,8 @@ bool DataStreamROS2::start(QStringList* selected_datasources)
       auto topic_name = QString::fromStdString(topic.first);
       auto type_name = QString::fromStdString(topic.second[0]);
       dialog_topics.push_back({ topic_name, type_name });
-      dialog.updateTopicList(dialog_topics);
     }
+    dialog.updateTopicList(dialog_topics);
   };
 
   getTopicsFromNode();