Changeset 429:e4f565f3b102 in finroc_core

Timestamp:

07.06.2017 22:05:58 (7 years ago)

Author:

Max Reichardt <mreichardt@…>

Branch:

17.03

Phase:

public

Message:

Makes tAbstractPort::MayConnectTo check process connect options (w.r.t. data type compatbility check) and allow tool ports to connect to pure output and input ports in both directions (for simplified subscribing in network protocols)

Location:

port

Files:

• tAbstractPort.cpp (modified) (6 diffs)
• tAbstractPort.h (modified) (1 diff)

port/tAbstractPort.cpp

@@ -148 +148 @@
   if (connect_direction_flags.Raw() == 0) // auto mode?
   {
-    bool to_target_possible = MayConnectTo(to);
-    bool to_source_possible = to.MayConnectTo(*this);
+    bool to_target_possible = MayConnectTo(to, connect_options);
+    bool to_source_possible = to.MayConnectTo(*this, connect_options);
     if (to_target_possible && to_source_possible)
     {
@@ -162 +162 @@
       std::stringstream reason_stream;
       reason_stream << "Could not connect ports '" << (*this) << "' and '" << to << "' for the following reason: ";
-      MayConnectTo(to, &reason_stream);
+      MayConnectTo(to, connect_options, &reason_stream);
       reason_stream << "\nConnecting in the reverse direction did not work either: ";
-      to.MayConnectTo(*this, &reason_stream);
+      to.MayConnectTo(*this, connect_options, &reason_stream);
       FINROC_LOG_PRINT(WARNING, reason_stream.str());
       return nullptr;
     }
+  }
+  else
+  {
+    connect_direction = connect_options.flags.Get(tConnectionFlag::DIRECTION_TO_DESTINATION) ? tConnectDirection::TO_DESTINATION : tConnectDirection::TO_SOURCE;
   }
 
@@ -174 +178 @@
   tAbstractPort& destination = (connect_direction == tConnectDirection::TO_DESTINATION) ? to : *this;
   std::stringstream reason_stream;
-  if (source.MayConnectTo(destination, &reason_stream))
+  if (source.MayConnectTo(destination, connect_options, &reason_stream))
   {
     FINROC_LOG_PRINT(DEBUG_VERBOSE_1, "Creating Edge from ", source, " to ", destination);
@@ -568 +572 @@
 }
 
-bool tAbstractPort::MayConnectTo(tAbstractPort& destination, std::stringstream* reason_stream) const
-{
-  if (!rrlib::rtti::conversion::tStaticCastOperation::IsImplicitlyConvertibleTo(data_type, destination.data_type))
+bool tAbstractPort::MayConnectTo(tAbstractPort& destination, const tConnectOptions& connect_options, std::stringstream* reason_stream) const
+{
+  if (connect_options.conversion_operations.Size() == 0 && (!rrlib::rtti::conversion::tStaticCastOperation::IsImplicitlyConvertibleTo(data_type, destination.data_type)))
   {
     if (reason_stream)
@@ -578 +582 @@
     return false;
   }
+  // TODO: should conversion operation be checked here already? (con: simpler if not and it will be checked anyway when creating the connector)
+
+  if (GetFlag(tFlag::TOOL_PORT) || destination.GetFlag(tFlag::TOOL_PORT))
+  {
+    return true; // ignore flags and constraints for ports from tools
+  }
 
   if (!GetFlag(tFlag::EMITS_DATA))
@@ -595 +605 @@
     }
     return false;
-  }
-
-  if (GetFlag(tFlag::TOOL_PORT) || destination.GetFlag(tFlag::TOOL_PORT))
-  {
-    return true; // ignore constraints for ports from tools
   }
 

port/tAbstractPort.h

@@ -323 +323 @@
    *
    * \param destination Destination port to check connectability to.
+   * \param connect_options Any connect options to apply
    * \param reason_string If connecting is not possible, appends reason to this stream (unless it is nullptr)
    * \return Answer
    */
-  bool MayConnectTo(tAbstractPort& destination, std::stringstream* reason_stream = nullptr) const;
+  bool MayConnectTo(tAbstractPort& destination, const tConnectOptions& connect_options = tConnectOptions(), std::stringstream* reason_stream = nullptr) const;
 
   /*!