Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

data/RobotAPI/VariantInfo-RobotAPI.xml

@@ -17,6 +17,13 @@
         <Variant baseType="::armarx::TrajectoryBase" dataType="::armarx::Trajectory" humanName="Trajectory"  include="RobotAPI/libraries/core/Trajectory.h"/>
     </Lib>
     <Lib name="RobotAPIInterfaces">
+
+        <Class typeName="NJointCartesianWaypointControllerConfig" include="RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.h"  />
+        <Class typeName="FramedPoseBase" include="RobotAPI/interface/core/FramedPoseBase.h" />
+        <Class typeName="Vector3Base" include="RobotAPI/libraries/core/Pose.h" />
+        <Class typeName="QuaternionBase" include="RobotAPI/libraries/core/Pose.h" />
+        <Class typeName="armarx::viz::data::Element" include="RobotAPI/interface/ArViz/Elements.h" />
+        <Class typeName="armarx::viz::data::LayerUpdate" include="RobotAPI/interface/ArViz/Component.h" />
         <Proxy include="RobotAPI/interface/units/KinematicUnitInterface.h"
             humanName="Kinematic Unit"
             typeName="KinematicUnitInterfacePrx"
@@ -195,6 +202,16 @@
                 propertyName="NJointTrajectoryControllerName"
                 propertyIsOptional="true"
                 propertyDefaultValue="NJointTrajectoryController" />
+        <Proxy include="RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.h"
+                humanName="NJoint Cartesian Waypoint Controller"
+                typeName="NJointCartesianControllerInterfacePrx"
+                memberName="NJointCartesianWaypointController"
+                getterName="getNJointCartesianWaypointController"
+                propertyName="NJointCartesianWaypointControllerName"
+                propertyIsOptional="true"
+                propertyDefaultValue="NJointCartesianWaypointController" />
+ 
+
         <Proxy include="RobotAPI/interface/core/RobotState.h"
             humanName="Robot State Component"
             typeName="RobotStateComponentInterfacePrx"
@@ -264,6 +281,17 @@
             propertyIsOptional="true"
             propertyDefaultValue="ArVizTopic">
         </Topic>
+        <Proxy include="RobotAPI/interface/ArViz/Component.h"
+            humanName="ArViz Storage"
+            typeName="armarx::viz::StorageInterfacePrx"
+            memberName="storageProxy"
+            getterName="getStorageProxy"
+            propertyName="StorageName"
+            propertyIsOptional="true"
+            propertyDefaultValue="ArViz">
+        </Proxy>
+
+
         <Topic include="RobotAPI/interface/speech/SpeechInterface.h"
             humanName="Text to Speech Topic"
             typeName="TextListenerInterfacePrx"
@@ -298,7 +326,7 @@
             propertyDefaultValue="DynamicObstacleManager" />
         <Proxy include="RobotAPI/interface/observers/GraspCandidateObserverInterface.h"
             humanName="Grasp Candidate Observer"
-            typeName="grasping::GraspCandidateObserverInterfacePrx"
+            typeName="armarx::grasping::GraspCandidateObserverInterfacePrx"
             memberName="graspCandidateObserver"
             getterName="getGraspCandidateObserver"
             propertyName="GraspCandidateObserverName"

source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt

@@ -37,7 +37,13 @@ set(GUI_UIS
 )
 
 # Add more libraries you depend on here, e.g. ${QT_LIBRARIES}.
-set(COMPONENT_LIBS RobotAPIInterfaces aron skills aronjsonconverter SimpleConfigDialog)
+set(COMPONENT_LIBS
+    RobotAPIInterfaces
+    aron
+    RobotAPISkills
+    aronjsonconverter
+    SimpleConfigDialog
+)
 
 if(ArmarXGui_FOUND)
     armarx_gui_plugin("${LIB_NAME}" "${SOURCES}" "" "${GUI_UIS}" "" "${COMPONENT_LIBS}")