Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

aa633dea

Commit aa633dea authored 10 years ago by Mirko Wächter

Downloads
- Plain Diff

Merge branch 'master' of https://i61wiki.itec.uka.de/git/robot-api

* 'master' of https://i61wiki.itec.uka.de/git/robot-api:
  added DebugDrawer to KinematicUnitGUI
  adapted to core::observer changes

parents 043a261c a584c836

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

scenarios/deprecated/MotionControlTest/CMakeLists.txt 1 addition, 1 deletion

scenarios/deprecated/MotionControlTest/CMakeLists.txt
source/RobotAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp 1 addition, 1 deletion

...tAPI/gui_plugins/HapticUnitPlugin/HapticUnitGuiPlugin.cpp
source/RobotAPI/gui_plugins/KinematicUnitPlugin/CMakeLists.txt 1 addition, 1 deletion

...e/RobotAPI/gui_plugins/KinematicUnitPlugin/CMakeLists.txt
source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp 82 additions, 44 deletions

...ui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
source/RobotAPI/gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h 7 additions, 0 deletions

.../gui_plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.h
source/RobotAPI/gui_plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui 55 additions, 42 deletions

...gui_plugins/KinematicUnitPlugin/kinematicunitguiplugin.ui

with 147 additions and 89 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