Merge branch 'armem/memory' into 'master'
ArMem Memory Updates See merge request ArmarX/RobotAPI!102
No related branches found
No related tags found
Showing
- scenarios/ArMemExample/config/ArMemExampleClient.cfg 9 additions, 1 deletionscenarios/ArMemExample/config/ArMemExampleClient.cfg
- scenarios/ArMemExample/config/ArMemExampleMemory.cfg 8 additions, 0 deletionsscenarios/ArMemExample/config/ArMemExampleMemory.cfg
- source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp 221 additions, 164 deletions...omponents/armem/ArMemExampleClient/ArMemExampleClient.cpp
- source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h 31 additions, 11 deletions.../components/armem/ArMemExampleClient/ArMemExampleClient.h
- source/RobotAPI/components/armem/ArMemExampleMemory/ArMemExampleMemory.h 1 addition, 2 deletions.../components/armem/ArMemExampleMemory/ArMemExampleMemory.h
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui 10 additions, 10 deletions.../gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidget.ui
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 39 additions, 11 deletions...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h 5 additions, 5 deletions...ins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
- source/RobotAPI/interface/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/armem.ice 1 addition, 0 deletionssource/RobotAPI/interface/armem.ice
- source/RobotAPI/interface/armem/MemoryListenerInterface.ice 18 additions, 0 deletionssource/RobotAPI/interface/armem/MemoryListenerInterface.ice
- source/RobotAPI/interface/armem/ReadingInterface.ice 1 addition, 28 deletionssource/RobotAPI/interface/armem/ReadingInterface.ice
- source/RobotAPI/interface/armem/memory.ice 2 additions, 0 deletionssource/RobotAPI/interface/armem/memory.ice
- source/RobotAPI/interface/armem/query.ice 105 additions, 78 deletionssource/RobotAPI/interface/armem/query.ice
- source/RobotAPI/libraries/armem/CMakeLists.txt 24 additions, 6 deletionssource/RobotAPI/libraries/armem/CMakeLists.txt
- source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp 28 additions, 0 deletionssource/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
- source/RobotAPI/libraries/armem/client/ComponentPlugin.h 37 additions, 0 deletionssource/RobotAPI/libraries/armem/client/ComponentPlugin.h
- source/RobotAPI/libraries/armem/client/MemoryClientComponentPlugin.cpp 0 additions, 26 deletions...PI/libraries/armem/client/MemoryClientComponentPlugin.cpp
- source/RobotAPI/libraries/armem/client/MemoryClientComponentPlugin.h 0 additions, 55 deletions...tAPI/libraries/armem/client/MemoryClientComponentPlugin.h
- source/RobotAPI/libraries/armem/client/MemoryReader.cpp 0 additions, 72 deletionssource/RobotAPI/libraries/armem/client/MemoryReader.cpp
Loading
Please register or sign in to comment