Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • sw/armarx/robot-api
  • uwkce_singer/robot-api
  • untcg_hofmann/robot-api
  • ulqba_korosakov/RobotAPI
4 results
Show changes
Commits on Source (5)
...@@ -124,6 +124,7 @@ namespace detail ...@@ -124,6 +124,7 @@ namespace detail
// std::optional // std::optional
template <class DtoT, class BoT> template <class DtoT, class BoT>
requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
void toAron(std::optional<DtoT>& dto, const std::optional<BoT>& bo) void toAron(std::optional<DtoT>& dto, const std::optional<BoT>& bo)
{ {
if (bo.has_value()) if (bo.has_value())
...@@ -138,6 +139,7 @@ namespace detail ...@@ -138,6 +139,7 @@ namespace detail
} }
template <class DtoT, class BoT> template <class DtoT, class BoT>
requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
void fromAron(const std::optional<DtoT>& dto, std::optional<BoT>& bo) void fromAron(const std::optional<DtoT>& dto, std::optional<BoT>& bo)
{ {
if (dto.has_value()) if (dto.has_value())
...@@ -230,6 +232,7 @@ namespace detail ...@@ -230,6 +232,7 @@ namespace detail
// std::vector // std::vector
template <class DtoT, class BoT> template <class DtoT, class BoT>
requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
void toAron(std::vector<DtoT>& dtos, const std::vector<BoT>& bos) void toAron(std::vector<DtoT>& dtos, const std::vector<BoT>& bos)
{ {
dtos.clear(); dtos.clear();
...@@ -240,6 +243,7 @@ namespace detail ...@@ -240,6 +243,7 @@ namespace detail
} }
} }
template <class DtoT, class BoT> template <class DtoT, class BoT>
requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
void fromAron(const std::vector<DtoT>& dtos, std::vector<BoT>& bos) void fromAron(const std::vector<DtoT>& dtos, std::vector<BoT>& bos)
{ {
bos.clear(); bos.clear();
...@@ -339,11 +343,13 @@ namespace armarx ...@@ -339,11 +343,13 @@ namespace armarx
// std::optional // std::optional
template <class DtoT, class BoT> template <class DtoT, class BoT>
requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
void toAron(std::optional<DtoT>& dto, const std::optional<BoT>& bo) void toAron(std::optional<DtoT>& dto, const std::optional<BoT>& bo)
{ {
armarx::aron::toAron(dto, bo); armarx::aron::toAron(dto, bo);
} }
template <class DtoT, class BoT> template <class DtoT, class BoT>
requires (!aron::detail::DtoAndBoAreSame<DtoT, BoT>)
void fromAron(const std::optional<DtoT>& dto, std::optional<BoT>& bo) void fromAron(const std::optional<DtoT>& dto, std::optional<BoT>& bo)
{ {
armarx::aron::fromAron(dto, bo); armarx::aron::fromAron(dto, bo);
......
...@@ -101,13 +101,16 @@ namespace armarx::skills::gui ...@@ -101,13 +101,16 @@ namespace armarx::skills::gui
this->skillDetailsTreeWidget = new SkillDetailsTreeWidget(this->memory, this); this->skillDetailsTreeWidget = new SkillDetailsTreeWidget(this->memory, this);
this->skillDescriptionWidget = new SkillDescriptionWidget(this); this->skillDescriptionWidget = new SkillDescriptionWidget(this);
this->layout = new QVBoxLayout(); this->layout = new QVBoxLayout();
this->splitter = new QSplitter();
splitter->setOrientation(Qt::Orientation::Vertical);
// Layouting // Layouting
this->setLayout(layout); this->setLayout(layout);
layout->addWidget(this->profileMenuWidget); layout->addWidget(this->profileMenuWidget);
layout->addWidget(this->skillDescriptionWidget); layout->addWidget(splitter);
layout->addWidget(this->skillDetailsTreeWidget); splitter->addWidget(this->skillDescriptionWidget);
splitter->addWidget(this->skillDetailsTreeWidget);
layout->addWidget(this->executeSkillButton); layout->addWidget(this->executeSkillButton);
// Text // Text
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include <QGroupBox> #include <QGroupBox>
#include <QPushButton> #include <QPushButton>
#include <QSplitter>
#include <QVBoxLayout> #include <QVBoxLayout>
#include "RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetController.h" #include "RobotAPI/libraries/skills_gui/aron_tree_widget/AronTreeWidgetController.h"
...@@ -50,6 +51,7 @@ namespace armarx::skills::gui ...@@ -50,6 +51,7 @@ namespace armarx::skills::gui
void connectSignals(); void connectSignals();
QVBoxLayout* layout = nullptr; QVBoxLayout* layout = nullptr;
QSplitter* splitter = nullptr;
QPushButton* executeSkillButton = nullptr; QPushButton* executeSkillButton = nullptr;
SkillDetailsTreeWidget* skillDetailsTreeWidget = nullptr; SkillDetailsTreeWidget* skillDetailsTreeWidget = nullptr;
SkillDescriptionWidget* skillDescriptionWidget = nullptr; SkillDescriptionWidget* skillDescriptionWidget = nullptr;
......
...@@ -78,6 +78,7 @@ namespace armarx::skills::gui ...@@ -78,6 +78,7 @@ namespace armarx::skills::gui
connect( connect(
this->acceptSearchButton, &QPushButton::clicked, this, &SkillGroupBox::filterAndFetch); this->acceptSearchButton, &QPushButton::clicked, this, &SkillGroupBox::filterAndFetch);
connect(this->searchBar, &QLineEdit::editingFinished, this, &SkillGroupBox::handleSearch); connect(this->searchBar, &QLineEdit::editingFinished, this, &SkillGroupBox::handleSearch);
connect(this->searchBar, &QLineEdit::textChanged, this, &SkillGroupBox::handleSearch);
connect(this, connect(this,
&SkillGroupBox::searchRequest, &SkillGroupBox::searchRequest,
this->memory.get(), this->memory.get(),
......