X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBoxDescriptor.cxx;h=5f445e23582210373e7d849ab57069541662a56d;hb=4d6822024afbbe783cdd620e248184b37d84c540;hp=c25819f5003eb9bb497c8f4aa6e7530defb99cbb;hpb=4634377e45465b15485afc9da74a5bf13b32d17b;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index c25819f..5f445e2 100644
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -202,29 +202,23 @@ namespace bbtk
 			<<std::endl);
   // 
     if (!GetFactory()) 
-      { 
-	bbtkError("ComplexBlackBoxDescriptor::Connect : no factory set");
-      }
+    {
+        bbtkError("ComplexBlackBoxDescriptor::Connect : no factory set");
+    }
     
-
   // Verify that a box with the same name does not exist already
     BlackBox::Pointer bbfrom = mPrototype->bbGetBlackBox( from );
     if ( !bbfrom ) 
-      {
-	bbtkError("the black box \""<<from<<"\" does not exist");
-      }
+    {
+        bbtkError("the black box \""<<from<<"\" does not exist");
+    }
     BlackBox::Pointer bbto = mPrototype->bbGetBlackBox( to );
     if ( !bbto ) 
-      {
-	bbtkError("the black box \""<<to<<"\" does not exist");
-      }
-    
-    Connection::Pointer c 
-      = GetFactory()->NewConnection( bbfrom, output, bbto, input );
-
+    {
+        bbtkError("the black box \""<<to<<"\" does not exist");
+    }
+    Connection::Pointer c = GetFactory()->NewConnection( bbfrom, output, bbto, input );
     mPrototype->bbAddConnection(c);
-
-
   }
   //=======================================================================
 
@@ -666,47 +660,57 @@ size_t  ComplexBlackBoxDescriptor::GetObjectInternalSize() const
     return s;
   }
   //==========================================================================
-void ComplexBlackBoxDescriptor::GetBoxesInside (NodeTreeC& tree, std::vector<std::string>& list, int cont) 
+void ComplexBlackBoxDescriptor::GetBoxesInside (NodeTreeC& tree, int cont) 
 	{
-
+		std::cout<<"getBoxesInside recursivo "<<std::endl;
+		cont++;
 		std::string name = GetTypeName();
+		std::cout<<"despues de getTypeName : "<<name<<std::endl;
     std::string descr = GetDescription();
     std::string author = GetAuthor();
-   	list.push_back(name);
+	
+   	//list.push_back(name);
 		tree.setData(name);
-   //	list.push_back(descr);
-   //	list.push_back(author);
+   	//list.push_back(descr);
+   	//list.push_back(author);
 		int k = 0;
+		
     const ComplexBlackBox::BlackBoxMapType& B = mPrototype->bbGetBlackBoxMap();
-	
+
+		std::cout<<"----B size "<< B.size() << std::endl;
+		std::cout<<"----antes if "<<std::endl;
     if (B.size()) 
     {
 	   std::set<BlackBoxDescriptor::Pointer> pdeps;
 	   ComplexBlackBox::BlackBoxMapType::const_iterator b;
+			std::cout<<"----antes for "<<std::endl;
 	   for ( b = B.begin(); b != B.end(); ++b ) 
 	   {
-	    	BlackBoxDescriptor::Pointer d = b->second->bbGetDescriptor();
-				
+				BlackBoxDescriptor::Pointer d = b->second->bbGetDescriptor();
+				//std::cout<<"nombre objeto d "<< d->GetObjectName() <<std::endl;
 				
 	      //if (pdeps.find(d) != pdeps.end()) 
         //    continue;
 	      //pdeps.insert(d);
-
+				std::cout<<"----1~ "<<std::endl;
 	      Package::Pointer p = d->GetPackage();
 	      std::string nameBox = b->second->bbGetTypeName();
 				std::string packageBox = p->GetName();
-				
 				tree.insertChild(nameBox);
-
-				list.push_back(nameBox);
-				list.push_back(packageBox);
-
-				d->GetBoxesInside (tree.childs[k],list, cont+1);
+				std::cout<<"----2~ "<<std::endl;
+				//list.push_back(nameBox);
+				//list.push_back(packageBox);
+				std::cout<<"-----cont "<<cont<<std::endl;
+				//tree.treeTour(cont);
+				d->GetBoxesInside (tree.childs[k], cont);
+				std::cout<<"----3~ "<<std::endl;
+				//std::cout<<"--despues de la recursion "<<k<<std::endl;
 				k++;
 	    }	// for
-
+			std::cout<<"----despues for "<<std::endl;
      } // If B.size
-
+			std::cout<<"----despues if "<<std::endl;
+			std::cout<<"end getBoxesInside recursivo"<<std::endl;
 	}
 
 //===================================================