Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

79644a7c

Commit 79644a7c authored 1 year ago by Rainer Kartmann

Downloads
- Plain Diff

Merge branch 'object-names' into 'master'

Use common Names type for object classes, add getObjectClasses to client

See merge request !415

parents 256f2e06 549cc194

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt 0 additions, 1 deletion

source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
source/RobotAPI/libraries/ArmarXObjects/aron/ObjectNames.xml 0 additions, 23 deletions

source/RobotAPI/libraries/ArmarXObjects/aron/ObjectNames.xml
source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml 2 additions, 2 deletions

source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml
source/RobotAPI/libraries/armem_objects/aron_conversions.cpp 28 additions, 22 deletions

source/RobotAPI/libraries/armem_objects/aron_conversions.cpp
source/RobotAPI/libraries/armem_objects/aron_conversions.h 3 additions, 2 deletions

source/RobotAPI/libraries/armem_objects/aron_conversions.h
source/RobotAPI/libraries/armem_objects/client/class/ClassReader.cpp 40 additions, 0 deletions

...tAPI/libraries/armem_objects/client/class/ClassReader.cpp
source/RobotAPI/libraries/armem_objects/client/class/ClassReader.h 10 additions, 4 deletions

...botAPI/libraries/armem_objects/client/class/ClassReader.h
source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp 87 additions, 79 deletions

...RobotAPI/libraries/armem_objects/server/class/Segment.cpp
source/RobotAPI/libraries/armem_objects/types.h 2 additions, 1 deletion

source/RobotAPI/libraries/armem_objects/types.h

with 172 additions and 134 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