X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkConnection.cxx;h=4a6b7059e426b6db6e9a90df2c4b6becb6ddfd47;hb=bdbe8432a23b398ce457f38d647e9298a7cf560a;hp=1e84edfa3d0395e3afa7da5b930913703c8d0ecf;hpb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;p=bbtk.git

diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx
index 1e84edf..4a6b705 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/18 12:59:15 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2008/04/25 13:37:48 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -62,6 +62,11 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
 		     <<std::endl);    
 
+    bbtkDebugMessage("connection",1,"==> Connection::Connection(\""
+		     <<from->bbGetFullName()<<"\",\""<<output<<"\",\""
+		     <<to->bbGetFullName()<<"\",\""<<input<<"\")"
+		     <<std::endl);    
+
     
 
     if (! from->bbHasOutput(output) )
@@ -128,10 +133,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	  }
       }
 
-     // Lock this pointer !!!
-    Pointer p = MakePointer(this,true);
-    from->bbConnectOutput(output,p);
-    to->bbConnectInput(input,p);
+
     mFrom = from;
     mOriginalFrom = from;
     mTo = to;
@@ -139,7 +141,17 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
     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<<"\")"
+		     <<std::endl);    
+
     bbtkDebugMessage("object",2,"==> Connection::Connection(\""
 		     <<from->bbGetName()<<"\",\""<<output<<"\",\""
 		     <<to->bbGetName()<<"\",\""<<input<<"\")"
@@ -156,12 +168,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 
       {
@@ -169,15 +180,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() ["
@@ -189,9 +199,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>());
@@ -200,8 +210,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;
   }
   //==================================================================
@@ -211,7 +222,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);
 
@@ -220,7 +231,7 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 
     mTo->bbForwardUpdate(this);
 
-    bbtkDebugDecTab("Process",2);
+    bbtkDebugDecTab("process",2);
   }
   //==================================================================
   */
@@ -230,7 +241,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);
     
@@ -247,16 +258,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);
@@ -265,7 +273,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),
@@ -287,7 +295,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();
@@ -301,7 +309,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 = 
@@ -338,7 +346,6 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
 	mTo->bbSetInput(mInput, mFrom->bbGetOutput(mOutput),false);
       }
 
-    bbtkDebugDecTab("Process",3);
   }
   //==================================================================
   
@@ -346,15 +353,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);
+    */
   }
   //==================================================================
 
@@ -381,15 +392,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
@@ -397,7 +408,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())
@@ -407,21 +418,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
@@ -432,23 +444,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
@@ -456,7 +468,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())
@@ -466,7 +478,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)
@@ -479,8 +491,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);
 
       }
   }