Merge remote-tracking branch 'origin/armem/dev' into statechart_memory_3
No related branches found
No related tags found
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 8 additions, 0 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 43 additions, 0 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- source/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp 22 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPose.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h 3 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPose.h
- source/RobotAPI/libraries/armem/client/Reader.cpp 14 additions, 3 deletionssource/RobotAPI/libraries/armem/client/Reader.cpp
- source/RobotAPI/libraries/armem/client/Reader.h 16 additions, 1 deletionsource/RobotAPI/libraries/armem/client/Reader.h
- source/RobotAPI/libraries/armem/client/query/Builder.cpp 56 additions, 0 deletionssource/RobotAPI/libraries/armem/client/query/Builder.cpp
- source/RobotAPI/libraries/armem/client/query/Builder.h 18 additions, 0 deletionssource/RobotAPI/libraries/armem/client/query/Builder.h
- source/RobotAPI/libraries/armem/core/Commit.cpp 11 additions, 0 deletionssource/RobotAPI/libraries/armem/core/Commit.cpp
- source/RobotAPI/libraries/armem/core/Commit.h 3 additions, 0 deletionssource/RobotAPI/libraries/armem/core/Commit.h
- source/RobotAPI/libraries/armem/core/aron_conversions.cpp 7 additions, 0 deletionssource/RobotAPI/libraries/armem/core/aron_conversions.cpp
- source/RobotAPI/libraries/armem/core/aron_conversions.h 4 additions, 0 deletionssource/RobotAPI/libraries/armem/core/aron_conversions.h
- source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h 17 additions, 1 deletionsource/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
- source/RobotAPI/libraries/armem/core/base/MemoryBase.h 1 addition, 1 deletionsource/RobotAPI/libraries/armem/core/base/MemoryBase.h
- source/RobotAPI/libraries/armem/core/workingmemory/Visitor.cpp 60 additions, 20 deletions...e/RobotAPI/libraries/armem/core/workingmemory/Visitor.cpp
- source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp 32 additions, 1 deletion...ce/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
- source/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp 1 addition, 1 deletionsource/RobotAPI/libraries/armem_gui/memory/TreeWidget.cpp
- source/RobotAPI/libraries/armem_objects/aron_conversions.cpp 8 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/aron_conversions.cpp
- source/RobotAPI/libraries/armem_objects/aron_conversions.h 10 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/aron_conversions.h
- source/RobotAPI/libraries/aron/common/aron/OrientedBox.xml 1 addition, 0 deletionssource/RobotAPI/libraries/aron/common/aron/OrientedBox.xml
Loading
Please register or sign in to comment