Commit d539d73b authored 5 years ago by Fabian Paus

Merge branch 'master' into arviz

parents 2d3c8b2a 51f215c8

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp 321 additions, 211 deletions

source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp
source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h 93 additions, 39 deletions

source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
source/RobotAPI/components/KITProstheticHandUnit/KITProstheticHandUnit.cpp 12 additions, 2 deletions

...omponents/KITProstheticHandUnit/KITProstheticHandUnit.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp 68 additions, 17 deletions

...t/NJointControllers/NJointCartesianWaypointController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.h 39 additions, 31 deletions

...nit/NJointControllers/NJointCartesianWaypointController.h
source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleControllerManagement.cpp 20 additions, 3 deletions

.../RobotUnitModules/RobotUnitModuleControllerManagement.cpp
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidget.ui 141 additions, 66 deletions

...anWaypointControlGui/CartesianWaypointControlGuiWidget.ui
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidgetController.cpp 40 additions, 10 deletions

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

...tControlGui/CartesianWaypointControlGuiWidgetController.h
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.cpp 0 additions, 2 deletions

...plugins/RobotUnitPlugin/QWidgets/ControlDevicesWidget.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp 0 additions, 2 deletions

...obotUnitPlugin/QWidgets/NJointControllerClassesWidget.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp 0 additions, 2 deletions

...gins/RobotUnitPlugin/QWidgets/NJointControllersWidget.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.cpp 31 additions, 22 deletions

...-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.cpp
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h 5 additions, 0 deletions

...ui-plugins/RobotUnitPlugin/QWidgets/RobotUnitWidgetBase.h
source/RobotAPI/gui-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.cpp 0 additions, 2 deletions

...-plugins/RobotUnitPlugin/QWidgets/SensorDevicesWidget.cpp
source/RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.ice 1 addition, 0 deletions

...ace/units/RobotUnit/NJointCartesianWaypointController.ice
source/RobotAPI/libraries/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/libraries/CMakeLists.txt
source/RobotAPI/libraries/RobotAPIComponentPlugins/CMakeLists.txt 23 additions, 0 deletions

...obotAPI/libraries/RobotAPIComponentPlugins/CMakeLists.txt
source/RobotAPI/libraries/RobotAPIComponentPlugins/DebugDrawerHelperComponentPlugin.cpp 219 additions, 0 deletions

...tAPIComponentPlugins/DebugDrawerHelperComponentPlugin.cpp
source/RobotAPI/libraries/RobotAPIComponentPlugins/DebugDrawerHelperComponentPlugin.h 116 additions, 0 deletions

...botAPIComponentPlugins/DebugDrawerHelperComponentPlugin.h

with 1136 additions and 411 deletions

Please register or to comment