X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConnection.cxx;h=b3ce70a0b00256df328d49f41fd87df6922cd0b0;hb=cf155931d4fded21cd2aaaeb0f3ead82067d2bef;hp=5f26be0b7b3beb7f7f0bb98a1968dfa0c354af55;hpb=5934ccb7ca0fabdbe6c1907b2aea3696e19a0251;p=bbtk.git

diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx
index 5f26be0..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/22 14:30:25 $
-  Version:   $Revision: 1.10 $
+  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<<"\")"
@@ -199,9 +318,9 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   /// Backward Update
   IOStatus Connection::BackwardUpdate()
   {
-    bbtkDebugMessageInc("Process",2,
-			"Connection::BackwardUpdate() ["
-			<<GetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("process",5,
+		     "===> Connection::BackwardUpdate() ["
+		     <<GetFullName()<<"]"<<std::endl);
 
     IOStatus s = UPTODATE;
     s = mFrom->bbBackwardUpdate(GetThisPointer<Connection>());
@@ -210,8 +329,9 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 
     if (mAdaptor && (s==MODIFIED)) mAdaptor->bbSetModifiedStatus();
 
-    bbtkDebugDecTab("Process",2);
-
+    bbtkDebugMessage("process",5,
+		     "<=== Connection::BackwardUpdate() ["
+		     <<GetFullName()<<"]"<<std::endl);
     return s;
   }
   //==================================================================
@@ -221,7 +341,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   /// Forward Update
   void Connection::ForwardUpdate()
   {
-    bbtkDebugMessageInc("Process",2,
+    bbtkDebugMessageInc("process",2,
 			"Connection::ForwardUpdate() ["
 			<<GetFullName()<<"]"<<std::endl);
 
@@ -230,7 +350,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 
     mTo->bbForwardUpdate(this);
 
-    bbtkDebugDecTab("Process",2);
+    bbtkDebugDecTab("process",2);
   }
   //==================================================================
   */
@@ -240,7 +360,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   /// doing necessary conversions (adaptation or pointer cast)
   void Connection::TransferData()
   {
-    bbtkDebugMessageInc("Process",3,
+    bbtkDebugMessageInc("data",3,
 			"Connection::TransferData() ["
 			<<GetFullName()<<"]"<<std::endl);
     
@@ -257,16 +377,13 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
     // If no adaptor but source type is an any and target is not an any
     else if ( mFromAny && (! mToAny) )
       {
-	bbtkDebugMessage("Data",3,
-			 "Connection::TransferData() ["
-			 <<GetFullName()<<"]"<<std::endl);
-	bbtkDebugMessage("Data",3,
+	bbtkDebugMessage("data",3,
 			 " * Source type is an "
 			 <<HumanTypeName<Data>()
 			 <<" which contains a <"
 			 <<HumanTypeName(mFrom->bbGetOutput(mOutput).type())
 			 <<">"<<std::endl);
-	bbtkDebugMessage("Data",3,
+	bbtkDebugMessage("data",3,
 			 " * Target type is <"
 			 <<HumanTypeName(mTo->bbGetInputType(mInput))
 			 <<">"<<std::endl);
@@ -275,7 +392,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	if (mFrom->bbGetOutput(mOutput)
 	    .contains( mTo->bbGetInputType(mInput) ) )
 	  {
-	    bbtkDebugMessage("Data",3,
+	    bbtkDebugMessage("data",3,
 			     " -> Equal types : transfer ok"<<std::endl);
 	    mTo->bbSetInput( mInput, 
 			     mFrom->bbGetOutput(mOutput),
@@ -297,7 +414,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	      }
 	    if (adaptor)  
 	      {
-		bbtkDebugMessage("Data",3," -> Adaptor found : using it"
+		bbtkDebugMessage("data",3," -> Adaptor found : using it"
 				 <<std::endl);
 		  adaptor->bbSetInput("In",mFrom->bbGetOutput(mOutput),false);
 		adaptor->bbExecute();
@@ -311,7 +428,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		      (mTo->bbGetDescriptor()->GetInputDescriptor(mInput)
 		       ->IsPointerType()) )
 	      {
-		bbtkDebugMessage("Data",3,
+		bbtkDebugMessage("data",3,
 				 " -> No adaptor found but source and target types are both pointers : trying up or down cast"<<std::endl);
 		
 		void* nptr = 
@@ -348,7 +465,6 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	mTo->bbSetInput(mInput, mFrom->bbGetOutput(mOutput),false);
       }
 
-    bbtkDebugDecTab("Process",3);
   }
   //==================================================================
   
@@ -356,15 +472,19 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   /// Modified
   void Connection::SetModifiedStatus()
   {
-    bbtkDebugMessageInc("Process",5,
-			"Connection::SetModifiedStatus() ["
-			<<GetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("modified",2,
+		     "==> Connection::SetModifiedStatus() ["
+		     <<GetFullName()<<"]"<<std::endl);
     
     if (mAdaptor) mAdaptor->bbSetModifiedStatus();
     
     mTo->bbSetModifiedStatus(  mTo->bbGetInputConnectorMap().find(mInput)->second );
     
-    bbtkDebugDecTab("Process",5);
+    /*
+    bbtkDebugMessage("modified",2,
+		     "==> Connection::SetModifiedStatus() ["
+		     <<GetFullName()<<"]"<<std::endl);
+    */
   }
   //==================================================================
 
@@ -444,7 +564,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	    
 	  }
 	bbtkMessage("debug",2," - From : This connection is in OutputConnector connection vector"<<std::endl);
-	bbtkMessage("debug",1," * Box from : Check successfull"<<std::endl);
+	bbtkMessage("debug",2," * Box from : Check successfull"<<std::endl);
 
       }
 
@@ -491,7 +611,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
     
 	  }
 	bbtkMessage("debug",2," - To   : This connection is in InputConnector connection vector"<<std::endl);
-	bbtkMessage("debug",1," * Box to   : Check successfull"<<std::endl);
+	bbtkMessage("debug",2," * Box to   : Check successfull"<<std::endl);
 
       }
   }