Skip to content
Snippets Groups Projects

Merge of all branches of Fabian PK (related to skills)

Merged Merge of all branches of Fabian PK (related to skills)
test/merge-branch-skills-to-master into master
Merged Fabian Tërnava requested to merge test/merge-branch-skills-to-master into master
Viewing commit c5744eae
Prev Next
Show latest version
11 files
+ 68
− 32
Compare changes
  • Side-by-side
  • Inline
Files
11
  • c5744eae
    Tobias Bodmer
    Throw out static widget variable · c5744eae
    Tobias Bodmer authored 
    - static variable gone
- replaced by pointer for each element in hierarchy. (Imagine two persistent trees, total chaos otherwise)
- raw matrix data has column wise sorting. Fix reading and writing code.
- QLineEdit now focuses start of line after setText.
source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/dict/AronTreeWidgetDictInputModalController.cpp
+ 5
− 2
#include "AronTreeWidgetDictInputModalController.h"
#include <RobotAPI/libraries/aron/core/type/variant/All.h>
#include "../../visitors/AronTreeWidgetCreator.h"
namespace armarx
@@ -59,12 +60,14 @@ namespace armarx
auto d = aron::type::Dict::DynamicCastAndCheck(t);
auto ac = d->getAcceptedType();
AronTreeWidgetCreatorVisitor v;
AronTreeWidgetCreatorVisitor v(nullptr);
v.setTopLevelWidget(widget.treeWidgetDict);
aron::type::visit(v, ac);
if (v.createdQWidgetItem)
{
v.createdQWidgetItem->setText(aron_tree_widget::constantes::TREE_WIDGET_ITEM_NAME, s);
v.createdQWidgetItem->setText(aron_tree_widget::constantes::TREE_WIDGET_ITEM_NAME,
s);
addedItems.push_back(v.createdQWidgetItem);
widget.treeWidgetDict->addTopLevelItem(v.createdQWidgetItem);
}