Commit 0856f4f3 authored 3 years ago by Rainer Kartmann

Merge branch 'armem/clean-up-interfaces' into armem/robot-state-memory

parents 0a27800e 1aab0aaf

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 1 addition, 1 deletion

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h 1 addition, 1 deletion

...bjectLocalizerExample/ArticulatedObjectLocalizerExample.h
source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp 10 additions, 23 deletions

.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.h 1 addition, 1 deletion

...ts/armem/client/ExampleMemoryClient/ExampleMemoryClient.h
source/RobotAPI/components/armem/client/VirtualRobotReaderExampleClient/VirtualRobotReaderExampleClient.cpp 1 addition, 1 deletion

...otReaderExampleClient/VirtualRobotReaderExampleClient.cpp
source/RobotAPI/components/armem/client/VirtualRobotReaderExampleClient/VirtualRobotReaderExampleClient.h 1 addition, 1 deletion

...obotReaderExampleClient/VirtualRobotReaderExampleClient.h
source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp 1 addition, 1 deletion

...nts/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp 3 additions, 2 deletions

...API/components/armem/server/SkillsMemory/SkillsMemory.cpp
source/RobotAPI/gui-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp 4 additions, 4 deletions

...i-plugins/ObjectPoseGui/ObjectPoseGuiWidgetController.cpp
source/RobotAPI/interface/armem/query.ice 1 addition, 2 deletions

source/RobotAPI/interface/armem/query.ice
source/RobotAPI/interface/objectpose/ObjectPoseStorageInterface.ice 3 additions, 3 deletions

...otAPI/interface/objectpose/ObjectPoseStorageInterface.ice
source/RobotAPI/libraries/armem/CMakeLists.txt 46 additions, 68 deletions

source/RobotAPI/libraries/armem/CMakeLists.txt
source/RobotAPI/libraries/armem/client/Query.cpp 1 addition, 1 deletion

source/RobotAPI/libraries/armem/client/Query.cpp
source/RobotAPI/libraries/armem/client/Query.h 2 additions, 2 deletions

source/RobotAPI/libraries/armem/client/Query.h
source/RobotAPI/libraries/armem/client/Reader.cpp 16 additions, 22 deletions

source/RobotAPI/libraries/armem/client/Reader.cpp
source/RobotAPI/libraries/armem/client/Reader.h 1 addition, 2 deletions

source/RobotAPI/libraries/armem/client/Reader.h
source/RobotAPI/libraries/armem/client/Writer.h 1 addition, 1 deletion

source/RobotAPI/libraries/armem/client/Writer.h
source/RobotAPI/libraries/armem/client/query/selectors.cpp 1 addition, 1 deletion

source/RobotAPI/libraries/armem/client/query/selectors.cpp
source/RobotAPI/libraries/armem/core.h 1 addition, 7 deletions

source/RobotAPI/libraries/armem/core.h
source/RobotAPI/libraries/armem/core/Commit.cpp 3 additions, 1 deletion

source/RobotAPI/libraries/armem/core/Commit.cpp

with 99 additions and 145 deletions

Please register or to comment