Merge branch '61-implement-resolution-of-memory-links-in-aron-data-during-query' into 'master'
Resolve "Implement Resolution of Memory Links in ARON Data during Query" Closes #61 See merge request ArmarX/RobotAPI!213
Showing
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp 103 additions, 12 deletions.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.h 3 additions, 0 deletions...ts/armem/client/ExampleMemoryClient/ExampleMemoryClient.h
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 1 addition, 0 deletions...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
- source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml 26 additions, 5 deletions...omponents/armem/server/ExampleMemory/aron/ExampleData.xml
- source/RobotAPI/libraries/armem/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/armem/CMakeLists.txt
- source/RobotAPI/libraries/armem/aron/MemoryLink.xml 19 additions, 0 deletionssource/RobotAPI/libraries/armem/aron/MemoryLink.xml
- source/RobotAPI/libraries/armem/client/Reader.cpp 211 additions, 1 deletionsource/RobotAPI/libraries/armem/client/Reader.cpp
- source/RobotAPI/libraries/armem/client/Reader.h 60 additions, 2 deletionssource/RobotAPI/libraries/armem/client/Reader.h
- source/RobotAPI/libraries/armem/server/RemoteGuiAronDataVisitor.h 8 additions, 0 deletions...obotAPI/libraries/armem/server/RemoteGuiAronDataVisitor.h
- source/RobotAPI/libraries/armem/util/util.cpp 66 additions, 1 deletionsource/RobotAPI/libraries/armem/util/util.cpp
- source/RobotAPI/libraries/armem/util/util.h 34 additions, 0 deletionssource/RobotAPI/libraries/armem/util/util.h
- source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp 27 additions, 11 deletionssource/RobotAPI/libraries/armem_gui/MemoryViewer.cpp
- source/RobotAPI/libraries/armem_gui/MemoryViewer.h 4 additions, 3 deletionssource/RobotAPI/libraries/armem_gui/MemoryViewer.h
- source/RobotAPI/libraries/armem_gui/instance/tree_builders/DataTreeBuilder.cpp 13 additions, 8 deletions...ries/armem_gui/instance/tree_builders/DataTreeBuilder.cpp
- source/RobotAPI/libraries/armem_gui/instance/tree_builders/DataTreeBuilder.h 4 additions, 4 deletions...raries/armem_gui/instance/tree_builders/DataTreeBuilder.h
- source/RobotAPI/libraries/armem_gui/instance/tree_builders/TypedDataTreeBuilder.cpp 23 additions, 23 deletions...armem_gui/instance/tree_builders/TypedDataTreeBuilder.cpp
- source/RobotAPI/libraries/armem_gui/query_widgets/QueryWidget.cpp 38 additions, 7 deletions...obotAPI/libraries/armem_gui/query_widgets/QueryWidget.cpp
- source/RobotAPI/libraries/armem_gui/query_widgets/QueryWidget.h 5 additions, 2 deletions.../RobotAPI/libraries/armem_gui/query_widgets/QueryWidget.h
- source/RobotAPI/libraries/aron/common/CMakeLists.txt 2 additions, 0 deletionssource/RobotAPI/libraries/aron/common/CMakeLists.txt
- source/RobotAPI/libraries/aron/common/util/object_finders.cpp 60 additions, 0 deletions...ce/RobotAPI/libraries/aron/common/util/object_finders.cpp
Loading
Please register or sign in to comment