Merge remote-tracking branch 'origin/master' into...

Merge remote-tracking branch 'origin/master' into feature/move-laser-scanner-feature-extraction-to-navigation

source/RobotAPI/libraries/aron/core/type/variant/container/Object.cpp

@@ -54,15 +54,19 @@ namespace armarx::aron::type
         {
             memberTypes[key] = FromAronDTO(*t, path.withElement(key));
         }
+        if (o.parent)
+        {
+            extends = FromAronObjectDTO(o.parent);
+        }
     }
 
-    ObjectPtr Object::FromAronObjectDTO(const type::dto::AronObjectPtr& aron)
+    ObjectPtr Object::FromAronObjectDTO(const type::dto::AronObjectPtr& aron, const aron::Path& path)
     {
         if (!aron)
         {
             return nullptr;
         }
-        return std::make_shared<Object>(*aron);
+        return std::make_shared<Object>(*aron, path);
     }
 
     type::dto::AronObjectPtr Object::ToAronObjectDTO(const ObjectPtr& aron)
@@ -141,6 +145,7 @@ namespace armarx::aron::type
         ARMARX_CHECK_NOT_NULL(p);
         type::dto::AronObjectPtr ex = p->toAronObjectDTO();
         ARMARX_CHECK_NOT_NULL(ex);
+        aron->parent = ex;
         extends = p;
     }
 

source/RobotAPI/libraries/aron/core/type/variant/container/Object.h

@@ -48,7 +48,8 @@ namespace armarx::aron::type
         Object(const std::string&, const std::vector<std::string>& templates = {}, const std::vector<std::string>& templateInstantiations = {}, const std::map<std::string, VariantPtr>& = {}, const Path& = Path());
         Object(const type::dto::AronObject&, const Path& = Path());
 
-        static ObjectPtr FromAronObjectDTO(const type::dto::AronObjectPtr&);
+        static ObjectPtr FromAronObjectDTO(const type::dto::AronObjectPtr&,
+                                           const aron::Path& path = aron::Path());
         static type::dto::AronObjectPtr ToAronObjectDTO(const ObjectPtr&);
 
         // public member functions