Merge branch 'feature/skills-manager-edit-arguments' of...
Merge branch 'feature/skills-manager-edit-arguments' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
No related branches found
No related tags found
Showing
- source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt 9 additions, 13 deletions...ce/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui 6 additions, 0 deletions...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 119 additions, 105 deletions...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 8 additions, 10 deletions.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/TODO 8 additions, 0 deletionssource/RobotAPI/gui-plugins/SkillManagerPlugin/TODO
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetController.cpp 114 additions, 16 deletions...ManagerPlugin/aronTreeWidget/AronTreeWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetController.h 20 additions, 9 deletions...llManagerPlugin/aronTreeWidget/AronTreeWidgetController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.cpp 128 additions, 9 deletions.../SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h 27 additions, 16 deletions...ns/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/EditMatrixWidget.cpp 249 additions, 0 deletions...ns/SkillManagerPlugin/aronTreeWidget/EditMatrixWidget.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/EditMatrixWidget.h 59 additions, 0 deletions...gins/SkillManagerPlugin/aronTreeWidget/EditMatrixWidget.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/QuaternionWidget.cpp 163 additions, 0 deletions...ns/SkillManagerPlugin/aronTreeWidget/QuaternionWidget.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/QuaternionWidget.h 65 additions, 0 deletions...gins/SkillManagerPlugin/aronTreeWidget/QuaternionWidget.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/AronTreeWidgetModal.cpp 14 additions, 6 deletions...anagerPlugin/aronTreeWidget/modal/AronTreeWidgetModal.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/AronTreeWidgetModal.h 22 additions, 17 deletions...lManagerPlugin/aronTreeWidget/modal/AronTreeWidgetModal.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/bool/AronTreeWidgetBoolInputModal.ui 0 additions, 52 deletions...aronTreeWidget/modal/bool/AronTreeWidgetBoolInputModal.ui
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/bool/AronTreeWidgetBoolInputModalController.cpp 0 additions, 27 deletions...get/modal/bool/AronTreeWidgetBoolInputModalController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/bool/AronTreeWidgetBoolInputModalController.h 0 additions, 27 deletions...idget/modal/bool/AronTreeWidgetBoolInputModalController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/dict/AronTreeWidgetDictInputModal.ui 0 additions, 88 deletions...aronTreeWidget/modal/dict/AronTreeWidgetDictInputModal.ui
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/dict/AronTreeWidgetDictInputModalController.cpp 0 additions, 73 deletions...get/modal/dict/AronTreeWidgetDictInputModalController.cpp
Loading
Please register or sign in to comment