Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

ac66ff68

Commit ac66ff68 authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'ObjectPoseObserver/attachment-in-gui' into 'master'

ObjectPoseObserver: Attachment in GUI

See merge request ArmarX/RobotAPI!86

parents dde9e67e 3bf29474

Branches armem/fix/no-locks-memory-viewer

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp 18 additions, 3 deletions

...tAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h 9 additions, 7 deletions

...botAPI/components/ObjectPoseObserver/ObjectPoseObserver.h
source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui 13 additions, 1 deletion

...RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui
source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp 94 additions, 1 deletion

...i-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h 6 additions, 0 deletions

...gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.h
source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice 16 additions, 2 deletions

source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice

with 156 additions and 14 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