X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConnection.cxx;h=e6ee23851e7288d08e4cfc37a460528bb797867d;hb=81cf34a7ea4edd0cef61258e6d65df60e80bbb6a;hp=37c0eb6be1448122aacd7f025324e4f973e34329;hpb=a35973b128a2f7130b619a2a11a35cfd418b21b6;p=bbtk.git

diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx
index 37c0eb6..e6ee238 100644
--- a/kernel/src/bbtkConnection.cxx
+++ b/kernel/src/bbtkConnection.cxx
@@ -1,32 +1,39 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/30 14:42:16 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.22 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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
@@ -39,6 +46,11 @@
 #include "bbtkMessageManager.h"
 #include "bbtkBlackBoxOutputConnector.h"
 
+#define bbtkCMessage(key,level,mess) \
+  bbtkMessage(key,level,"["<<GetFullName()<<"] "<<mess)
+#define bbtkCDebugMessage(key,level,mess)	\
+  bbtkDebugMessage(key,level,"["<<GetFullName()<<"] "<<mess)
+
 namespace bbtk
 {
   const std::string IOSTATUS_STRING[3] = 
@@ -54,13 +66,13 @@ namespace bbtk
 				      const std::string& input ,
 				      const Factory::Pointer f  )
   {
-    bbtkDebugMessage("object",1,"##> Connection::Connection(\""
+    bbtkDebugMessage("object",1,"##> Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);
     Connection::Pointer p = 
       MakePointer(new Connection(from,output,to,input,f));
-    bbtkDebugMessage("object",1,"<## Connection::Connection(\""
+    bbtkDebugMessage("object",1,"<## Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);
@@ -79,14 +91,14 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
       mFromAny(false),
       mToAny(false)
   {
-    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+    bbtkDebugMessage("object",2,"==> Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
 
-    bbtkDebugMessage("connection",1,"==> Connection::Connection(\""
-		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
-		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+    bbtkDebugMessage("connection",1,"==> Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
 
     
@@ -127,7 +139,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	  }
 	else if (  to->bbGetInputType(input) == typeid(Data) )
 	  {   
-	    bbtkDebugMessage("Kernel",8," -> '"<<input<<"' type is "
+	    bbtkDebugMessage("kernel",8," -> '"<<input<<"' type is "
 			     <<TypeName<Data>()<<" : can receive any data"
 			     <<std::endl);
 	    mToAny = true;
@@ -154,12 +166,12 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
       }
 
 
-    mFrom = from;
-    mOriginalFrom = from;
-    mTo = to;
-    mOriginalTo = to;
-    mInput = mOriginalInput = input;
-    mOutput = mOriginalOutput = output;
+    mFrom 			= from;
+    mOriginalFrom 	= from;
+    mTo 			= to;
+    mOriginalTo 	= to;
+    mInput 			= mOriginalInput 	= input;
+    mOutput 		= mOriginalOutput 	= output;
 
      // Lock this pointer !!!
     //Pointer p = MakePointer(this,true);
@@ -169,12 +181,12 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
     from->bbGetOutputConnector(output).AddChangeObserver(boost::bind(&bbtk::Connection::OnOutputChange,this, _1, _2, _3));
 
     
-    bbtkDebugMessage("connection",1,"<== Connection::Connection(\""
-		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
-		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+    bbtkDebugMessage("connection",1,"<== Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
 
-    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+    bbtkDebugMessage("object",2,"<== Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
@@ -187,13 +199,13 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 				      BlackBox::Pointer to, 
 				      const std::string& input )
   {
-    bbtkDebugMessage("object",1,"##> Connection::Connection(\""
+    bbtkDebugMessage("object",1,"##> Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);
     Connection::Pointer p = 
       MakePointer(new Connection(from,output,to,input));
-    bbtkDebugMessage("object",1,"<## Connection::Connection(\""
+    bbtkDebugMessage("object",1,"<## Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);
@@ -211,14 +223,14 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
       mFromAny(false),
       mToAny(false)
   {
-    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+    bbtkDebugMessage("object",2,"==> Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
 
-    bbtkDebugMessage("connection",1,"==> Connection::Connection(\""
-		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
-		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+    bbtkDebugMessage("connection",1,"==> Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
 
     
@@ -261,7 +273,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	  }
 	else if (  to->bbGetInputType(input) == typeid(Data) )
 	  {   
-	    bbtkDebugMessage("Kernel",8," -> '"<<input<<"' type is "
+	    bbtkDebugMessage("kernel",8," -> '"<<input<<"' type is "
 			     <<TypeName<Data>()<<" : can receive any data"
 			     <<std::endl);
 	    mToAny = true;
@@ -287,12 +299,12 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 
     from->bbGetOutputConnector(output).AddChangeObserver(boost::bind(&bbtk::Connection::OnOutputChange,this, _1, _2, _3));
     
-    bbtkDebugMessage("connection",1,"<== Connection::Connection(\""
-		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
-		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+    bbtkDebugMessage("connection",1,"<== Connection(\""
+		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
 
-    bbtkDebugMessage("object",2,"==> Connection::Connection(\""
+    bbtkDebugMessage("object",2,"==> Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
@@ -303,9 +315,9 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   /// Dtor 
   Connection::~Connection()
   {
-    bbtkDebugMessage("object",2,
-		     "==> Connection::~Connection() ["
-		     <<GetFullName()<<"]"<<std::endl);
+    bbtkCDebugMessage("object",4,
+		     "==> ~Connection()"
+		     <<std::endl);
 
     if (mAdaptor) mAdaptor.reset();
     if (mFrom!=0) 
@@ -316,7 +328,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
       }
     else 
       {
-	bbtkInternalError("Connection::~Connection() : invalid initial box pointer");
+	bbtkInternalError("~Connection() : invalid initial box pointer");
       }
     if (mTo!=0) 
       {
@@ -325,13 +337,13 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
       }
     else 
       {
-	bbtkInternalError("Connection::~Connection() : invalid final box pointer");
+	bbtkInternalError("~Connection() : invalid final box pointer");
       }
 
 
-    bbtkDebugMessage("object",2,
-		     "<== Connection::~Connection() ["
-		     <<GetFullName()<<"]"<<std::endl);
+    bbtkCDebugMessage("object",4,
+		      "<== ~Connection()"
+		      <<std::endl);
   }
   //==================================================================
   
@@ -339,9 +351,9 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   /// Recursive execution
   void Connection::RecursiveExecute()
   {
-    bbtkDebugMessage("process",4,
-		     "===> Connection::RecursiveExecute() ["
-		     <<GetFullName()<<"]"<<std::endl);
+    bbtkCDebugMessage("process",4,
+		      "===> Connection::RecursiveExecute()"
+		      <<std::endl);
 
     /*
     // If box from already executing : nothing to do
@@ -367,7 +379,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
       }
     mTo->bbGetInputConnector(mInput).SetStatus(s);
     
-    bbtkDebugMessage("process",4,
+    bbtkCDebugMessage("process",4,
 		     " --> '"<<mTo->bbGetName()<<"."<<mInput
 		     <<" ["<<&mTo->bbGetInputConnector(mInput)<<"] "
 		     <<"' new status '"
@@ -375,9 +387,9 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		     <<"'"
 		     << std::endl);
 
-    bbtkDebugMessage("process",4,
-		     "<=== Connection::RecursiveExecute() ["
-		     <<GetFullName()<<"]"<<std::endl);
+    bbtkCDebugMessage("process",4,
+		     "<=== Connection::RecursiveExecute()"
+		      <<std::endl);
     return; 
   }
   //==================================================================
@@ -389,9 +401,9 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   /// doing necessary conversions (adaptation or pointer cast)
   void Connection::TransferData()
   {
-    bbtkDebugMessageInc("data",3,
-			"Connection::TransferData() ["
-			<<GetFullName()<<"]"<<std::endl);
+    bbtkCDebugMessage("data",3,
+		      "Connection::TransferData()"
+		      <<std::endl);
     
     
     // If an adaptor was created we need to adapt the data
@@ -406,13 +418,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,
+	bbtkCDebugMessage("data",3,
 			 " * Source type is an "
 			 <<HumanTypeName<Data>()
 			 <<" which contains a <"
 			 <<HumanTypeName(mFrom->bbGetOutput(mOutput).type())
 			 <<">"<<std::endl);
-	bbtkDebugMessage("data",3,
+	bbtkCDebugMessage("data",3,
 			 " * Target type is <"
 			 <<HumanTypeName(mTo->bbGetInputType(mInput))
 			 <<">"<<std::endl);
@@ -420,14 +432,14 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	// 0) If from any contents void : nothing to do 
 	if (mFrom->bbGetOutput(mOutput).type() == typeid(void)) 
 	  {
-	    bbtkDebugMessage("data",3,
+	    bbtkCDebugMessage("data",3,
 			     " -> Source is void : nothing to transfer!"<<std::endl);
 	  }
 	// 1) Test strict type matching between any content and target
 	else if (mFrom->bbGetOutput(mOutput)
 	    .contains( mTo->bbGetInputType(mInput) ) )
 	  {
-	    bbtkDebugMessage("data",3,
+	    bbtkCDebugMessage("data",3,
 			     " -> Equal types : transfer ok"<<std::endl);
 	    mTo->bbSetInput( mInput, 
 			     mFrom->bbGetOutput(mOutput),
@@ -449,7 +461,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	      }
 	    if (adaptor)  
 	      {
-		bbtkDebugMessage("data",3," -> Adaptor found : using it"
+		bbtkCDebugMessage("data",3," -> Adaptor found : using it"
 				 <<std::endl);
 		  adaptor->bbSetInput("In",mFrom->bbGetOutput(mOutput),false);
 		adaptor->bbExecute();
@@ -463,7 +475,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		      (mTo->bbGetDescriptor()->GetInputDescriptor(mInput)
 		       ->IsPointerType()) )
 	      {
-		bbtkDebugMessage("data",3,
+		bbtkCDebugMessage("data",3,
 				 " -> No adaptor found but source and target types are both pointers : trying up or down cast"<<std::endl);
 		
 		void* nptr = 
@@ -508,10 +520,10 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
   void Connection::OnOutputChange(bbtk::BlackBox::Pointer, const std::string&, 
 				  IOStatus status)
   {
-    bbtkDebugMessage("change",2,
+    bbtkCDebugMessage("change",2,
 		     "==> Connection::OnOutputChange("
-		     <<GetIOStatusString(status)<<") ["
-		     <<GetFullName()<<"]"<<std::endl);
+		     <<GetIOStatusString(status)<<")"
+		     <<std::endl);
     if (mAdaptor) 
       {
 	    BlackBoxInputConnector* ac = mAdaptor->bbGetInputConnectorMap().find("In")->second;
@@ -547,7 +559,8 @@ 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) 
       {
@@ -555,12 +568,12 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
       }
     else
       {
-	bbtkMessage("debug",2," - From : "<<mFrom->bbGetFullName()<<std::endl);
+	bbtkMessage("debug",2," - From : "<<mFrom->bbGetName()<<std::endl);
 	if (!mFrom->bbHasOutput(mOutput))
 	  {
 	    bbtkError("** Checking Connection "<<(void*)this
 		       <<" ["<<GetFullName()<<"] : "
-		      << mFrom->bbGetFullName()<<" does not have output '"
+		      << mFrom->bbGetName()<<" does not have output '"
 		      <<mOutput<<"'");
 	  }	
 	bbtkMessage("debug",2," - From : Output '"<<mOutput<<"' exists"<<std::endl);
@@ -570,7 +583,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	  {
 	     bbtkError("** Checking Connection "<<(void*)this
 		       <<" ["<<GetFullName()<<"] : "
-		       <<mFrom->bbGetFullName()<<" output '"
+		       <<mFrom->bbGetName()<<" output '"
 		       <<mOutput<<"' is not in OutputConnectorMap");
 	  }
 	bbtkMessage("debug",2," - From : Output '"<<mOutput
@@ -593,9 +606,8 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	  {
 	    bbtkError("** Checking Connection "<<(void*)this
 		      <<" ["<<GetFullName()<<"] : "
-		      << "Connection ["<<GetFullName()<<"] : "
 		      <<" OutputConnector '"
-		      <<mOutput<<"' of "<<mFrom->bbGetFullName()
+		      <<mOutput<<"' of "<<mFrom->bbGetName()
 		      <<" does not point to this connection");
 	    
 	  }
@@ -614,13 +626,13 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	//	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);
+	//	mTo->bbGetName();
+	bbtkMessage("debug",2," - To   : "<<mTo->bbGetName()<<std::endl);
 	if (!mTo->bbHasInput(mInput))
 	  {
 	    bbtkError("** Checking Connection "<<(void*)this
 		      <<" ["<<GetFullName()<<"] : "
-		      <<mTo->bbGetFullName()<<" does not have input '"
+		      <<mTo->bbGetName()<<" does not have input '"
 		      <<mInput<<"'");
 	  }	
 	bbtkMessage("debug",2," - To   : Input '"<<mInput<<"' exists"<<std::endl);
@@ -630,7 +642,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	  {
 	     bbtkError("** Checking Connection "<<(void*)this
 		       <<" ["<<GetFullName()<<"] : "
-		       <<mTo->bbGetFullName()<<" input '"
+		       <<mTo->bbGetName()<<" input '"
 		       <<mInput<<"' is not in InputConnectorMap");
 	  }
 	bbtkMessage("debug",2," - To   : Input '"<<mInput
@@ -640,9 +652,8 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	  {
 	    bbtkError("** Checking Connection "<<(void*)this
 		      <<" ["<<GetFullName()<<"] : "
-		      <<"Connection "<<GetFullName()<<" : "
 		      <<" InputConnector '"
-		      <<mInput<<"' of "<<mTo->bbGetFullName()
+		      <<mInput<<"' of "<<mTo->bbGetName()
 		      <<" does not point to this connection");
     
 	  }