Skip to content
Snippets Groups Projects
  1. Feb 20, 2023
    • Fabian Tërnava's avatar
      Merge branch 'feature/skills-manager-edit-arguments' of... · 72093353
      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
      72093353
    • Fabian Tërnava's avatar
      Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into... · 00ee4e44
      Fabian Tërnava authored
      Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master
      00ee4e44
  2. Feb 18, 2023
    • Tobias Bodmer's avatar
      Way better parse error reporting · c28d544e
      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.
      c28d544e
  3. Feb 17, 2023
  4. Feb 16, 2023
  5. Feb 15, 2023
  6. Feb 13, 2023
Loading