minor cleanup and comments

Author: mjforan

rviz_common/include/rviz_common/properties/ros_topic_multi_property.hpp

@@ -42,6 +42,7 @@ namespace rviz_common
 namespace properties
 {
 
+// Like RosTopicProperty but can accept multiple message types
 class RVIZ_COMMON_PUBLIC RosTopicMultiProperty : public RosTopicProperty
 {
   Q_OBJECT
@@ -53,9 +54,14 @@ class RVIZ_COMMON_PUBLIC RosTopicMultiProperty : public RosTopicProperty
     const QString & description = QString(),
     Property * parent = nullptr,
     const char * changed_slot = nullptr,
-    QObject * receiver = nullptr);
+    QObject * receiver = nullptr):
+  RosTopicProperty(name, default_value, "", description, parent, changed_slot, receiver),
+  message_types_(message_types)
+  {}
+
+  void setMessageTypes(const std::vector<QString> & message_types)
+  {message_types_ = message_types;}
 
-  void setMessageTypes(const std::vector<QString> & message_types);
 
   std::vector<QString> getMessageTypes() const
   {return message_types_;}

rviz_common/src/rviz_common/properties/ros_topic_multi_property.cpp

@@ -42,23 +42,6 @@ namespace rviz_common
 namespace properties
 {
 
-RosTopicMultiProperty::RosTopicMultiProperty(
-  const QString & name,
-  const QString & default_value,
-  const std::vector<QString> & message_types,
-  const QString & description,
-  Property * parent,
-  const char * changed_slot,
-  QObject * receiver)
-: RosTopicProperty(name, default_value, "", description, parent, changed_slot, receiver),
-  message_types_(message_types)
-{}
-
-void RosTopicMultiProperty::setMessageTypes(const std::vector<QString> & message_types)
-{
-  message_types_ = message_types;
-}
-
 void RosTopicMultiProperty::fillTopicList()
 {
   QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));

rviz_default_plugins/include/rviz_default_plugins/displays/image/image_display.hpp

@@ -55,8 +55,6 @@
 # include "rviz_default_plugins/displays/image/image_transport_display.hpp"
 
 # include <sensor_msgs/msg/image.hpp>
-# include <sensor_msgs/msg/compressed_image.hpp>
-//# include <theora_image_transport/msg/packet.hpp>
 #endif
 
 
@@ -89,12 +87,10 @@ class RVIZ_DEFAULT_PLUGINS_PUBLIC ImageDisplay : public
   void update(float wall_dt, float ros_dt) override;
   void reset() override;
 
-
 public Q_SLOTS:
   virtual void updateNormalizeOptions();
 
 protected:
-  // overrides from Display
   void onEnable() override;
   void onDisable() override;
   void subscribe() override;

rviz_default_plugins/src/rviz_default_plugins/displays/image/image_display.cpp

@@ -76,6 +76,8 @@ ImageDisplay::ImageDisplay()
 ImageDisplay::ImageDisplay(std::unique_ptr<ROSImageTextureIface> texture)
 : texture_(std::move(texture))
 {
+  // Remove the default single-type topic and replace with a multi-type topic property
+  // This allows us to display image and compressed image topics in the topic list
   delete this->topic_property_;
   this->topic_property_ = new rviz_common::properties::RosTopicMultiProperty(
     "Topic",