Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

source/RobotAPI/components/units/ForceTorqueUnit.cpp

@@ -27,7 +27,7 @@ using namespace armarx;
 
 void ForceTorqueUnit::onInitComponent()
 {
-    listenerName = "ForceTorqueValues";
+    listenerName = getProperty<std::string>("ForceTorqueTopicName").getValue();
     offeringTopic(listenerName);
     onInitForceTorqueUnit();
 }

source/RobotAPI/components/units/ForceTorqueUnit.h

@@ -43,6 +43,8 @@ namespace armarx
                 ComponentPropertyDefinitions(prefix)
             {
                 defineRequiredProperty<std::string>("AgentName", "Name of the agent for which the sensor values are provided");
+                defineOptionalProperty<std::string>("ForceTorqueTopicName","ForceTorqueValues", "Name of the topic on which the sensor values are provided");
+
 
                 // No required properties
             }

source/RobotAPI/gui_plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.cpp

@@ -29,10 +29,10 @@
 namespace armarx
 {
 
-    MdiPlugin::MdiPlugin(){
+    SensorActorPlugin::SensorActorPlugin(){
         addWidget<TCPMover>();
         addWidget<ArmarXPlotter>();
     }
 
-    Q_EXPORT_PLUGIN2(armarX_gui_MdiPlugin, MdiPlugin)
+    Q_EXPORT_PLUGIN2(armarX_gui_SensorActorPlugin, SensorActorPlugin)
 }

source/RobotAPI/gui_plugins/SensorActorWidgetsPlugin/SensorActorWidgetsPlugin.h

@@ -41,11 +41,11 @@ namespace armarx
      *
      * @see ArmarXPlotter
      */
-    class ARMARXCOMPONENT_IMPORT_EXPORT MdiPlugin :
+    class ARMARXCOMPONENT_IMPORT_EXPORT SensorActorPlugin :
             public ArmarXGuiPlugin
     {
     public:
-        MdiPlugin();
+        SensorActorPlugin();
     };
 
 }