Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

db584a03

Commit db584a03 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 00cc17f4 dae865f8

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ViewSelection/ViewSelection.cpp 54 additions, 10 deletions

source/RobotAPI/components/ViewSelection/ViewSelection.cpp
source/RobotAPI/components/ViewSelection/ViewSelection.h 7 additions, 2 deletions

source/RobotAPI/components/ViewSelection/ViewSelection.h
source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 10 additions, 13 deletions

...ui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
source/RobotAPI/gui-plugins/ViewSelection/ViewSelectionWidget.ui 32 additions, 11 deletions

...RobotAPI/gui-plugins/ViewSelection/ViewSelectionWidget.ui
source/RobotAPI/gui-plugins/ViewSelection/ViewSelectionWidgetController.cpp 41 additions, 2 deletions

...i-plugins/ViewSelection/ViewSelectionWidgetController.cpp
source/RobotAPI/gui-plugins/ViewSelection/ViewSelectionWidgetController.h 2 additions, 0 deletions

...gui-plugins/ViewSelection/ViewSelectionWidgetController.h
source/RobotAPI/interface/components/ViewSelectionInterface.ice 3 additions, 1 deletion

.../RobotAPI/interface/components/ViewSelectionInterface.ice
source/RobotAPI/libraries/core/PIDController.h 1 addition, 1 deletion

source/RobotAPI/libraries/core/PIDController.h

with 150 additions and 40 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