sort topics in republisher topic list

Author: guilyx

src/TopicPublisherROS2/publisher_ros2.cpp

@@ -13,6 +13,7 @@
 #include <QSettings>
 #include <QRadioButton>
 #include <unordered_map>
+#include <algorithm>
 #include <QMessageBox>
 #include <tf2_ros/qos.hpp>
 #include <rosbag2_cpp/types.hpp>
@@ -51,7 +52,7 @@ void TopicPublisherROS2::updatePublishers()
   {
     return;
   }
-  for (const auto& info : _topics_info)
+  for (const auto &info : _topics_info)
   {
     auto to_publish = _topics_to_publish.find(info.topic_name);
     if (to_publish == _topics_to_publish.end() || to_publish->second == false)
@@ -62,7 +63,7 @@ void TopicPublisherROS2::updatePublishers()
     auto publisher_it = _publishers.find(info.topic_name);
     if (publisher_it == _publishers.end())
     {
-      _publishers.insert({ info.topic_name, GenericPublisher::create(*_node, info.topic_name, info.type) });
+      _publishers.insert({info.topic_name, GenericPublisher::create(*_node, info.topic_name, info.type)});
     }
   }
 
@@ -153,7 +154,9 @@ void TopicPublisherROS2::filterDialog()
 
   std::map<std::string, QCheckBox*> checkbox;
 
-  for (const TopicInfo& info : _topics_info)
+  std::map<std::string, QCheckBox *> checkbox;
+
+  for (const TopicInfo &info : sorted_topics)
   {
     const std::string topic_name = info.topic_name;
     auto cb = new QCheckBox(dialog);
@@ -169,18 +172,20 @@ void TopicPublisherROS2::filterDialog()
     cb->setFocusPolicy(Qt::NoFocus);
     dialog->ui()->formLayout->addRow(new QLabel(QString::fromStdString(topic_name)), cb);
     checkbox.insert(std::make_pair(topic_name, cb));
-    connect(dialog->ui()->pushButtonSelect, &QPushButton::pressed, [cb]() { cb->setChecked(true); });
-    connect(dialog->ui()->pushButtonDeselect, &QPushButton::pressed, [cb]() { cb->setChecked(false); });
+    connect(dialog->ui()->pushButtonSelect, &QPushButton::pressed, [cb]()
+            { cb->setChecked(true); });
+    connect(dialog->ui()->pushButtonDeselect, &QPushButton::pressed, [cb]()
+            { cb->setChecked(false); });
   }
 
   dialog->exec();
 
   if (dialog->result() == QDialog::Accepted)
   {
     _topics_to_publish.clear();
-    for (const auto& it : checkbox)
+    for (const auto &it : checkbox)
     {
-      _topics_to_publish.insert({ it.first, it.second->isChecked() });
+      _topics_to_publish.insert({it.first, it.second->isChecked()});
     }
 
     updatePublishers();
@@ -189,12 +194,12 @@ void TopicPublisherROS2::filterDialog()
 
 constexpr long NSEC_PER_SEC = 1000000000;
 
-rcutils_time_point_value_t Convert(const builtin_interfaces::msg::Time& stamp)
+rcutils_time_point_value_t Convert(const builtin_interfaces::msg::Time &stamp)
 {
   return stamp.nanosec + NSEC_PER_SEC * stamp.sec;
 }
 
-builtin_interfaces::msg::Time Convert(const rcutils_time_point_value_t& time_stamp)
+builtin_interfaces::msg::Time Convert(const rcutils_time_point_value_t &time_stamp)
 {
   builtin_interfaces::msg::Time stamp;
   stamp.sec = static_cast<int32_t>(time_stamp / NSEC_PER_SEC);
@@ -316,14 +321,14 @@ void TopicPublisherROS2::updateState(double current_time)
   auto data_it = _datamap->user_defined.find("plotjuggler::rosbag2_cpp::consecutive_messages");
   if (data_it != _datamap->user_defined.end())
   {
-    const PJ::PlotDataAny& continuous_msgs = data_it->second;
+    const PJ::PlotDataAny &continuous_msgs = data_it->second;
     _previous_play_index = continuous_msgs.getIndexFromX(current_time);
   }
 
-  for (const auto& data_it : _datamap->user_defined)
+  for (const auto &data_it : _datamap->user_defined)
   {
-    const std::string& topic_name = data_it.first;
-    const PJ::PlotDataAny& plot_any = data_it.second;
+    const std::string &topic_name = data_it.first;
+    const PJ::PlotDataAny &plot_any = data_it.second;
 
     if (topic_name == "/tf" || topic_name == "tf_static")
     {
@@ -342,11 +347,11 @@ void TopicPublisherROS2::updateState(double current_time)
       continue;
     }
 
-    const auto& any_value = plot_any.at(last_index).y;
+    const auto &any_value = plot_any.at(last_index).y;
 
     if (any_value.type() == typeid(MessageRefPtr))
     {
-      const auto& msg_instance = std::any_cast<MessageRefPtr>(any_value);
+      const auto &msg_instance = std::any_cast<MessageRefPtr>(any_value);
       publisher_it->second->publish(msg_instance->serialized_data);
     }
   }
@@ -364,7 +369,7 @@ void TopicPublisherROS2::play(double current_time)
   {
     return;
   }
-  const PJ::PlotDataAny& continuous_msgs = data_it->second;
+  const PJ::PlotDataAny &continuous_msgs = data_it->second;
   int current_index = continuous_msgs.getIndexFromX(current_time);
 
   if (_previous_play_index > current_index)
@@ -375,13 +380,13 @@ void TopicPublisherROS2::play(double current_time)
   }
   else
   {
-    const PJ::PlotDataAny& consecutive_msg = data_it->second;
+    const PJ::PlotDataAny &consecutive_msg = data_it->second;
     for (int index = _previous_play_index + 1; index <= current_index; index++)
     {
-      const auto& any_value = consecutive_msg.at(index).y;
+      const auto &any_value = consecutive_msg.at(index).y;
       if (any_value.type() == typeid(MessageRefPtr))
       {
-        const auto& msg_instance = std::any_cast<MessageRefPtr>(any_value);
+        const auto &msg_instance = std::any_cast<MessageRefPtr>(any_value);
 
         auto publisher_it = _publishers.find(msg_instance->topic_name);
         if (publisher_it == _publishers.end())