new formatting rules

Author: facontidavide

.clang-format

@@ -14,7 +14,7 @@ BreakBeforeBinaryOperators: false
 BreakBeforeTernaryOperators: false
 BreakConstructorInitializers: BeforeComma
 BinPackParameters: true
-ColumnLimit: 100
+ColumnLimit: 120
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 DerivePointerBinding: false
 PointerBindsToType: true

.pre-commit-config.yaml

@@ -13,7 +13,7 @@
 #
 # See https://github.com/pre-commit/pre-commit
 
-exclude: cmake/CPM.cmake|^3rdparty/|3rdparty
+exclude: cmake/CPM.cmake|^3rdparty/|3rdparty|^plotjuggler_base/include/PlotJuggler/contrib/|^contrib/|contrib
 repos:
 
   # Standard hooks

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "ros.distro": "humble"
-}
+  "ros.distro": "humble"
+}

src/DataLoadROS2/dataload_ros2.cpp

@@ -70,17 +70,15 @@ bool DataLoadROS2::readDataFromFile(PJ::FileLoadInfo* info, PJ::PlotDataMapRef&
   }
   catch (std::runtime_error& ex)
   {
-    QMessageBox::warning(nullptr, tr("Error"),
-                         QString("rosbag::open thrown an exception:\n") + QString(ex.what()));
+    QMessageBox::warning(nullptr, tr("Error"), QString("rosbag::open thrown an exception:\n") + QString(ex.what()));
     return false;
   }
 
   QDir::setCurrent(oldPath);
 
   // Temporarily change the current directory as a workaround for rosbag2 relative directories not
   // working properly
-  std::vector<rosbag2_storage::TopicMetadata> topic_metadata =
-      temp_bag_reader->get_all_topics_and_types();
+  std::vector<rosbag2_storage::TopicMetadata> topic_metadata = temp_bag_reader->get_all_topics_and_types();
 
   std::unordered_map<std::string, std::string> topicTypesByName;
 
@@ -93,8 +91,7 @@ bool DataLoadROS2::readDataFromFile(PJ::FileLoadInfo* info, PJ::PlotDataMapRef&
 
   for (const rosbag2_storage::TopicMetadata& topic : topic_metadata)
   {
-    all_topics_qt.push_back(
-        { QString::fromStdString(topic.name), QString::fromStdString(topic.type) });
+    all_topics_qt.push_back({ QString::fromStdString(topic.name), QString::fromStdString(topic.type) });
     topicTypesByName.emplace(topic.name, topic.type);
 
     const auto& typesupport_identifier = rosidl_typesupport_cpp::typesupport_identifier;
@@ -111,8 +108,7 @@ bool DataLoadROS2::readDataFromFile(PJ::FileLoadInfo* info, PJ::PlotDataMapRef&
 
   if (!failed_topic_type.empty())
   {
-    QString msg(
-        "Can not recognize the following message types and those topics will be ignored:\n\n");
+    QString msg("Can not recognize the following message types and those topics will be ignored:\n\n");
     for (const auto& type : failed_topic_type)
     {
       msg += "  " + QString::fromStdString(type) + "\n";
@@ -177,10 +173,8 @@ bool DataLoadROS2::readDataFromFile(PJ::FileLoadInfo* info, PJ::PlotDataMapRef&
   progress_dialog.show();
   int msg_count = 0;
 
-  PJ::PlotDataAny& plot_consecutive =
-      plot_map.addUserDefined("plotjuggler::rosbag2_cpp::consecutive_messages")->second;
-  PJ::PlotDataAny& metadata_storage =
-      plot_map.addUserDefined("plotjuggler::rosbag2_cpp::topics_metadata")->second;
+  PJ::PlotDataAny& plot_consecutive = plot_map.addUserDefined("plotjuggler::rosbag2_cpp::consecutive_messages")->second;
+  PJ::PlotDataAny& metadata_storage = plot_map.addUserDefined("plotjuggler::rosbag2_cpp::topics_metadata")->second;
 
   // dirty trick. Store it in a one point timeseries
   metadata_storage.pushBack({ 0, std::any(topics_info) });

src/DataLoadROS2/dataload_ros2.h

@@ -21,8 +21,7 @@ class DataLoadROS2 : public PJ::DataLoader
 
   virtual const std::vector<const char*>& compatibleFileExtensions() const override;
 
-  virtual bool readDataFromFile(PJ::FileLoadInfo* fileload_info,
-                                PJ::PlotDataMapRef& destination) override;
+  virtual bool readDataFromFile(PJ::FileLoadInfo* fileload_info, PJ::PlotDataMapRef& destination) override;
 
   virtual const char* name() const override
   {

src/DataStreamROS2/datastream_ros2.cpp

@@ -59,8 +59,7 @@ rclcpp::QoS adapt_request_to_offers(const std::string& topic_name,
   return request_qos;
 }
 
-DataStreamROS2::DataStreamROS2()
-  : DataStreamer(), _node(nullptr), _running(false), _first_warning(false)
+DataStreamROS2::DataStreamROS2() : DataStreamer(), _node(nullptr), _running(false), _first_warning(false)
 {
   loadDefaultSettings();
 
@@ -231,26 +230,21 @@ void DataStreamROS2::subscribeToTopic(const std::string& topic_name, const std::
 
   if (!_parser.hasParser(topic_name))
   {
-    _parser.addParser(topic_name,
-                      CreateParserROS2(*parserFactories(), topic_name, topic_type, dataMap()));
+    _parser.addParser(topic_name, CreateParserROS2(*parserFactories(), topic_name, topic_type, dataMap()));
   }
 
-  auto bound_callback = [=](std::shared_ptr<rclcpp::SerializedMessage> msg) {
-    messageCallback(topic_name, msg);
-  };
+  auto bound_callback = [=](std::shared_ptr<rclcpp::SerializedMessage> msg) { messageCallback(topic_name, msg); };
 
   auto publisher_info = _node->get_publishers_info_by_topic(topic_name);
   auto detected_qos = adapt_request_to_offers(topic_name, publisher_info);
 
   // double subscription, latching or not
-  auto subscription =
-      _node->create_generic_subscription(topic_name, topic_type, detected_qos, bound_callback);
+  auto subscription = _node->create_generic_subscription(topic_name, topic_type, detected_qos, bound_callback);
   _subscriptions[topic_name] = subscription;
   _node->get_node_topics_interface()->add_subscription(subscription, nullptr);
 }
 
-void DataStreamROS2::messageCallback(const std::string& topic_name,
-                                     std::shared_ptr<rclcpp::SerializedMessage> msg)
+void DataStreamROS2::messageCallback(const std::string& topic_name, std::shared_ptr<rclcpp::SerializedMessage> msg)
 {
   double timestamp = _node->get_clock()->now().seconds();
   try

src/DataStreamROS2/datastream_ros2.h

@@ -39,8 +39,7 @@ class DataStreamROS2 : public PJ::DataStreamer
   const std::vector<QAction*>& availableActions() override;
 
 private:
-  void messageCallback(const std::string& topic_name,
-                       std::shared_ptr<rclcpp::SerializedMessage> msg);
+  void messageCallback(const std::string& topic_name, std::shared_ptr<rclcpp::SerializedMessage> msg);
 
 private:
   std::shared_ptr<rclcpp::Context> _context;

src/TopicPublisherROS2/generic_publisher.h

@@ -23,14 +23,12 @@
 class GenericPublisher : public rclcpp::PublisherBase
 {
 public:
-  GenericPublisher(rclcpp::node_interfaces::NodeBaseInterface* node_base,
-                   const std::string& topic_name, const rosidl_message_type_support_t& type_support)
+  GenericPublisher(rclcpp::node_interfaces::NodeBaseInterface* node_base, const std::string& topic_name,
+                   const rosidl_message_type_support_t& type_support)
 #ifdef ROS_HUMBLE
-    : rclcpp::PublisherBase(node_base, topic_name, type_support,
-                            rcl_publisher_get_default_options())
+    : 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(), callbacks_, true)
 #endif
   {
   }
@@ -39,8 +37,7 @@ class GenericPublisher : public rclcpp::PublisherBase
 
   void publish(std::shared_ptr<rmw_serialized_message_t> message)
   {
-    auto return_code =
-        rcl_publish_serialized_message(get_publisher_handle().get(), message.get(), NULL);
+    auto return_code = rcl_publish_serialized_message(get_publisher_handle().get(), message.get(), NULL);
 
     if (return_code != RCL_RET_OK)
     {
@@ -51,13 +48,10 @@ class GenericPublisher : public rclcpp::PublisherBase
   static std::shared_ptr<GenericPublisher> create(rclcpp::Node& node, const std::string& topic_name,
                                                   const std::string& topic_type)
   {
-    auto library =
-        std::move(rosbag2_cpp::get_typesupport_library(topic_type, "rosidl_typesupport_cpp"));
-    auto type_support =
-        rosbag2_cpp::get_typesupport_handle(topic_type, "rosidl_typesupport_cpp", library);
+    auto library = std::move(rosbag2_cpp::get_typesupport_library(topic_type, "rosidl_typesupport_cpp"));
+    auto type_support = rosbag2_cpp::get_typesupport_handle(topic_type, "rosidl_typesupport_cpp", library);
 
-    return std::make_shared<GenericPublisher>(node.get_node_base_interface().get(), topic_name,
-                                              *type_support);
+    return std::make_shared<GenericPublisher>(node.get_node_base_interface().get(), topic_name, *type_support);
   }
 
 #ifndef ROS_HUMBLE

src/TopicPublisherROS2/publisher_ros2.cpp

@@ -62,8 +62,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) });
     }
   }
 
@@ -165,10 +164,8 @@ 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();
@@ -248,11 +245,9 @@ void TopicPublisherROS2::broadcastTF(double current_time)
 
       const auto& msg_instance = std::any_cast<MessageRefPtr>(any_value);
 
-      auto tf_type_support =
-          rosidl_typesupport_cpp::get_message_type_support_handle<tf2_msgs::msg::TFMessage>();
+      auto tf_type_support = rosidl_typesupport_cpp::get_message_type_support_handle<tf2_msgs::msg::TFMessage>();
       tf2_msgs::msg::TFMessage tf_msg;
-      if (RMW_RET_OK !=
-          rmw_deserialize(msg_instance->serialized_data.get(), tf_type_support, &tf_msg))
+      if (RMW_RET_OK != rmw_deserialize(msg_instance->serialized_data.get(), tf_type_support, &tf_msg))
       {
         throw std::runtime_error("failed to deserialize TF message");
       }

src/dialog_select_ros_topics.cpp

@@ -14,9 +14,8 @@
 #include "dialog_select_ros_topics.h"
 #include "ui_dialog_select_ros_topics.h"
 
-DialogSelectRosTopics::DialogSelectRosTopics(
-    const std::vector<std::pair<QString, QString>>& topic_list, const PJ::RosParserConfig& config,
-    QWidget* parent)
+DialogSelectRosTopics::DialogSelectRosTopics(const std::vector<std::pair<QString, QString>>& topic_list,
+                                             const PJ::RosParserConfig& config, QWidget* parent)
   : QDialog(parent)
   , ui(new Ui::dialogSelectRosTopics)
   , _default_selected_topics(config.topics)
@@ -70,8 +69,7 @@ DialogSelectRosTopics::DialogSelectRosTopics(
     }
   });
 
-  connect(&_deselect_all, &QShortcut::activated, ui->listRosTopics,
-          &QAbstractItemView::clearSelection);
+  connect(&_deselect_all, &QShortcut::activated, ui->listRosTopics, &QAbstractItemView::clearSelection);
 
   on_spinBoxArraySize_valueChanged(ui->spinBoxArraySize->value());
 
@@ -190,18 +188,17 @@ void DialogSelectRosTopics::on_maximumSizeHelp_pressed()
 {
   QMessageBox msgBox;
   msgBox.setWindowTitle("Help");
-  msgBox.setText(
-      "Maximum Size of Arrays:\n\n"
-      "If the size of an Arrays is larger than this maximum value, the entire array is skipped.\n\n"
-      "This parameter is used to prevent the user from loading HUGE arrays, "
-      "such as images, pointclouds, maps, etc.\n"
-      "The term 'array' refers to the array in a message field,\n\n"
-      " See http://wiki.ros.org/msg.\n\n"
-      "This is NOT about the duration of a time series!\n\n"
-      "MOTIVATION: pretend that a user tries to load a RGB image, which probably contains "
-      "a few millions pixels.\n"
-      "Plotjuggler would naively create a single time series for each pixel of the image! "
-      "That makes no sense, of course, and it would probably freeze your system.\n");
+  msgBox.setText("Maximum Size of Arrays:\n\n"
+                 "If the size of an Arrays is larger than this maximum value, the entire array is skipped.\n\n"
+                 "This parameter is used to prevent the user from loading HUGE arrays, "
+                 "such as images, pointclouds, maps, etc.\n"
+                 "The term 'array' refers to the array in a message field,\n\n"
+                 " See http://wiki.ros.org/msg.\n\n"
+                 "This is NOT about the duration of a time series!\n\n"
+                 "MOTIVATION: pretend that a user tries to load a RGB image, which probably contains "
+                 "a few millions pixels.\n"
+                 "Plotjuggler would naively create a single time series for each pixel of the image! "
+                 "That makes no sense, of course, and it would probably freeze your system.\n");
   msgBox.exec();
 }