Changeset 484:1a2da4a0243c in finroc_core

Timestamp:

20.03.2021 11:35:42 (10 months ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Adds scoped port factories (only handle port creation below the specified framework element)

Location:

port

Files:

• tPortFactory.cpp (modified) (3 diffs)
• tPortFactory.h (modified) (1 diff)

port/tPortFactory.cpp

@@ -66 +66 @@
 // Implementation
 //----------------------------------------------------------------------
+
+namespace
+{
+
 /*!
  * \return List of all available port factories
@@ -75 +79 @@
 }
 
+class tFactoryAnnotation : public core::tAnnotation
+{
+public:
+
+  tFactoryAnnotation(tPortFactory& factory) :
+    factory(factory)
+  {}
+
+  tPortFactory& factory;
+};
+
+}
+
+
 tPortFactory::tPortFactory()
 {
@@ -80 +98 @@
 }
 
+tPortFactory::tPortFactory(core::tFrameworkElement* handles_elements_below)
+{
+  if (handles_elements_below)
+  {
+    handles_elements_below->EmplaceAnnotation<tFactoryAnnotation>(*this);
+  }
+}
+
 tAbstractPort* tPortFactory::CreatePort(const std::string& port_name, tFrameworkElement& parent, const rrlib::rtti::tType& dt, tFrameworkElement::tFlags flags)
 {
+  {
+    auto check_element_for_attached_factory = &parent;
+    while (check_element_for_attached_factory)
+    {
+      auto annotation = check_element_for_attached_factory->GetAnnotation<tFactoryAnnotation>();
+      if (annotation && annotation->factory.HandlesDataType(dt))
+      {
+        return &annotation->factory.CreatePortImplementation(port_name, parent, dt, flags);
+      }
+      check_element_for_attached_factory = check_element_for_attached_factory->GetParent();
+    }
+  }
+
   std::vector<tPortFactory*>& list = FactoryList();
   for (auto it = list.begin(); it != list.end(); ++it)

port/tPortFactory.h

@@ -85 +85 @@
 
   /*!
+   * Creates factory that handles only port creation below the specified element
+   *
+   * \param handles_elements_below Framework element that this factory is attached to (inactive/unused if nullptr)
+   */
+  tPortFactory(core::tFrameworkElement* handles_elements_below);
+
+
+  /*!
    * External interface for anyone who wants to create a port of specified type.
    * For RPC types this will create routing ports only.