Skip to content
Snippets Groups Projects

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

Merged Fabian Tërnava requested to merge test/merge-branch-skills-to-master into master
3 files
+ 39
13
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -64,7 +64,6 @@ namespace armarx
AronTreeWidgetConverterVisitor::handleErrors(AronTreeWidgetConverterVisitor childV,
bool ownFault)
{
// TODO debug this. Make target back to debugabble
isDirectError |= ownFault;
hasTransitiveError |= childV.isDirectError || childV.hasTransitiveError;
@@ -117,7 +116,7 @@ namespace armarx
AronTreeWidgetConverterVisitor v(el, x);
aron::type::visit(v, i->getAcceptedType());
auto key = it->text(0).toStdString();
// TODO: handle key errors more elegantly / separately
// TODO: handle key errors more elegantly / separately, fine for now
handleErrors(v, createdAronDict->hasElement(key));
if (v.createdAron && v.isConversionSuccessful() && !createdAronDict->hasElement(key))
{
Loading