Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

70927e27

Commit 70927e27 authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'ObjectPoseObserver/attachment' into 'master'

ObjectPoseObserver: Attachment

See merge request ArmarX/RobotAPI!85

parents e696310f c13ab617

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

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ObjectPoseObserver/ObjectPose.cpp 70 additions, 4 deletions

source/RobotAPI/components/ObjectPoseObserver/ObjectPose.cpp
source/RobotAPI/components/ObjectPoseObserver/ObjectPose.h 18 additions, 0 deletions

source/RobotAPI/components/ObjectPoseObserver/ObjectPose.h
source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp 292 additions, 12 deletions

...tAPI/components/ObjectPoseObserver/ObjectPoseObserver.cpp
source/RobotAPI/components/ObjectPoseObserver/ObjectPoseObserver.h 26 additions, 4 deletions

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

...RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidget.ui
source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp 27 additions, 16 deletions

...i-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice 45 additions, 0 deletions

source/RobotAPI/interface/objectpose/ObjectPoseObserver.ice
source/RobotAPI/interface/objectpose/object_pose_types.ice 13 additions, 0 deletions

source/RobotAPI/interface/objectpose/object_pose_types.ice

with 509 additions and 49 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