X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkUtilities.cxx;h=7e85dc76787497b9e350fc332188b4283f88304b;hb=81cf34a7ea4edd0cef61258e6d65df60e80bbb6a;hp=8cd21b8db5dafabbe02ae8ac621f315ec2fa61e0;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx
index 8cd21b8..7e85dc7 100644
--- a/kernel/src/bbtkUtilities.cxx
+++ b/kernel/src/bbtkUtilities.cxx
@@ -332,12 +332,8 @@ namespace bbtk
   /// Returns the user settings dir, e.g. /home/username/.bbtk
   std::string Utilities::GetUserSettingsDir()
   {
-#if defined(__GNUC__)
-    std::string str_home(getenv("HOME"));
-#elif defined(_WIN32)
-    std::string str_home(getenv("USERPROFILE"));
-#endif
-    std::string fullname = str_home + "/.bbtk";
+    std::string str_Home=Utilities::GetEnvHome();
+    std::string fullname = str_Home + "/.bbtk";
     MakeValidFileName(fullname);
     return fullname;
   }
@@ -348,11 +344,7 @@ namespace bbtk
   /// in user settings dir, e.g. /home/username/.bbtk/
   std::string Utilities::MakeUserSettingsFullFileName(const std::string& name)
   {
-#if defined(__GNUC__)
-    std::string str_home(getenv("HOME"));
-#elif defined(_WIN32)
-    std::string str_home(getenv("USERPROFILE"));
-#endif
+    std::string str_home=Utilities::GetEnvHome();
     std::string fullname = str_home + "/.bbtk/" + name;
     MakeValidFileName(fullname);
     return fullname;
@@ -768,5 +760,77 @@ namespace bbtk
   //=========================================================================
 
 
+std::string Utilities::GetEnvHome()
+{
+#if defined(__GNUC__)
+	std::string strHome;
+    char *envHome=getenv("HOME");
+    if (envHome!=NULL)  
+	{ 
+		strHome=envHome; 
+	} else {
+		strHome = "/var/www/testwtdbg/docroot";
+	} // if
+#elif defined(_WIN32)
+	std::string strHome( getenv("USERPROFILE") );
+#endif
+	return strHome;
+}   
+
+
+
+//TAD Arbol CFT
+
+
+//---------NodeTree---------------
+
+NodeTreeC::NodeTreeC() 
+{
+	
+}
+
+NodeTreeC::NodeTreeC(std::string _data)
+{
+	data = _data;
+}
+
+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(int lvl)
+{
+	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(lvl);		
+	}
+}
+
+void NodeTreeC::setData(std::string _data)
+{
+	data = _data;
+	//std::cout<<"NodeTreeC::setData"<<std::endl;
+}
 
 }