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

• Merge improved SkillManagerGUI from Tobias Bodmer
• Fix aron code generation for classes without members

@reister. YOu only need to review the changes to aron (Generator.cpp)

Depends on MR armarx-core!246 (merged)

Includes MR !285 (closed) and !320 (closed)

source/RobotAPI/libraries/aron/codegeneration/codegenerator/codewriter/cpp/generator/Generator.cpp

@@ -208,10 +208,13 @@ namespace armarx::aron::codegenerator::cpp
         {
             CppMethodPtr m = CppMethodPtr(new CppMethod("virtual ~" + name + "()"));
             m->setBlock(b);
+
+            m->setEnforceBlockGeneration(true);
             return m;
         }
 
         CppMethodPtr m = CppMethodPtr(new CppMethod("virtual ~" + name + "() = default;"));
+        m->setEnforceBlockGeneration(false);
         return m;
     }
 
@@ -224,6 +227,7 @@ namespace armarx::aron::codegenerator::cpp
         CppMethodPtr m = CppMethodPtr(new CppMethod("virtual void resetSoft() override", doc.str()));
         CppBlockPtr b = this->getResetSoftBlock("");
         m->setBlock(b);
+
         m->setEnforceBlockGeneration(true);
         return m;
     }
@@ -237,6 +241,7 @@ namespace armarx::aron::codegenerator::cpp
         CppMethodPtr m = CppMethodPtr(new CppMethod("virtual void resetHard() override", doc.str()));
         CppBlockPtr b = this->getResetHardBlock("");
         m->setBlock(b);
+
         m->setEnforceBlockGeneration(true);
         return m;
     }
@@ -254,6 +259,7 @@ namespace armarx::aron::codegenerator::cpp
         std::string dummy;
         b->appendBlock(this->getWriteTypeBlock("", "", Path(), dummy));
         m->setBlock(b);
+
         m->setEnforceBlockGeneration(true);
         return m;
     }
@@ -276,6 +282,7 @@ namespace armarx::aron::codegenerator::cpp
         b->addLineAsBlock("throw ::armarx::aron::error::AronException(__PRETTY_FUNCTION__, std::string(\"An error occured during the write method of an aron generated class. The full error log was:\\n\") + " + ARON_VARIABLE_PREFIX + "_e.what());");
 
         m->setBlock(b);
+        m->setEnforceBlockGeneration(true);
         return m;
     }
 
@@ -299,6 +306,8 @@ namespace armarx::aron::codegenerator::cpp
         b->addLine("catch(const std::exception& " + ARON_VARIABLE_PREFIX + "_e)");
         b->addLineAsBlock("throw ::armarx::aron::error::AronException(__PRETTY_FUNCTION__, std::string(\"An error occured during the read method of an aron generated class. The full error log was:\\n\") + " + ARON_VARIABLE_PREFIX + "_e.what());");
         m->setBlock(b);
+
+        m->setEnforceBlockGeneration(true);
         return m;
     }
 
@@ -311,6 +320,8 @@ namespace armarx::aron::codegenerator::cpp
         CppMethodPtr m = CppMethodPtr(new CppMethod(info.returnType + " " + info.methodName + "() const", doc.str()));
         m->addLine(info.writerClassType + " writer;");
         m->addLine("return " + info.enforceConversion + "(this->write(writer))" + info.enforceMemberAccess + ";");
+
+        m->setEnforceBlockGeneration(true);
         return m;
     }
 
@@ -323,6 +334,8 @@ namespace armarx::aron::codegenerator::cpp
         CppMethodPtr m = CppMethodPtr(new CppMethod("void " + info.methodName + "(const " + info.argumentType + "& input)", doc.str()));
         m->addLine(info.readerClassType + " reader;");
         m->addLine("this->read(reader, " + info.enforceConversion + "(input)" + info.enforceMemberAccess + ");");
+
+        m->setEnforceBlockGeneration(true);
         return m;
     }
 
@@ -336,6 +349,8 @@ namespace armarx::aron::codegenerator::cpp
         m->addLine(info.returnType + " t;");
         m->addLine("t.fromAron(input);");
         m->addLine("return t;");
+
+        m->setEnforceBlockGeneration(true);
         return m;
     }
 
@@ -348,6 +363,8 @@ namespace armarx::aron::codegenerator::cpp
         CppMethodPtr m = CppMethodPtr(new CppMethod("static " + info.returnType + " " + info.methodName + "()", doc.str()));
         m->addLine(info.writerClassType + " writer;");
         m->addLine("return " + info.enforceConversion + "(writeType(writer))" + info.enforceMemberAccess + ";");
+
+        m->setEnforceBlockGeneration(true);
         return m;
     }
 
@@ -362,6 +379,8 @@ namespace armarx::aron::codegenerator::cpp
         CppBlockPtr b = this->getEqualsBlock("", "i");
         b->addLine("return true;");
         m->setBlock(b);
+
+        m->setEnforceBlockGeneration(true);
         return m;
     }