Commit 87135c5d authored 5 years ago by Raphael Grimm

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

parents b045828d 36c7ef68

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp 59 additions, 6 deletions

source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.cpp
source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h 13 additions, 1 deletion

source/RobotAPI/components/DebugDrawer/DebugDrawerHelper.h
source/RobotAPI/components/RobotState/RobotStateComponent.cpp 330 additions, 136 deletions

...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
source/RobotAPI/components/RobotState/RobotStateComponent.h 87 additions, 64 deletions

source/RobotAPI/components/RobotState/RobotStateComponent.h
source/RobotAPI/components/units/PlatformUnitObserver.cpp 2 additions, 2 deletions

source/RobotAPI/components/units/PlatformUnitObserver.cpp
source/RobotAPI/components/units/PlatformUnitObserver.h 1 addition, 1 deletion

source/RobotAPI/components/units/PlatformUnitObserver.h
source/RobotAPI/components/units/PlatformUnitSimulation.cpp 14 additions, 2 deletions

source/RobotAPI/components/units/PlatformUnitSimulation.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp 77 additions, 22 deletions

...t/NJointControllers/NJointCartesianWaypointController.cpp
source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.h 15 additions, 2 deletions

...nit/NJointControllers/NJointCartesianWaypointController.h
source/RobotAPI/components/units/RobotUnit/Units/PlatformSubUnit.cpp 7 additions, 2 deletions

...tAPI/components/units/RobotUnit/Units/PlatformSubUnit.cpp
source/RobotAPI/gui-plugins/CartesianWaypointControlGui/CartesianWaypointControlGuiWidget.ui 281 additions, 2 deletions

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

...ontrolGui/CartesianWaypointControlGuiWidgetController.cpp
source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp 3 additions, 3 deletions

.../gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h 1 addition, 1 deletion

...PI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.h
source/RobotAPI/interface/core/RobotState.ice 6 additions, 6 deletions

source/RobotAPI/interface/core/RobotState.ice
source/RobotAPI/interface/units/PlatformUnitInterface.ice 11 additions, 4 deletions

source/RobotAPI/interface/units/PlatformUnitInterface.ice
source/RobotAPI/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.cpp 111 additions, 118 deletions

...UIUtility/CartesianWaypointControllerConfig/RemoteGui.cpp
source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp 13 additions, 4 deletions

source/RobotAPI/libraries/core/remoterobot/RemoteRobot.cpp
source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h 2 additions, 0 deletions

source/RobotAPI/libraries/core/remoterobot/RemoteRobot.h
source/RobotAPI/libraries/core/test/DebugDrawerTopicTest.cpp 20 additions, 20 deletions

source/RobotAPI/libraries/core/test/DebugDrawerTopicTest.cpp

with 1072 additions and 399 deletions

Please register or to comment