Changeset 10:475d7a686fd6 in finroc_plugins_composite_ports for tInterfaceBase.cpp

Timestamp:

21.03.2020 16:11:47 (2 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

default

Phase:

public

Message:

Adds support for inheritance among port composite interfaces (sub and superclass interfaces can be connected). Change also includes that connecting secondary backends (of port composite interfaces with multiple port types) will not connect the primary. This adds more flexibility/convenience w.r.t. connecting only parts of port composite interfaces.

File:

• tInterfaceBase.cpp (modified) (2 diffs)

tInterfaceBase.cpp

@@ -389 +389 @@
 void tInterfaceBase::tBackend::OnConnect(tAbstractPort& partner, bool partner_is_destination)
 {
-  if (&primary_backend != this)
-  {
-    primary_backend.OnConnect(partner, this->IsOutputPort() == primary_backend.IsOutputPort() ? partner_is_destination : (!partner_is_destination));
+  if (primary_backend.operation_on_all_elements_pending)
+  {
     return;
   }
-  if (this->operation_on_all_elements_pending)
-  {
-    return;
-  }
-
-  this->operation_on_all_elements_pending = true;
+
+  tBackend& other = static_cast<tBackend&>(partner);
+  bool connect_all_backends = this->IsPrimaryBackend() && other.IsPrimaryBackend();
+
+  primary_backend.operation_on_all_elements_pending = true;
   try
   {
-    tBackend& other = static_cast<tBackend&>(partner).primary_backend;
-    if (this->custom_connect_function)
+    if (primary_backend.custom_connect_function)
     {
       if (partner_is_destination)
       {
-        custom_connect_function(*this, other);
+        primary_backend.custom_connect_function(*this, other);
       }
       else
       {
-        custom_connect_function(other, *this);
-      }
-      this->operation_on_all_elements_pending = false;
+        primary_backend.custom_connect_function(other, *this);
+      }
+      primary_backend.operation_on_all_elements_pending = false;
       return;
     }
 
     // Connect all matching backends and ports
-    for (auto this_backend : this->relation_backend_mapping)
-    {
-      for (auto other_backend : other.primary_backend.relation_backend_mapping)
-      {
-        if (this_backend.first - this->primary_relation_id == other_backend.first - other.primary_relation_id)
+    for (auto this_backend : primary_backend.relation_backend_mapping)
+    {
+      for (auto other_backend : other.primary_backend.primary_backend.relation_backend_mapping)
+      {
+        if (this_backend.first - primary_backend.primary_relation_id == other_backend.first - other.primary_backend.primary_relation_id && (connect_all_backends || this_backend.second == this || other_backend.second == &other))
         {
           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;
@@ -435 +432 @@
     FINROC_LOG_PRINT(WARNING, "Connecting failed: ", e);
   }
-  this->operation_on_all_elements_pending = false;
+  primary_backend.operation_on_all_elements_pending = false;
 }