Changeset 12:35b3eecd8d06 in finroc_plugins_composite_ports

Timestamp:

14.04.2020 11:54:57 (4 years ago)

Author:

Max Reichardt <max.reichardt@…>

Branch:

default

Phase:

public

Message:

Adds parameter to ConnectUnconnectedMatchingInterfaces convenience function

Files:

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

auto_connect.cpp

@@ -95 +95 @@
 }
 
+bool ConnectUnconnectedMatchingInterface(core::tFrameworkElement& source_parent, core::tPortGroup& destination_component_interface, core::tAbstractPort& destination_port, bool connect_derived_interfaces, bool connect_to_nested_source_interfaces)
+{
+  std::vector<core::tAbstractPort*> unconnected_source_interface_ports;
+  for (auto source_port = source_parent.ChildPortsBegin(); source_port != source_parent.ChildPortsEnd(); ++source_port)
+  {
+    bool already_connected = false;
+    for (auto connector = source_port->OutgoingConnectionsBegin(); connector != source_port->OutgoingConnectionsEnd(); ++connector)
+    {
+      auto aggregator = core::tEdgeAggregator::GetAggregator(connector->Destination());
+      if (aggregator == &destination_component_interface)
+      {
+        already_connected = true;
+        break;
+      }
+    }
+
+    if (!already_connected)
+    {
+      if (source_port->IsReady() && source_port->GetDataType().GetTypeClassification() == rrlib::rtti::tTypeClassification::PORT_COMPOSITE_INTERFACE && (source_port->GetDataType() == destination_port.GetDataType() || (connect_derived_interfaces && rrlib::rtti::conversion::tStaticCastOperation::IsImplicitlyConvertibleTo(source_port->GetDataType(), destination_port.GetDataType()))))
+      {
+        source_port->ConnectTo(destination_port);
+        return true;
+      }
+      else if (connect_to_nested_source_interfaces)
+      {
+        unconnected_source_interface_ports.push_back(&*source_port);
+      }
+    }
+  }
+
+  // still not connected
+  assert(destination_port.CountIncomingConnections() == 0);
+  for (auto & source_port : unconnected_source_interface_ports)
+  {
+    if (ConnectUnconnectedMatchingInterface(*source_port, destination_component_interface, destination_port, connect_derived_interfaces, connect_to_nested_source_interfaces))
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
 }
 
@@ -138 +180 @@
 }
 
-void ConnectUnconnectedMatchingInterfaces(core::tPortGroup& source_component_interface, core::tPortGroup& destination_component_interface, bool connect_derived_interfaces)
+void ConnectUnconnectedMatchingInterfaces(core::tPortGroup& source_component_interface, core::tPortGroup& destination_component_interface, bool connect_derived_interfaces, bool connect_to_nested_source_interfaces)
 {
   for (auto destination_port = destination_component_interface.ChildPortsBegin(); destination_port != destination_component_interface.ChildPortsEnd(); ++destination_port)
@@ -144 +186 @@
     if (destination_port->IsReady() && destination_port->GetDataType().GetTypeClassification() == rrlib::rtti::tTypeClassification::PORT_COMPOSITE_INTERFACE && destination_port->CountIncomingConnections() == 0)
     {
-      for (auto source_port = source_component_interface.ChildPortsBegin(); source_port != source_component_interface.ChildPortsEnd(); ++source_port)
-      {
-        if (source_port->IsReady() && source_port->GetDataType().GetTypeClassification() == rrlib::rtti::tTypeClassification::PORT_COMPOSITE_INTERFACE && (source_port->GetDataType() == destination_port->GetDataType() || (connect_derived_interfaces && rrlib::rtti::conversion::tStaticCastOperation::IsImplicitlyConvertibleTo(source_port->GetDataType(), destination_port->GetDataType()))))
-        {
-          bool already_connected = false;
-          for (auto connector = source_port->OutgoingConnectionsBegin(); connector != source_port->OutgoingConnectionsEnd(); ++connector)
-          {
-            auto aggregator = core::tEdgeAggregator::GetAggregator(connector->Destination());
-            if (aggregator == &destination_component_interface)
-            {
-              already_connected = true;
-              break;
-            }
-          }
-          if (!already_connected)
-          {
-            source_port->ConnectTo(*destination_port);
-          }
-        }
-      }
+      ConnectUnconnectedMatchingInterface(source_component_interface, destination_component_interface, *destination_port, connect_derived_interfaces, connect_to_nested_source_interfaces);
     }
   }

auto_connect.h

@@ -92 +92 @@
  * \param destination_component_interface Component interface with incoming data flow
  * \param connect_derived_interfaces Whether to connect sub- and superclass port composite interfaces
+ * \param connect_to_nested_source_interfaces Whether to connect unconnected destination interfaces to nested source interfaces also
  */
-void ConnectUnconnectedMatchingInterfaces(core::tPortGroup& source_component_interface, core::tPortGroup& destination_component_interface, bool connect_derived_interfaces = false);
+void ConnectUnconnectedMatchingInterfaces(core::tPortGroup& source_component_interface, core::tPortGroup& destination_component_interface, bool connect_derived_interfaces = false, bool connect_to_nested_source_interfaces = false);
 
 //----------------------------------------------------------------------