Merge remote-tracking branch 'origin/master' into feature/improve-armar7-platform-movement

source/RobotAPI/libraries/aron/core/aron_conversions.h

@@ -124,6 +124,7 @@ namespace detail
 
     // std::optional
     template <class DtoT, class BoT>
+    requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
     void toAron(std::optional<DtoT>& dto, const std::optional<BoT>& bo)
     {
         if (bo.has_value())
@@ -138,6 +139,7 @@ namespace detail
     }
 
     template <class DtoT, class BoT>
+    requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
     void fromAron(const std::optional<DtoT>& dto, std::optional<BoT>& bo)
     {
         if (dto.has_value())
@@ -230,6 +232,7 @@ namespace detail
 
     // std::vector
     template <class DtoT, class BoT>
+    requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
     void toAron(std::vector<DtoT>& dtos, const std::vector<BoT>& bos)
     {
         dtos.clear();
@@ -240,6 +243,7 @@ namespace detail
         }
     }
     template <class DtoT, class BoT>
+    requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
     void fromAron(const std::vector<DtoT>& dtos, std::vector<BoT>& bos)
     {
         bos.clear();
@@ -339,11 +343,13 @@ namespace armarx
 
     // std::optional
     template <class DtoT, class BoT>
+    requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
     void toAron(std::optional<DtoT>& dto, const std::optional<BoT>& bo)
     {
         armarx::aron::toAron(dto, bo);
     }
     template <class DtoT, class BoT>
+    requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
     void fromAron(const std::optional<DtoT>& dto, std::optional<BoT>& bo)
     {
         armarx::aron::fromAron(dto, bo);

source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.cpp

@@ -101,13 +101,16 @@ namespace armarx::skills::gui
         this->skillDetailsTreeWidget = new SkillDetailsTreeWidget(this->memory, this);
         this->skillDescriptionWidget = new SkillDescriptionWidget(this);
         this->layout = new QVBoxLayout();
+        this->splitter = new QSplitter();
+        splitter->setOrientation(Qt::Orientation::Vertical);
 
         // Layouting
         this->setLayout(layout);
 
         layout->addWidget(this->profileMenuWidget);
-        layout->addWidget(this->skillDescriptionWidget);
-        layout->addWidget(this->skillDetailsTreeWidget);
+        layout->addWidget(splitter);
+        splitter->addWidget(this->skillDescriptionWidget);
+        splitter->addWidget(this->skillDetailsTreeWidget);
         layout->addWidget(this->executeSkillButton);
 
         // Text

source/RobotAPI/libraries/skills_gui/skill_details/SkillDetailsGroupBox.h

@@ -3,6 +3,7 @@
 
 #include <QGroupBox>
 #include <QPushButton>
+#include <QSplitter>
 #include <QVBoxLayout>
 
 #include "RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetController.h"
@@ -50,6 +51,7 @@ namespace armarx::skills::gui
         void connectSignals();
 
         QVBoxLayout* layout = nullptr;
+        QSplitter* splitter = nullptr;
         QPushButton* executeSkillButton = nullptr;
         SkillDetailsTreeWidget* skillDetailsTreeWidget = nullptr;
         SkillDescriptionWidget* skillDescriptionWidget = nullptr;

source/RobotAPI/libraries/skills_gui/skills/SkillGroupBox.cpp

@@ -78,6 +78,7 @@ namespace armarx::skills::gui
         connect(
             this->acceptSearchButton, &QPushButton::clicked, this, &SkillGroupBox::filterAndFetch);
         connect(this->searchBar, &QLineEdit::editingFinished, this, &SkillGroupBox::handleSearch);
+        connect(this->searchBar, &QLineEdit::textChanged, this, &SkillGroupBox::handleSearch);
         connect(this,
                 &SkillGroupBox::searchRequest,
                 this->memory.get(),