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

source/RobotAPI/components/units/HandUnit.cpp

@@ -125,7 +125,7 @@ void HandUnit::onExitComponent()
 
 
 
-void HandUnit::shape(const std::string& shapeName, const Ice::Current& c)
+void HandUnit::setShape(const std::string& shapeName, const Ice::Current& c)
 {
 }
 

source/RobotAPI/components/units/HandUnit.h

@@ -124,7 +124,7 @@ namespace armarx
         /**
          * Send command to the hand to form a specific shape position. The shapes are defined in the robot.xml file.
          */
-        virtual void shape(const std::string& shapeName, const Ice::Current& c = ::Ice::Current());
+        void setShape(const std::string& shapeName, const Ice::Current& c = ::Ice::Current());
 
         /**
          * @return a list of strings for shape positions which can be used together with HandUnit::shape().

source/RobotAPI/libraries/robotstate/RobotStateComponent.cpp

@@ -62,7 +62,7 @@ namespace armarx
 
         if (this->_synchronized)
         {
-            ARMARX_VERBOSE << "Loaded robot from file " << robotFile;
+            ARMARX_VERBOSE << "Loaded robot from file " << robotFile << ". Robot name: " << this->_synchronized->getName();
         }
         else
         {

source/RobotAPI/libraries/robotstate/SharedRobotServants.cpp

@@ -327,6 +327,7 @@ bool SharedRobotServant::hasRobotNodeSet(const string & name, const Current &cur
 
 string SharedRobotServant::getName(const Current &current)
 {
+    //ARMARX_VERBOSE_S << "SharedRobotServant::getname:" << _robot->getName();
     return _robot->getName();
 }