Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

015d0f7e

Commit 015d0f7e authored 4 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into aron/dev

parents 673bc331 41990a26

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArViz/Coin/VisualizationArrowCircle.h 155 additions, 31 deletions

...RobotAPI/components/ArViz/Coin/VisualizationArrowCircle.h
source/RobotAPI/components/ArViz/Coin/VisualizationMesh.h 6 additions, 10 deletions

source/RobotAPI/components/ArViz/Coin/VisualizationMesh.h
source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 3 additions, 3 deletions

source/RobotAPI/components/ArViz/Coin/Visualizer.cpp
source/RobotAPI/components/ArViz/Coin/Visualizer.h 1 addition, 1 deletion

source/RobotAPI/components/ArViz/Coin/Visualizer.h
source/RobotAPI/gui-plugins/CartesianImpedanceController/CartesianImpedanceControllerWidget.ui 91 additions, 25 deletions

...ImpedanceController/CartesianImpedanceControllerWidget.ui
source/RobotAPI/gui-plugins/CartesianImpedanceController/CartesianImpedanceControllerWidgetController.cpp 11 additions, 2 deletions

...ntroller/CartesianImpedanceControllerWidgetController.cpp
source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h 1 addition, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
source/RobotAPI/libraries/RobotAPINJointControllerWidgets/CartesianImpedanceControllerConfigWidget.cpp 12 additions, 12 deletions

...ollerWidgets/CartesianImpedanceControllerConfigWidget.cpp
source/RobotAPI/libraries/RobotAPINJointControllerWidgets/CartesianImpedanceControllerConfigWidget.ui 86 additions, 13 deletions

...rollerWidgets/CartesianImpedanceControllerConfigWidget.ui

with 366 additions and 97 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