Commit c5d987c7 authored 2 years ago by Fabian Peller

Merge branch 'armem/ltm/dev' into 'master'

armem/ltm/dev

See merge request ArmarX/RobotAPI!226

parents 9fc1fad7 92057622

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/RobotState/RobotStateComponent.cpp 2 additions, 1 deletion

...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 2 additions, 1 deletion

...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp 45 additions, 6 deletions

...ents/skills/SkillProviderExample/SkillProviderExample.cpp
source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.h 10 additions, 3 deletions

...onents/skills/SkillProviderExample/SkillProviderExample.h
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui 2 additions, 2 deletions

...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 36 additions, 7 deletions

...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 7 additions, 1 deletion

.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
source/RobotAPI/interface/skills/SkillManagerInterface.ice 2 additions, 0 deletions

source/RobotAPI/interface/skills/SkillManagerInterface.ice
source/RobotAPI/interface/skills/SkillProviderInterface.ice 2 additions, 1 deletion

source/RobotAPI/interface/skills/SkillProviderInterface.ice
source/RobotAPI/libraries/armem/server/CMakeLists.txt 41 additions, 13 deletions

source/RobotAPI/libraries/armem/server/CMakeLists.txt
source/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp 1 addition, 0 deletions

...ce/RobotAPI/libraries/armem/server/MemoryToIceAdapter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/Converter.h 10 additions, 4 deletions

...API/libraries/armem/server/ltm/base/converter/Converter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/Converter.cpp 3 additions, 3 deletions

...aries/armem/server/ltm/base/converter/image/Converter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/Converter.h 7 additions, 5 deletions

...braries/armem/server/ltm/base/converter/image/Converter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/exr/ExrConverter.cpp 33 additions, 0 deletions

...rmem/server/ltm/base/converter/image/exr/ExrConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/exr/ExrConverter.h 21 additions, 0 deletions

.../armem/server/ltm/base/converter/image/exr/ExrConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.cpp 38 additions, 5 deletions

...rmem/server/ltm/base/converter/image/png/PngConverter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/image/png/PngConverter.h 6 additions, 4 deletions

.../armem/server/ltm/base/converter/image/png/PngConverter.h
source/RobotAPI/libraries/armem/server/ltm/base/converter/object/Converter.cpp 18 additions, 0 deletions

...ries/armem/server/ltm/base/converter/object/Converter.cpp
source/RobotAPI/libraries/armem/server/ltm/base/converter/object/Converter.h 30 additions, 0 deletions

...raries/armem/server/ltm/base/converter/object/Converter.h

with 316 additions and 56 deletions

Please register or to comment