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

* 'master' of https://i61wiki.itec.uka.de/git/robot-api:
  updated name of haptic unit

source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp

@@ -32,6 +32,7 @@ HapticUnitWidget::HapticUnitWidget()
     ui.setupUi(getWidget());
     //ui.stateOpen->setChecked(true);
     hapticObserverProxyName = "HapticUnitObserver";
+    hapticUnitProxyName = "WeissHapticUnit";
 
     updateTimer = new QTimer(this);
 
@@ -44,31 +45,20 @@ HapticUnitWidget::HapticUnitWidget()
 void HapticUnitWidget::onInitComponent()
 {
     usingProxy(hapticObserverProxyName);
-    usingProxy("HapticUnit");
-    //usingTopic(handName + "State");
-    //ARMARX_WARNING << "Listening on Topic: " << handName + "State";
+    usingProxy(hapticUnitProxyName);
+
 }
 
 
 void HapticUnitWidget::onConnectComponent()
 {
     hapticObserverProxy = getProxy<ObserverInterfacePrx>(hapticObserverProxyName);
-    weissHapticUnit = getProxy<WeissHapticUnitInterfacePrx>("HapticUnit");
+    weissHapticUnit = getProxy<WeissHapticUnitInterfacePrx>(hapticUnitProxyName);
 
     connectSlots();
     createMatrixWidgets();
     updateTimer->start(25); // 50 Hz
 
-
-    /*SingleTypeVariantListPtr preshapeStrings = SingleTypeVariantListPtr::dynamicCast(HapticUnitProxy->getPreshapeNames());
-    QStringList list;
-    int preshapeCount = preshapeStrings->getSize();
-    for (int i = 0; i < preshapeCount; ++i)
-    {
-        std::string shape = ((preshapeStrings->getVariant(i))->get<std::string>());
-        list << QString::fromStdString(shape);
-    }
-    ui.comboPreshapes->addItems(list);*/
 }
 
 

source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.h

@@ -117,6 +117,7 @@ namespace armarx
     private:
 
         std::string hapticObserverProxyName;
+        std::string hapticUnitProxyName;
         ObserverInterfacePrx hapticObserverProxy;
         WeissHapticUnitInterfacePrx weissHapticUnit;