Changeset 38:925ca77b7361 in finroc_plugins_composite_ports

Timestamp:

09.01.2022 09:10:44 (2 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Phase:

public

Tags:

tip

Message:

Fixes connect option processing for child connectors (issue introduced in recent changeset ea39cd84ad73)

File:

• tInterfaceBase.cpp (modified) (5 diffs)

tInterfaceBase.cpp

@@ -191 +191 @@
 
 //! Connector with operations for custom connecting attached
+const core::tConnectionFlags cRETAIN_FLAGS_FOR_CHILD_CONNECTIONS = core::tConnectionFlag::SCHEDULING_NEUTRAL | core::tConnectionFlag::DIRECTION_TO_SOURCE | core::tConnectionFlag::DIRECTION_TO_DESTINATION;
+
 class tConversionConnector : public core::tConnector
 {
@@ -202 +204 @@
     tConnector(source_port, destination_port, connect_options, this->connect_options.conversion_operations),
     connect_options(connect_options),
-    original_flags(connect_options.flags)
+    original_flags(connect_options.flags.Raw() & cRETAIN_FLAGS_FOR_CHILD_CONNECTIONS.Raw())
   {}
 
-  const core::tConnectOptions& ConnectOptions() const
+  const core::tConnectOptions& ChildConnectOptions() const
   {
     connect_options.flags = original_flags;
@@ -211 +213 @@
   }
 
-  const core::tConnectOptions& ConnectOptions(const core::tConnectionFlag direction_flag) const
-  {
+  const core::tConnectOptions& ChildConnectOptions(const core::tConnectionFlag direction_flag) const
+  {
+    connect_options.flags = original_flags;
     connect_options.flags.Set(core::tConnectionFlag::DIRECTION_TO_SOURCE, direction_flag == core::tConnectionFlag::DIRECTION_TO_SOURCE);
     connect_options.flags.Set(core::tConnectionFlag::DIRECTION_TO_DESTINATION, direction_flag == core::tConnectionFlag::DIRECTION_TO_DESTINATION);
@@ -994 +997 @@
       if (partner_is_destination)
       {
-        primary_backend.custom_connect_function(*this, other, conversion_connector->ConnectOptions());
+        primary_backend.custom_connect_function(*this, other, conversion_connector->ChildConnectOptions());
       }
       else
       {
-        primary_backend.custom_connect_function(other, *this, conversion_connector->ConnectOptions());
+        primary_backend.custom_connect_function(other, *this, conversion_connector->ChildConnectOptions());
       }
       primary_backend.operation_on_all_elements_pending = false;
@@ -1012 +1015 @@
         {
           core::tConnectionFlag direction = (this->IsOutputPort() == this_backend.second->IsOutputPort() ? partner_is_destination : (!partner_is_destination)) ? core::tConnectionFlag::DIRECTION_TO_DESTINATION : core::tConnectionFlag::DIRECTION_TO_SOURCE;
-          this_backend.second->ConnectTo(*other_backend.second, conversion_connector->ConnectOptions(direction));
-          this_backend.second->ConnectChildPortsByName(*other_backend.second, conversion_connector->ConnectOptions(direction));
+          this_backend.second->ConnectTo(*other_backend.second, conversion_connector->ChildConnectOptions(direction));
+          this_backend.second->ConnectChildPortsByName(*other_backend.second, conversion_connector->ChildConnectOptions(direction));
         }
       }