Commit 8027c8c4 authored 4 years ago by Rainer Kartmann

Merge branch 'armem/dev' into 'master'

armem/dev

See merge request ArmarX/RobotAPI!120

parents 3f81a7e3 512b9464

1 merge request!120armem/dev

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp 149 additions, 157 deletions

...omponents/armem/ArMemExampleClient/ArMemExampleClient.cpp
source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h 8 additions, 14 deletions

.../components/armem/ArMemExampleClient/ArMemExampleClient.h
source/RobotAPI/components/armem/ArMemExampleMemory/ArMemExampleMemory.cpp 12 additions, 13 deletions

...omponents/armem/ArMemExampleMemory/ArMemExampleMemory.cpp
source/RobotAPI/components/armem/ArMemExampleMemory/ArMemExampleMemory.h 3 additions, 12 deletions

.../components/armem/ArMemExampleMemory/ArMemExampleMemory.h
source/RobotAPI/components/armem/ArMemExampleMemory/aron/ExampleData.xml 1 addition, 1 deletion

.../components/armem/ArMemExampleMemory/aron/ExampleData.xml
source/RobotAPI/components/armem/ArMemExampleMemory/test/ArMemExampleMemoryTest.cpp 1 addition, 1 deletion

.../armem/ArMemExampleMemory/test/ArMemExampleMemoryTest.cpp
source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 41 additions, 29 deletions

...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h 10 additions, 5 deletions

...ins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h 2 additions, 1 deletion

source/RobotAPI/libraries/ArmarXObjects/ObjectPose.h
source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp 12 additions, 0 deletions

source/RobotAPI/libraries/armem/client/ComponentPlugin.cpp
source/RobotAPI/libraries/armem/client/ComponentPlugin.h 11 additions, 0 deletions

source/RobotAPI/libraries/armem/client/ComponentPlugin.h
source/RobotAPI/libraries/armem/client/Query.cpp 8 additions, 0 deletions

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

source/RobotAPI/libraries/armem/client/Query.h
source/RobotAPI/libraries/armem/client/Reader.h 23 additions, 5 deletions

source/RobotAPI/libraries/armem/client/Reader.h
source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp 10 additions, 0 deletions

...RobotAPI/libraries/armem/client/ReaderComponentPlugin.cpp
source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h 4 additions, 0 deletions

...e/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
source/RobotAPI/libraries/armem/client/Writer.cpp 33 additions, 0 deletions

source/RobotAPI/libraries/armem/client/Writer.cpp
source/RobotAPI/libraries/armem/client/Writer.h 8 additions, 0 deletions

source/RobotAPI/libraries/armem/client/Writer.h
source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp 10 additions, 0 deletions

...RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h 4 additions, 0 deletions

...e/RobotAPI/libraries/armem/client/WriterComponentPlugin.h

with 352 additions and 238 deletions

Please register or to comment