Merge branch 'armem/ltm/dev' into 'master'
armem/ltm/dev See merge request ArmarX/RobotAPI!226
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 deletionssource/RobotAPI/interface/skills/SkillManagerInterface.ice
- source/RobotAPI/interface/skills/SkillProviderInterface.ice 2 additions, 1 deletionsource/RobotAPI/interface/skills/SkillProviderInterface.ice
- source/RobotAPI/libraries/armem/server/CMakeLists.txt 41 additions, 13 deletionssource/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
Loading
Please register or sign in to comment