fix duplicate transport override items

Author: mjforan

rviz_common/include/rviz_common/properties/ros_topic_multi_property.hpp

@@ -30,6 +30,8 @@
 #ifndef RVIZ_COMMON__PROPERTIES__ROS_TOPIC_MULTI_PROPERTY_HPP_
 #define RVIZ_COMMON__PROPERTIES__ROS_TOPIC_MULTI_PROPERTY_HPP_
 
+#include <QString>
+
 #include <string>
 #include <vector>
 

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

@@ -88,7 +88,6 @@ public Q_SLOTS:
   virtual void updateNormalizeOptions();
 
 protected Q_SLOTS:
-  void updateTopic() override;
   void subscribe() override;
 
 protected:

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

@@ -41,6 +41,7 @@
 #include <OgreTechnique.h>
 #include <OgreTextureManager.h>
 #include <OgreViewport.h>
+#include <QString>
 
 #include <algorithm>
 #include <memory>
@@ -115,40 +116,14 @@ ImageDisplay::ImageDisplay(std::unique_ptr<ROSImageTextureIface> texture)
 void ImageDisplay::onInitialize()
 {
   ITDClass::onInitialize();
-
   updateNormalizeOptions();
   setupScreenRectangle();
-
   setupRenderPanel();
 
   render_panel_->getRenderWindow()->setupSceneAfterInit(
     [this](Ogre::SceneNode * scene_node) {scene_node->attachObject(screen_rect_.get());});
-}
-
-ImageDisplay::~ImageDisplay() = default;
-
-void ImageDisplay::onEnable() {subscribe();}
-
-void ImageDisplay::onDisable()
-{
-  unsubscribe();
-  clear();
-}
-
-// Need a signature with pass by reference for image_transport_.subscribe
-void ImageDisplay::incomingMessage(const sensor_msgs::msg::Image::ConstSharedPtr & img_msg)
-{
-  ImageTransportDisplay<sensor_msgs::msg::Image>::incomingMessage(img_msg);
-}
 
-void ImageDisplay::updateTopic()
-{
-  if (!isEnabled()) {
-    return;
-  }
-  transport_override_property_->setStdString("");
-
-  // Populate topic message types based on installed image_transport plugins
+  // Populate message types and transport overrides based on installed image_transport plugins
   image_transport::ImageTransport image_transport_(rviz_ros_node_.lock()->get_raw_node());
   std::vector<std::string> loadable_transports = image_transport_.getLoadableTransports();
   std::vector<QString> message_types;
@@ -163,7 +138,7 @@ void ImageDisplay::updateTopic()
   std::string transports_str = "";
   rviz_common::properties::StatusProperty::Level transports_status_level =
     rviz_common::properties::StatusProperty::Ok;
-  // Populate topic message types and transport override options
+  transport_override_property_->clearOptions();
   transport_override_property_->addOptionStd("");
   for (std::string & transport : loadable_transports) {
     transport = transport.substr(transport.find_last_of('/') + 1);
@@ -176,14 +151,29 @@ void ImageDisplay::updateTopic()
       transports_str += "(unknown: " + transport + "), ";
     }
   }
+  // TODO(mjforan) setStatus doesn't work in onInitialize or updateTopic
   setStatusStd(transports_status_level, "Image Transports", transports_str);
   // Remove duplicates
   message_types.erase(std::unique(message_types.begin(), message_types.end()), message_types.end());
   // Update the message types to allow in the topic_property_
   ((rviz_common::properties::RosTopicMultiProperty *)topic_property_)
   ->setMessageTypes(message_types);
+}
 
-  rviz_default_plugins::displays::ImageTransportDisplay<sensor_msgs::msg::Image>::updateTopic();
+ImageDisplay::~ImageDisplay() = default;
+
+void ImageDisplay::onEnable() {subscribe();}
+
+void ImageDisplay::onDisable()
+{
+  unsubscribe();
+  clear();
+}
+
+// Need a signature with pass by reference for image_transport_.subscribe
+void ImageDisplay::incomingMessage(const sensor_msgs::msg::Image::ConstSharedPtr & img_msg)
+{
+  ImageTransportDisplay<sensor_msgs::msg::Image>::incomingMessage(img_msg);
 }
 
 void ImageDisplay::subscribe()