Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

dfe887c8

Commit dfe887c8 authored 4 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge branch 'CartesianImpedanceControllerGui' into 'master'

Add changes to CartesianImpedanceController GUI

See merge request ArmarX/RobotAPI!122

parents 6149152e c6ded8d5

No related branches found

No related tags found

1 merge request!122Add changes to CartesianImpedanceController GUI

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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/RobotAPINJointControllerWidgets/CartesianImpedanceControllerConfigWidget.cpp 12 additions, 12 deletions

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

...rollerWidgets/CartesianImpedanceControllerConfigWidget.ui

with 200 additions and 52 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