- Mar 13, 2023
-
-
Fabian Tërnava authored
# Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetModalCreator.cpp
-
Fabian Tërnava authored
-
- Mar 01, 2023
-
-
Fabian Tërnava authored
-
- Feb 21, 2023
-
-
Fabian Tërnava authored
Merge remote-tracking branch 'origin/feature/skills-manager-edit-arguments' into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/TODO # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
-
Tobias Bodmer authored
also get rid of some TODOs
-
Tobias Bodmer authored
-
- Feb 20, 2023
-
-
Fabian Tërnava authored
-
Fabian Tërnava authored
Merge branch 'fix/aron-code-generation' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master
-
Fabian Tërnava authored
-
Fabian Tërnava authored
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/CMakeLists.txt # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetController.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetCreator.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetSetter.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/EditMatrixWidget.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.cpp # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/widgets/QuaternionWidget.h
-
https://git.h2t.iar.kit.edu/sw/armarx/robot-apiFabian Tërnava authored
Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master
-
- Feb 19, 2023
-
-
Fabian Reister authored
-
- Feb 18, 2023
-
-
Tobias Bodmer authored
noticing broken items, even when they are not touched. Also coloring their parents in an orange color, so that the error is noticable even when not expanded. For better generality (and was useful for error reporting): All widgets introduced inherit from a common base class: CustomWidget. It holds a signal definition that can be used to directly forward signals to its QTreeWidgetItem underneath.
-
- Feb 17, 2023
-
-
Fabian Tërnava authored
-
Fabian Tërnava authored
# Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
-
Christoph Pohl authored
Fix/robot state memory memory leak See merge request !319
-
Christoph Pohl authored
-
Fabian Tërnava authored
Merge branch 'test/merge-branch-skills-to-master' of git.h2t.iar.kit.edu:sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
-
Fabian Tërnava authored
Merge branch 'master' of git.h2t.iar.kit.edu:sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
-
Christoph Pohl authored
-
Fabian Tërnava authored
-
Fabian Tërnava authored
-
https://git.h2t.iar.kit.edu/sw/armarx/robot-apiFabian Tërnava authored
Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/visitors/AronTreeWidgetConverter.cpp
-
Christoph Pohl authored
-
- Feb 16, 2023
-
-
Christoph Pohl authored
-
Christoph Pohl authored
-
Christoph Pohl authored
-
Christoph Pohl authored
-
Christoph Pohl authored
-
Christoph Pohl authored
-
Christoph Pohl authored
-
Christoph Pohl authored
-
Christoph Pohl authored
-
Tobias Bodmer authored
no idea why it works...
-
Tobias Bodmer authored
-
Tobias Bodmer authored
- move into own sub-folder widgets - Wrapper around QComboBox - extract ColorPalette creation - extract string creation for Lists
-
Christoph Pohl authored
-
Fabian Reister authored
Fix: Robot State Memory: memory leak See merge request !318
-
- Feb 15, 2023
-
-
Fabian Tërnava authored
This reverts commit d7f046dd.
-
Fabian Tërnava authored
This reverts commit d7f046dd. # Conflicts: # source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp
-