From e123c635cfb290e1936b9765d97d097500170f26 Mon Sep 17 00:00:00 2001
From: ctorres <carlos.torres@creatis.insa-lyon.fr>
Date: Wed, 18 Jun 2014 15:32:01 +0200
Subject: [PATCH] 2397	BBTK	Feature	New	Normal	Feature GetBoxesInside
 for showing the tree of a blackbox	2014-06-18 15:31

---
 kernel/src/bbtkAtomicBlackBoxDescriptor.cxx  |  2 +
 kernel/src/bbtkBlackBoxDescriptor.cxx        |  2 +-
 kernel/src/bbtkBlackBoxDescriptor.h          |  2 +-
 kernel/src/bbtkComplexBlackBoxDescriptor.cxx | 44 ++++++++------
 kernel/src/bbtkComplexBlackBoxDescriptor.h   |  2 +-
 kernel/src/bbtkPackage.cxx                   |  9 ++-
 kernel/src/bbtkPackage.h                     |  2 +-
 kernel/src/bbtkUtilities.cxx                 | 63 ++++++--------------
 kernel/src/bbtkUtilities.h                   | 18 +-----
 9 files changed, 56 insertions(+), 88 deletions(-)

diff --git a/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx b/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx
index b60f6bb..aafb10d 100644
--- a/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkAtomicBlackBoxDescriptor.cxx
@@ -86,4 +86,6 @@ namespace bbtk
   {  
     bbtkDDebugMessage("object",3,"==> ~AtomicBlackBoxDescriptor()"<<std::endl);
   }
+
+  	
 }// namespace bbtk
diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx
index 9f40f1f..24e7024 100644
--- a/kernel/src/bbtkBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkBlackBoxDescriptor.cxx
@@ -315,7 +315,7 @@ namespace bbtk
     return "::" + mTypeName;
   }
   //=========================================================================
- 	 void BlackBoxDescriptor::GetBoxesInside (NodeTreeC& tree, std::vector<std::string>& temp, int cont){
+ 	 void BlackBoxDescriptor::GetBoxesInside (NodeTreeC& tree, int cont){
 		
 	}
   //=========================================================================
diff --git a/kernel/src/bbtkBlackBoxDescriptor.h b/kernel/src/bbtkBlackBoxDescriptor.h
index 25f4544..8124b35 100644
--- a/kernel/src/bbtkBlackBoxDescriptor.h
+++ b/kernel/src/bbtkBlackBoxDescriptor.h
@@ -170,7 +170,7 @@ namespace bbtk
     ///
     virtual void Check(bool recursive=true) const;
 
-	  virtual void GetBoxesInside (NodeTreeC& tree, std::vector<std::string>& temp, int cont);
+	  virtual void GetBoxesInside (NodeTreeC& tree, int cont);
 	  
 	  /// Sets the name of the script file from which it is defined
 	  void SetScriptFileName(const std::string& n) { mScriptFileName = n; }
diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index c25819f..b79fed3 100644
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -666,47 +666,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;
 	}
 
 //===================================================
diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.h b/kernel/src/bbtkComplexBlackBoxDescriptor.h
index f9e7f8d..e39b6d7 100644
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.h
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.h
@@ -144,7 +144,7 @@ namespace bbtk
 			  const std::string& output_dir = "",
 			  bool relative_link = false );
     
-		void GetBoxesInside (NodeTreeC& tree, std::vector<std::string>& list, int cont);
+		void GetBoxesInside (NodeTreeC& tree, int cont);
    ///
     virtual void Check(bool recursive=true) const;
        
diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx
index 1b0abc0..16f4ffb 100644
--- a/kernel/src/bbtkPackage.cxx
+++ b/kernel/src/bbtkPackage.cxx
@@ -1404,15 +1404,14 @@ namespace bbtk
     return s;
   }
   //==========================================================================
-  void  Package::GetBoxesInside(NodeTreeC& tree, std::vector<std::string>& list, int cont) 
+  void  Package::GetBoxesInside(NodeTreeC& tree, int cont) 
   {
 		DescriptorMapType::const_iterator i;
-
-		std::vector<std::string>  temp;
+		std::cout<<"*********a********"<<std::endl;
 		for (i=mDescriptorMap.begin(); i!=mDescriptorMap.end(); ++i) 
 		{
-			i->second->GetBoxesInside(tree, list, cont);
-			list.insert( list.end(), temp.begin(), temp.end() );
+			i->second->GetBoxesInside(tree, cont);
+			std::cout<<"*****************"<<std::endl;
 		}    
   }
 	//==========================================================================
diff --git a/kernel/src/bbtkPackage.h b/kernel/src/bbtkPackage.h
index f39dfc6..860cbd9 100644
--- a/kernel/src/bbtkPackage.h
+++ b/kernel/src/bbtkPackage.h
@@ -73,7 +73,7 @@ namespace bbtk
 					    const std::string& pkgname,
 					    const std::string& path);
 
-  	void  GetBoxesInside(NodeTreeC& tree, std::vector<std::string>& list, int cont);
+  	void  GetBoxesInside(NodeTreeC& tree, int cont);
     /// NOTE : All the static methods below for package destruction
     /// are not member because they can cause the package death 
     /// and thus close the dynamic library from which it has been loaded.
diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx
index 0a6fd9f..747f772 100644
--- a/kernel/src/bbtkUtilities.cxx
+++ b/kernel/src/bbtkUtilities.cxx
@@ -786,68 +786,39 @@ NodeTreeC::~NodeTreeC()
 {
 
 }
+void NodeTreeC::deleteTree()
+{
+	data = "";
+	std::cout<<"NodeTreeC::deleteTree 1"<<std::endl;
+	childs.erase(childs.begin(),childs.begin()+childs.size());
+	std::cout<<"NodeTreeC::deleteTree 2"<<std::endl;
+}
 
 void NodeTreeC::insertChild(std::string _data)
 {
 	NodeTreeC temp = NodeTreeC(_data);
 	childs.push_back(temp);
+	//std::cout<<"NodeTreeC::insertChild"<<std::endl;
 }
 
-void NodeTreeC::treeTour()
+void NodeTreeC::treeTour(int lvl)
 {
-	std::cout <<"data "<< data << std::endl;
-	std::cout <<"size "<< childs.size() << std::endl;
+	std::string space = "";
+	for (int j=0; j<lvl ; j++){
+				space += "   ";
+	}
+	lvl++;
+	std::cout <<space<<"data: "<< data << "  size: "<< childs.size() << std::endl;
 	for(int i = 0 ; i < childs.size(); i++)
 	{
-		childs[i].treeTour();		
+		childs[i].treeTour(lvl);		
 	}
 }
 
 void NodeTreeC::setData(std::string _data)
 {
 	data = _data;
+	//std::cout<<"NodeTreeC::setData"<<std::endl;
 }
 
-
-//---------Tree------------
-/*
-TreeC::TreeC()
-{
-
-}
-
-TreeC::TreeC(std::string _data)
-{
-	root = NodeTreeC(_data);
-}
-
-TreeC::~TreeC()
-{
-
-}
-
-void TreeC::insertRoot(std::string _data)
-{
-	NodeTreeC temp = NodeTreeC(_data);
-	root = temp;
-}
-
-void TreeC::treeTour()
-{
-	root.treeTour();
-}
-
-void TreeC::insertData(std::string _data)
-{
-	
-}
-
-TreeC* TreeC::getSubTree()
-{
-	TreeC temp;
-	temp.root = root.childs[0];
-	return ;
-}
-*/
-
 }
diff --git a/kernel/src/bbtkUtilities.h b/kernel/src/bbtkUtilities.h
index 1a1a399..1f8f6c3 100644
--- a/kernel/src/bbtkUtilities.h
+++ b/kernel/src/bbtkUtilities.h
@@ -211,24 +211,10 @@ public:
 	NodeTreeC(std::string _data);
 	~NodeTreeC();
 	void insertChild(std::string _data);
-	void treeTour();
+	void treeTour(int lvl);
 	void setData(std::string _data);
+	void deleteTree();
 };
-/*
-class TreeC
-{
-public:
-	NodeTreeC root;
-
-  TreeC();
-	TreeC(std::string _data);
-	~TreeC();
-	void insertRoot(std::string _data);
-	void treeTour();
-	void insertData(std::string _data);
-	TreeC getSubTree();
-};
- */
   
 } // namespace bbtk
  
-- 
2.46.1