Changeset 162:df05d318ac78 in finroc_plugins_runtime_construction

Timestamp:

08.04.2021 06:38:58 (2 weeks ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Allows 'interface' and 'include' elements in XML structure files to reference existing components.

File:

• tFinstructable.cpp (modified) (3 diffs)

tFinstructable.cpp

@@ -450 +450 @@
           {
             file = node->GetStringAttribute("file");
-            auto created = new tIncludeElement(this->GetFrameworkElement(), file, file);
+            auto parent = this->GetFrameworkElement();
+            if (node->HasAttribute("element"))
+            {
+              rrlib::uri::tURIElements uri_elements;
+              rrlib::uri::tURI uri(node->GetStringAttribute("element"));
+              uri.Parse(uri_elements);
+              parent = GetFrameworkElement()->GetDescendant(uri_elements.path);
+              if (!parent)
+              {
+                throw std::runtime_error("Element '" + node->GetStringAttribute("element") + "' not found");
+              }
+            }
+            auto created = new tIncludeElement(parent, file, file);
             origin_data.order = std::chrono::steady_clock::now().time_since_epoch().count();
             if (!include_instance)
@@ -474 +486 @@
         {
           tEditableInterfaces* editable_interfaces = GetFrameworkElement()->GetAnnotation<tEditableInterfaces>();
+          auto include_instance = IncludeFinstructable(this);
+          core::tFrameworkElement* extended_element = nullptr;
+          if (include_instance && node->HasAttribute("element"))
+          {
+            rrlib::uri::tURIElements uri_elements;
+            rrlib::uri::tURI uri(node->GetStringAttribute("element"));
+            uri.Parse(uri_elements);
+            extended_element = GetFrameworkElement()->GetDescendant(uri_elements.path);
+            editable_interfaces = extended_element ? extended_element->GetAnnotation<tEditableInterfaces>() : nullptr;
+          }
           if (editable_interfaces)
           {
             try
             {
-              auto include_instance = IncludeFinstructable(this);
               core::tPortGroup& loaded_interface = editable_interfaces->LoadInterfacePorts(*node, !include_instance, include_instance ? include_instance->origin : nullptr);
 
@@ -512 +533 @@
                   }
                 }
+              }
+
+              if (extended_element)
+              {
+                parameters::internal::tStaticParameterList::DoStaticParameterEvaluation(*extended_element);
               }
             }