Merge branch '59-update-objectfinder-to-priorknowledgedata' into 'master'
Resolve "Update ObjectFinder to PriorKnowledgeData" Closes #59 See merge request ArmarX/RobotAPI!174
Showing
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 4 additions, 4 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- source/RobotAPI/components/ArViz/Client/Elements.cpp 7 additions, 4 deletionssource/RobotAPI/components/ArViz/Client/Elements.cpp
- source/RobotAPI/components/ArViz/Client/Elements.h 7 additions, 2 deletionssource/RobotAPI/components/ArViz/Client/Elements.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 24 additions, 53 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h 14 additions, 6 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp 45 additions, 10 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h 28 additions, 5 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
- source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp 74 additions, 2 deletions...botAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp
- source/RobotAPI/libraries/armem_objects/SceneSnapshot.cpp 15 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/SceneSnapshot.cpp
- source/RobotAPI/libraries/armem_objects/SceneSnapshot.h 2 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/SceneSnapshot.h
- source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml 4 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml
- source/RobotAPI/libraries/armem_objects/server/class/FloorVis.h 2 additions, 2 deletions.../RobotAPI/libraries/armem_objects/server/class/FloorVis.h
- source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp 16 additions, 11 deletions...RobotAPI/libraries/armem_objects/server/class/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 1 addition, 1 deletion...otAPI/libraries/armem_objects/server/instance/Segment.cpp
Loading
Please register or sign in to comment