X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConnection.cxx;h=0b8fb9c11dc890b0ee3ffe9b5a24d491a9828e07;hb=7dea96c3fd3343fc15372ae61573ad5354b19ffc;hp=9c8487ace1fe496f21762f539e1f6bd1bc5fc93b;hpb=d7a6d341e2d11c175351212f0bf4812784dc57e5;p=bbtk.git

diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx
index 9c8487a..0b8fb9c 100644
--- a/kernel/src/bbtkConnection.cxx
+++ b/kernel/src/bbtkConnection.cxx
@@ -1,20 +1,33 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/22 06:59:31 $
-  Version:   $Revision: 1.8 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See doc/license.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/17 08:18:13 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
+
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
 /**
  *\file
  *\brief Class bbtk::Connection
@@ -27,6 +40,7 @@
 
 namespace bbtk
 {
+  //==================================================================
   Connection::Pointer Connection::New(BlackBox::Pointer from, 
 				      const std::string& output,
 				      BlackBox::Pointer to, 
@@ -45,6 +59,7 @@ namespace bbtk
 		     <<std::endl);
     return p;
   }
+  //==================================================================
 
   //==================================================================
   /// Ctor with the black box from and to and their input and output.
@@ -142,9 +157,126 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
     mOutput = mOriginalOutput = output;
 
      // Lock this pointer !!!
-    Pointer p = MakePointer(this,true);
-    from->bbConnectOutput(output,p);
-    to->bbConnectInput(input,p);
+    //Pointer p = MakePointer(this,true);
+    from->bbConnectOutput(output,this);
+    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(\""
@@ -168,12 +300,11 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		     <<GetFullName()<<"]"<<std::endl);
 
     if (mAdaptor) mAdaptor.reset();
-    mOriginalFrom.reset();
-    mOriginalTo.reset();
     if (mFrom!=0) 
       {
-	mFrom->bbDisconnectOutput(mOutput,
-				  GetThisPointer<Connection>());
+	mFrom->bbDisconnectOutput(mOutput,this);
+	//				  GetThisPointer<Connection>());
+	mFrom.reset();
       }
     else 
       {
@@ -181,15 +312,14 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
       }
     if (mTo!=0) 
       {
-	mTo->bbDisconnectInput(mInput,
-			       GetThisPointer<Connection>());
+	mTo->bbDisconnectInput(mInput,this);//   GetThisPointer<Connection>());
+	mTo.reset();
       }
     else 
       {
 	bbtkInternalError("Connection::~Connection() : invalid final box pointer");
       }
-   mFrom.reset();
-    mTo.reset();
+
 
     bbtkDebugMessage("object",2,
 		     "<== Connection::~Connection() ["
@@ -201,9 +331,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>());
@@ -212,8 +342,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;
   }
   //==================================================================
@@ -223,7 +354,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);
 
@@ -232,7 +363,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 
     mTo->bbForwardUpdate(this);
 
-    bbtkDebugDecTab("Process",2);
+    bbtkDebugDecTab("process",2);
   }
   //==================================================================
   */
@@ -242,7 +373,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);
     
@@ -259,16 +390,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);
@@ -277,7 +405,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),
@@ -299,7 +427,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();
@@ -313,7 +441,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 = 
@@ -350,7 +478,6 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	mTo->bbSetInput(mInput, mFrom->bbGetOutput(mOutput),false);
       }
 
-    bbtkDebugDecTab("Process",3);
   }
   //==================================================================
   
@@ -358,15 +485,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);
+    */
   }
   //==================================================================
 
@@ -393,15 +524,15 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   //==================================================================
   void Connection::Check() const
   {
-    bbtkMessage("Debug",1,"** Checking Connection "<<(void*)this<<" ["<<GetFullName()<<"]"
+    bbtkMessage("debug",1,"** Checking Connection "<<(void*)this<<" ["<<GetFullName()<<"]"
 		<<std::endl);
     if (mFrom==0) 
       {
-	bbtkMessage("Debug",2," - From = 0"<<std::endl);
+	bbtkMessage("debug",2," - From = 0"<<std::endl);
       }
     else
       {
-	bbtkMessage("Debug",2," - From : "<<mFrom->bbGetFullName()<<std::endl);
+	bbtkMessage("debug",2," - From : "<<mFrom->bbGetFullName()<<std::endl);
 	if (!mFrom->bbHasOutput(mOutput))
 	  {
 	    bbtkError("** Checking Connection "<<(void*)this
@@ -409,7 +540,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		      << mFrom->bbGetFullName()<<" does not have output '"
 		      <<mOutput<<"'");
 	  }	
-	bbtkMessage("Debug",2," - From : Output '"<<mOutput<<"' exists"<<std::endl);
+	bbtkMessage("debug",2," - From : Output '"<<mOutput<<"' exists"<<std::endl);
 	BlackBox::OutputConnectorMapType::const_iterator i 
 	  = mFrom->bbGetOutputConnectorMap().find(mOutput);
 	if (i== mFrom->bbGetOutputConnectorMap().end())
@@ -419,21 +550,22 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		       <<mFrom->bbGetFullName()<<" output '"
 		       <<mOutput<<"' is not in OutputConnectorMap");
 	  }
-	bbtkMessage("Debug",2," - From : Output '"<<mOutput
+	bbtkMessage("debug",2," - From : Output '"<<mOutput
 		    <<"' is in OutputConnectorMap"<<std::endl);
 
-        std::vector< Connection::WeakPointer >::const_iterator j;
+        std::vector< Connection* >::const_iterator j;
+	/*
 	for (j  = i->second->GetConnectionVector().begin();
 	     j != i->second->GetConnectionVector().end();
 	     ++j)
 	  {
-	    if ((*j).lock()==GetThisPointer<Connection>()) break;
+	    if ((*j)==this) break;
 	  }
-	/*
+	*/
 	j = find(i->second->GetConnectionVector().begin(),
 		 i->second->GetConnectionVector().end(),
-		 GetThisPointer<Connection>());
-	*/
+		 this);
+       
 	if (j==i->second->GetConnectionVector().end())
 	  {
 	    bbtkError("** Checking Connection "<<(void*)this
@@ -444,23 +576,23 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		      <<" does not point to this connection");
 	    
 	  }
-	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," - From : This connection is in OutputConnector connection vector"<<std::endl);
+	bbtkMessage("debug",2," * Box from : Check successfull"<<std::endl);
 
       }
 
     if (mTo==0) 
       {
-	bbtkMessage("Debug",2," - To   = 0"<<std::endl);
+	bbtkMessage("debug",2," - To   = 0"<<std::endl);
       }
     else
       {
-	bbtkMessage("Debug",2," - To   : "<<mTo->bbGetName()<<std::endl);
+	bbtkMessage("debug",2," - To   : "<<mTo->bbGetName()<<std::endl);
 	//	std::cout << mTo << std::endl;
 	//	std::cout << mTo->bbGetDescriptor() << std::endl;
 	//	std::cout << mTo->bbGetDescriptor()->GetTypeName() << std::endl;
 	//	mTo->bbGetFullName();
-	bbtkMessage("Debug",2," - To   : "<<mTo->bbGetFullName()<<std::endl);
+	bbtkMessage("debug",2," - To   : "<<mTo->bbGetFullName()<<std::endl);
 	if (!mTo->bbHasInput(mInput))
 	  {
 	    bbtkError("** Checking Connection "<<(void*)this
@@ -468,7 +600,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		      <<mTo->bbGetFullName()<<" does not have input '"
 		      <<mInput<<"'");
 	  }	
-	bbtkMessage("Debug",2," - To   : Input '"<<mInput<<"' exists"<<std::endl);
+	bbtkMessage("debug",2," - To   : Input '"<<mInput<<"' exists"<<std::endl);
 	BlackBox::InputConnectorMapType::const_iterator i 
 	  = mTo->bbGetInputConnectorMap().find(mInput);
 	if (i== mTo->bbGetInputConnectorMap().end())
@@ -478,7 +610,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		       <<mTo->bbGetFullName()<<" input '"
 		       <<mInput<<"' is not in InputConnectorMap");
 	  }
-	bbtkMessage("Debug",2," - To   : Input '"<<mInput
+	bbtkMessage("debug",2," - To   : Input '"<<mInput
 		    <<"' is in InputConnectorMap"<<std::endl);
 
 	if (i->second->GetConnection()==0)
@@ -491,8 +623,8 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		      <<" does not point to this connection");
     
 	  }
-	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," - To   : This connection is in InputConnector connection vector"<<std::endl);
+	bbtkMessage("debug",2," * Box to   : Check successfull"<<std::endl);
 
       }
   }