X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConnection.cxx;fp=kernel%2Fsrc%2FbbtkConnection.cxx;h=b3ce70a0b00256df328d49f41fd87df6922cd0b0;hb=e6b2de923e0e69c303c7d18fb8a5c1970541bb3a;hp=4a6b7059e426b6db6e9a90df2c4b6becb6ddfd47;hpb=97b08ef9b0c2a60c4d1f619f6bfef2996afdcab3;p=bbtk.git

diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx
index 4a6b705..b3ce70a 100644
--- a/kernel/src/bbtkConnection.cxx
+++ b/kernel/src/bbtkConnection.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/25 13:37:48 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/07/25 07:44:12 $
+  Version:   $Revision: 1.14 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -27,6 +27,7 @@
 
 namespace bbtk
 {
+  //==================================================================
   Connection::Pointer Connection::New(BlackBox::Pointer from, 
 				      const std::string& output,
 				      BlackBox::Pointer to, 
@@ -45,6 +46,7 @@ namespace bbtk
 		     <<std::endl);
     return p;
   }
+  //==================================================================
 
   //==================================================================
   /// Ctor with the black box from and to and their input and output.
@@ -147,6 +149,123 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
     to->bbConnectInput(input,this);
 
     
+    bbtkDebugMessage("connection",1,"<== Connection::Connection(\""
+		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
+    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+  }
+ //==================================================================
+ 
+  //==================================================================
+  Connection::Pointer Connection::New(BlackBox::Pointer from, 
+				      const std::string& output,
+				      BlackBox::Pointer to, 
+				      const std::string& input )
+  {
+    bbtkDebugMessage("object",1,"##> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);
+    Connection::Pointer p = 
+      MakePointer(new Connection(from,output,to,input));
+    bbtkDebugMessage("object",1,"<## Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);
+    return p;
+  }
+  //==================================================================
+
+  //==================================================================
+  /// Ctor with the black box from and to and their input and output.
+/// Check the input and output compatibility
+Connection::Connection(BlackBox::Pointer from, const std::string& output,
+		       BlackBox::Pointer to, const std::string& input )
+  : mAdaptor(),
+      mFactory(),
+      mFromAny(false),
+      mToAny(false)
+  {
+    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
+    bbtkDebugMessage("connection",1,"==> Connection::Connection(\""
+		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
+    
+
+    if (! from->bbHasOutput(output) )
+      {
+	bbtkError("The box \""<<from->bbGetTypeName()<<
+		  "\" has no output \""<<output<<"\"");
+      }
+    if (! to->bbHasInput(input) )
+      {
+	bbtkError("The box \""<<to->bbGetTypeName()<<
+		  "\" has no input \""<<input<<"\"");
+      } 
+
+    if (to->bbGetInputConnectorMap().find(input)->second->IsConnected())
+      {
+	bbtkError("The input \""<<input<<"\" of the box \""<<to->bbGetName()
+		  <<"\" is already connected");
+      }
+    
+    //  std::string t1 ( from->bbGetOutputType(output).name() );
+    //   std::string t2 ( to->bbGetInputType(input).name() );
+    // if  //( t1 != t2 ) 
+    if ( from->bbGetOutputType(output) !=
+	 to->bbGetInputType(input) )
+      {
+	if ( from->bbGetOutputType(output) == typeid(Data) )
+	  {
+	    bbtkWarning("Connection '"
+			<<GetFullName()
+			<<"' : '"<<from->bbGetName()<<"."<<output
+			<<"' is of type <"
+			<<HumanTypeName<Data>()
+			<<"> : type compatibility with '"
+			<<to->bbGetName()<<"."<<input
+			<<"' will be resolved at run time"
+			);
+	    mFromAny = true;
+	  }
+	else if (  to->bbGetInputType(input) == typeid(Data) )
+	  {   
+	    bbtkDebugMessage("Kernel",8," -> '"<<input<<"' type is "
+			     <<TypeName<Data>()<<" : can receive any data"
+			     <<std::endl);
+	    mToAny = true;
+	  }
+	else 
+	  {
+	    bbtkError("Connection created between different types without Factory provided");
+	  }
+      }
+
+
+    mFrom = from;
+    mOriginalFrom = from;
+    mTo = to;
+    mOriginalTo = to;
+    mInput = mOriginalInput = input;
+    mOutput = mOriginalOutput = output;
+
+     // Lock this pointer !!!
+    //Pointer p = MakePointer(this,true);
+    from->bbConnectOutput(output,this);
+    to->bbConnectInput(input,this);
+
+    
     bbtkDebugMessage("connection",1,"<== Connection::Connection(\""
 		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"