Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into armem/ltm/dev

source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.cpp

@@ -23,7 +23,7 @@ namespace armarx::armem::server::grasp
         defs->topic(debugObserver);
 
         defs->optional(memoryName, "memory.Name", "Name of this memory server.");
-
+        defs->optional(enableRemoteGui, "remoteGui.enable", "Enable/Disable Remote GUI");
         return defs;
     }
 
@@ -54,10 +54,11 @@ namespace armarx::armem::server::grasp
 
     void GraspMemory::onConnectComponent()
     {
-
-       createRemoteGuiTab();
-       RemoteGui_startRunningTask();
-
+        if (enableRemoteGui)
+        {
+            createRemoteGuiTab();
+            RemoteGui_startRunningTask();
+        }
     }
 
     void GraspMemory::onDisconnectComponent()

source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.h

@@ -99,5 +99,7 @@ namespace armarx::armem::server::grasp
         };
         GuiInfo gui;
 
+        bool enableRemoteGui{true};
+
     };
 }

source/RobotAPI/libraries/aron/core/codegenerator/codewriter/cpp/generator/enum/IntEnum.cpp

@@ -43,7 +43,7 @@ namespace armarx::aron::codegenerator::cpp::generator
     {
         CppBlockPtr block_if_data = std::make_shared<CppBlock>();
         block_if_data->addLine(accessor + nextEl() + "resetSoft();");
-        return block_if_data;
+        return this->resolveMaybeResetSoftBlock(block_if_data, accessor);
     }
 
     CppBlockPtr IntEnum::getResetHardBlock(const std::string& accessor) const
@@ -57,7 +57,7 @@ namespace armarx::aron::codegenerator::cpp::generator
         {
             b->addLine(accessor + nextEl() + "resetHard();");
         }
-        return b;
+        return this->resolveMaybeResetHardBlock(b, accessor);
     }
 
     CppBlockPtr IntEnum::getWriteTypeBlock(const std::string& typeAccessor, const std::string& cppAccessor, const Path& p, std::string& variantAccessor) const