Address review from @dirk-thomas

ros-visualization · Apr 13, 2019 · bd82bb7 · bd82bb7
1 parent 94dba83
commit bd82bb7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,7 +45,6 @@ add_service_files(DIRECTORY srv
 catkin_python_setup()
 
 generate_messages(
-  DEPENDENCIES
 )
 
 catkin_package(

diff --git a/include/rqt_image_view/image_view.h b/include/rqt_image_view/image_view.h
@@ -117,7 +117,7 @@ protected slots:
 
   virtual void callbackImage(const sensor_msgs::Image::ConstPtr& msg);
 
-  bool changeImageService(rqt_image_view::SetImageTopic::Request &req,
+  bool setImageService(rqt_image_view::SetImageTopic::Request &req,
          rqt_image_view::SetImageTopic::Response &res);
 
   virtual void invertPixels(int x, int y);

diff --git a/src/rqt_image_view/image_view.cpp b/src/rqt_image_view/image_view.cpp
@@ -115,7 +115,8 @@ void ImageView::initPlugin(qt_gui_cpp::PluginContext& context)
   hide_toolbar_action_->setCheckable(true);
   ui_.image_frame->addAction(hide_toolbar_action_);
   connect(hide_toolbar_action_, SIGNAL(toggled(bool)), this, SLOT(onHideToolbarChanged(bool)));
-  change_topic_service_ = getNodeHandle().advertiseService( getNodeHandle().getNamespace() + std::to_string(context.serialNumber()) + "/change_image_topic", &ImageView::changeImageService, this);
+  change_topic_service_ = getNodeHandle().advertiseService(
+    getNodeHandle().getNamespace() + std::to_string(context.serialNumber()) + "/set_image_topic", &ImageView::setImageService, this);
 }
 
 void ImageView::shutdownPlugin()
@@ -485,7 +486,7 @@ void ImageView::syncRotateLabel()
   }
 }
 
-bool ImageView::changeImageService(rqt_image_view::SetImageTopic::Request  &req,
+bool ImageView::setImageService(rqt_image_view::SetImageTopic::Request &req,
   rqt_image_view::SetImageTopic::Response &res)
 {
   selectTopic( QString::fromStdString(req.image_topic) );
@@ -673,4 +674,4 @@ void ImageView::callbackImage(const sensor_msgs::Image::ConstPtr& msg)
 }
 }
 
-PLUGINLIB_EXPORT_CLASS(rqt_image_view::ImageView, rqt_gui_cpp::Plugin)
+PLUGINLIB_EXPORT_CLASS(rqt_image_view::ImageView, rqt_gui_cpp::Plugin)
diff --git a/srv/SetImageTopic.srv b/srv/SetImageTopic.srv
@@ -1,2 +1,2 @@
 string image_topic
----
+---