Commit f1a7a24e authored 4 years ago by Rainer Kartmann

Merge branch 'master' into ObjectPoseObserver

parents 66f94124 f3a48e93

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/Coin/VisualizationRobot.cpp 28 additions, 21 deletions

source/RobotAPI/components/ArViz/Coin/VisualizationRobot.cpp
source/RobotAPI/components/ArViz/Coin/VisualizationRobot.h 1 addition, 0 deletions

source/RobotAPI/components/ArViz/Coin/VisualizationRobot.h
source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 9 additions, 9 deletions

source/RobotAPI/components/ArViz/Coin/Visualizer.cpp
source/RobotAPI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp 15 additions, 8 deletions

...PI/components/DSObstacleAvoidance/DSObstacleAvoidance.cpp
source/RobotAPI/components/DynamicObstacleManager/DynamicObstacleManager.cpp 3 additions, 1 deletion

...ponents/DynamicObstacleManager/DynamicObstacleManager.cpp
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CMakeLists.txt 1 addition, 5 deletions

...PI/gui-plugins/CartesianWaypointControlGui/CMakeLists.txt
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.cpp 10 additions, 18 deletions

...ontrolGui/CartesianWaypointControlGuiWidgetController.cpp
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.h 5 additions, 5 deletions

...tControlGui/CartesianWaypointControlGuiWidgetController.h
source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidget.ui 110 additions, 6 deletions

.../RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidget.ui
source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp 282 additions, 1 deletion

...lugin/RobotUnitPlugin/RobotUnitPluginWidgetController.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.h 21 additions, 0 deletions

...tPlugin/RobotUnitPlugin/RobotUnitPluginWidgetController.h
source/RobotAPI/interface/units/RobotUnit/NJointBimanualObjLevelController.ice 8 additions, 0 deletions

...face/units/RobotUnit/NJointBimanualObjLevelController.ice
source/RobotAPI/libraries/DMPController/TaskSpaceDMPController.cpp 1 addition, 1 deletion

...botAPI/libraries/DMPController/TaskSpaceDMPController.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/CMakeLists.txt 4 additions, 0 deletions

...obotAPI/libraries/RobotAPIComponentPlugins/CMakeLists.txt
source/RobotAPI/libraries/RobotAPIComponentPlugins/FrameTrackingComponentPlugin.cpp 54 additions, 0 deletions

...RobotAPIComponentPlugins/FrameTrackingComponentPlugin.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/FrameTrackingComponentPlugin.h 58 additions, 0 deletions

...s/RobotAPIComponentPlugins/FrameTrackingComponentPlugin.h
source/RobotAPI/libraries/RobotAPIComponentPlugins/HandUnitComponentPlugin.cpp 54 additions, 0 deletions

...ries/RobotAPIComponentPlugins/HandUnitComponentPlugin.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/HandUnitComponentPlugin.h 58 additions, 0 deletions

...raries/RobotAPIComponentPlugins/HandUnitComponentPlugin.h
source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.cpp 19 additions, 2 deletions

...es/RobotAPIComponentPlugins/RobotStateComponentPlugin.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h 3 additions, 0 deletions

...ries/RobotAPIComponentPlugins/RobotStateComponentPlugin.h

with 744 additions and 77 deletions

Please register or to comment