Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

aa6f304d

Commit aa6f304d authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'object-pose-json-serialization' into 'master'

Object pose JSON serialization

See merge request ArmarX/RobotAPI!77

parents 55e93590 1d473e1a

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt 2 additions, 0 deletions

source/RobotAPI/components/ObjectPoseObserver/CMakeLists.txt
source/RobotAPI/components/ObjectPoseObserver/json_conversions.cpp 58 additions, 0 deletions

...botAPI/components/ObjectPoseObserver/json_conversions.cpp
source/RobotAPI/components/ObjectPoseObserver/json_conversions.h 13 additions, 0 deletions

...RobotAPI/components/ObjectPoseObserver/json_conversions.h
source/RobotAPI/libraries/ArmarXObjects/ArmarXObjects.cpp 0 additions, 28 deletions

source/RobotAPI/libraries/ArmarXObjects/ArmarXObjects.cpp
source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt 4 additions, 2 deletions

source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
source/RobotAPI/libraries/ArmarXObjects/ObjectID.h 4 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/ObjectID.h
source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp 20 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp
source/RobotAPI/libraries/ArmarXObjects/json_conversions.h 14 additions, 0 deletions

source/RobotAPI/libraries/ArmarXObjects/json_conversions.h

with 115 additions and 30 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