Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

10b64805

Commit 10b64805 authored 5 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'master' into RobotStateComponent/PlatformPose

parents 9f273694 847ced89

No related branches found

No related tags found

1 merge request!52Robot state component/platform pose

Changes 7

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/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/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/libraries/ControllerUIUtility/CartesianWaypointControllerConfig/RemoteGui.cpp 111 additions, 118 deletions

...UIUtility/CartesianWaypointControllerConfig/RemoteGui.cpp

with 575 additions and 154 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment