Merge branch 'feature/diskMemory' into 'armem/dev'
Memory structure changes, query_proc structure changes (Base classes / templated) See merge request ArmarX/RobotAPI!136
Showing
- scenarios/ArMemExample/ArMemExample.scx 3 additions, 3 deletionsscenarios/ArMemExample/ArMemExample.scx
- scenarios/ArMemExample/config/ExampleMemory.cfg 68 additions, 60 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/ArMemExample/config/ExampleMemoryClient.cfg 61 additions, 53 deletionsscenarios/ArMemExample/config/ExampleMemoryClient.cfg
- scenarios/ArMemExample/config/MemoryNameSystem.cfg 35 additions, 35 deletionsscenarios/ArMemExample/config/MemoryNameSystem.cfg
- source/RobotAPI/components/armem/client/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/components/armem/client/CMakeLists.txt
- source/RobotAPI/components/armem/client/ExampleClient/test/ArMemExampleClientTest.cpp 0 additions, 37 deletions...rmem/client/ExampleClient/test/ArMemExampleClientTest.cpp
- source/RobotAPI/components/armem/client/ExampleClient/test/CMakeLists.txt 0 additions, 5 deletions...components/armem/client/ExampleClient/test/CMakeLists.txt
- source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt 3 additions, 3 deletions...omponents/armem/client/ExampleMemoryClient/CMakeLists.txt
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp 38 additions, 38 deletions.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.h 6 additions, 6 deletions...ts/armem/client/ExampleMemoryClient/ExampleMemoryClient.h
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 5 additions, 5 deletions...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
- source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp 3 additions, 11 deletions...nts/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
- source/RobotAPI/components/armem/server/GeneralPurposeMemory/GeneralPurposeMemory.cpp 1 addition, 1 deletion...rmem/server/GeneralPurposeMemory/GeneralPurposeMemory.cpp
- source/RobotAPI/components/armem/server/RobotSensorMemory/RobotSensorMemory.cpp 5 additions, 5 deletions...ents/armem/server/RobotSensorMemory/RobotSensorMemory.cpp
- source/RobotAPI/components/armem/server/RobotSensorMemory/RobotSensorMemory.h 2 additions, 1 deletion...onents/armem/server/RobotSensorMemory/RobotSensorMemory.h
- source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp 1 addition, 1 deletion...API/components/armem/server/SkillsMemory/SkillsMemory.cpp
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui 20 additions, 0 deletions.../gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 2 additions, 0 deletions...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
- source/RobotAPI/interface/CMakeLists.txt 2 additions, 1 deletionsource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/armem/io.ice 3 additions, 27 deletionssource/RobotAPI/interface/armem/io.ice
Loading
Please register or sign in to comment