Removed selective_camera_display from rviz_plugin_tutorials.It had no descriptive text and the API has changed since it was written.

Author: hershwg

.gitignore

@@ -1,3 +1,4 @@
 *~
 bin
 build
+lib

rviz_plugin_tutorials/CMakeLists.txt

@@ -21,7 +21,6 @@ qt4_wrap_cpp(MOC_FILES
   src/drive_widget.h
   src/teleop_panel.h
   src/imu_display.h
-  src/selective_camera_display.h
 )
 
 ## Here we specify the list of source files, including the output of
@@ -32,7 +31,6 @@ set(SOURCE_FILES
   src/plant_flag_tool.cpp
   src/imu_display.cpp
   src/imu_visual.cpp
-  src/selective_camera_display.cpp
   ${MOC_FILES}
 )
 

rviz_plugin_tutorials/plugin_description.xml

@@ -13,13 +13,6 @@
       Displays direction and scale of accelerations from sensor_msgs/Imu messages.
     </description>
   </class>
-  <class name="rviz_plugin_tutorials/SelectiveCamera"
-         type="rviz_plugin_tutorials::SelectiveCameraDisplay"
-         base_class_type="rviz::Display">
-    <description>
-      Shows an alternate view of the 3D scene in its own widget.
-    </description>
-  </class>
   <class name="rviz_plugin_tutorials/PlantFlag"
          type="rviz_plugin_tutorials::PlantFlagTool"
          base_class_type="rviz::Tool">

rviz_plugin_tutorials/src/selective_camera_display.cpp

@@ -36,9 +36,6 @@
 #include <QLabel>
 #include <QTimer>
 
-#include <yaml-cpp/emitter.h>
-#include <yaml-cpp/node.h>
-
 #include <geometry_msgs/Twist.h>
 
 #include "drive_widget.h"
@@ -119,11 +116,11 @@ void TeleopPanel::setVel( float lin, float ang )
 // away.
 void TeleopPanel::updateTopic()
 {
-  setTopic( output_topic_editor_->text().toStdString() );
+  setTopic( output_topic_editor_->text() );
 }
 
 // Set the topic name we are publishing to.
-void TeleopPanel::setTopic( const std::string& new_topic )
+void TeleopPanel::setTopic( const QString& new_topic )
 {
   // Only take action if the name has changed.
   if( new_topic != output_topic_ )
@@ -140,7 +137,7 @@ void TeleopPanel::setTopic( const std::string& new_topic )
       // and thus the old topic advertisement is removed.  The call to
       // nh_advertise() says we want to publish data on the new topic
       // name.
-      velocity_publisher_ = nh_.advertise<geometry_msgs::Twist>( output_topic_, 1 );
+      velocity_publisher_ = nh_.advertise<geometry_msgs::Twist>( output_topic_.toStdString(), 1 );
     }
     // rviz::Panel defines the configChanged() signal.  Emitting it
     // tells RViz that something in this panel has changed that will
@@ -173,22 +170,21 @@ void TeleopPanel::sendVel()
 }
 
 // Save all configuration data from this panel to the given
-// YAML::Emitter.  It is important here that you call saveChildren()
+// Config object.  It is important here that you call save()
 // on the parent class so the class id and panel name get saved.
-void TeleopPanel::saveChildren( YAML::Emitter& emitter )
+void TeleopPanel::save( rviz::Config config ) const
 {
-  rviz::Panel::saveChildren( emitter );
-  emitter << YAML::Key << "Topic" << YAML::Value << output_topic_;
+  rviz::Panel::save( config );
+  config.mapSetValue( "Topic", output_topic_ );
 }
 
-// Load all configuration data for this panel from the given YAML Node.
-void TeleopPanel::loadChildren( const YAML::Node& yaml_node )
+// Load all configuration data for this panel from the given Config object.
+void TeleopPanel::load( const rviz::Config& config )
 {
-  if( const YAML::Node *topic_node = yaml_node.FindValue( "Topic" ))
+  QString topic;
+  if( config.mapGetString( "Topic", &topic ))
   {
-    std::string topic;
-    *topic_node >> topic;
-    output_topic_editor_->setText( QString::fromStdString( topic ));
+    output_topic_editor_->setText( topic );
     updateTopic();
   }
 }

rviz_plugin_tutorials/src/selective_camera_display.h

@@ -29,8 +29,6 @@
 #ifndef TELEOP_PANEL_H
 #define TELEOP_PANEL_H
 
-#include <string>
-
 #include <ros/ros.h>
 
 #include <rviz/panel.h>
@@ -66,10 +64,10 @@ Q_OBJECT
   TeleopPanel( QWidget* parent = 0 );
 
   // Now we declare overrides of rviz::Panel functions for saving and
-  // loading data from the YAML config file.  Here the data is the
+  // loading data from the config file.  Here the data is the
   // topic name.
-  virtual void loadChildren( const YAML::Node& yaml_node );
-  virtual void saveChildren( YAML::Emitter& emitter );
+  virtual void load( const rviz::Config& config );
+  virtual void save( rviz::Config config ) const;
 
   // Next come a couple of public Qt slots.
 public Q_SLOTS:
@@ -81,7 +79,7 @@ public Q_SLOTS:
   // (it is called directly), but it is easy to define it as a public
   // slot instead of a private function in case it would be useful to
   // some other user.
-  void setTopic( const std::string& topic );
+  void setTopic( const QString& topic );
 
   // Here we declare some internal slots.
 protected Q_SLOTS:
@@ -104,7 +102,7 @@ protected Q_SLOTS:
   QLineEdit* output_topic_editor_;
 
   // The current name of the output topic.
-  std::string output_topic_;
+  QString output_topic_;
 
   // The ROS publisher for the command velocity.
   ros::Publisher velocity_publisher_;