X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkUtilities.cxx;h=0a6fd9f0cee96db2acf7821da2be679edf2720d3;hb=a4a6cf179ce4160887c0566115493f1e8f109854;hp=eeaabe5841649423d99f3e2e3ddbcf79df704b87;hpb=e97caf8b03ac7cd466a36d68dda8b762d4f4a596;p=bbtk.git

diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx
index eeaabe5..0a6fd9f 100644
--- a/kernel/src/bbtkUtilities.cxx
+++ b/kernel/src/bbtkUtilities.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: bbtkUtilities.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/01/29 08:45:29 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.15 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* 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.
-* ------------------------------------------------------------------------ */                                                                         
+
 
 
 #include "bbtkUtilities.h"
@@ -265,7 +272,8 @@ namespace bbtk
   std::string Utilities::MakeLibnameFromPath(std::string path, std::string pkgname)
   {
     std::string libname = path;
-    char c = path[path.size()-1];    
+	if(path.size()>0){
+		char c = path[path.size()-1];    
 #if defined(__GNUC__)
        if (c != '/')
           libname += "/libbb";
@@ -286,6 +294,8 @@ namespace bbtk
        libname += pkgname;
        libname += ".dll";
 #endif
+	}
+    
     return libname;    
   }
 
@@ -294,23 +304,26 @@ namespace bbtk
   std::string Utilities::MakePkgnameFromPath(std::string path, std::string pkgname, bool addExt)
   {
     std::string libname = path;
-    char c = path[path.size()-1];
-    if (c != '/' && c != '\\')
-    {
-       libname +=  ConfigurationFile::GetInstance().Get_file_separator ();
-    }
-    libname += pkgname;
-    if (addExt)
-    {
-       int l = libname.size();
-       if (l>4)
-       {
-          if (libname.substr(l-4, 4) != ".bbs")
-          {
-               libname = libname + ".bbs";
-          }
-       }
-    }
+	if(path.size()>0){
+		char c = path[path.size()-1];
+		if (c != '/' && c != '\\')
+		{
+		   libname +=  ConfigurationFile::GetInstance().Get_file_separator ();
+		}
+		libname += pkgname;
+		if (addExt)
+		{
+		   int l = libname.size();
+		   if (l>4)
+		   {
+			  if (libname.substr(l-4, 4) != ".bbs")
+			  {
+				   libname = libname + ".bbs";
+			  }
+		   }
+		}
+	}
+    
     return libname;
   }
   // =======================================================================
@@ -754,6 +767,87 @@ namespace bbtk
   }
   //=========================================================================
 
+//TAD Arbol CFT
+
+
+//---------NodeTree---------------
+
+NodeTreeC::NodeTreeC() 
+{
+	
+}
+
+NodeTreeC::NodeTreeC(std::string _data)
+{
+	data = _data;
+}
+
+NodeTreeC::~NodeTreeC()
+{
 
+}
+
+void NodeTreeC::insertChild(std::string _data)
+{
+	NodeTreeC temp = NodeTreeC(_data);
+	childs.push_back(temp);
+}
+
+void NodeTreeC::treeTour()
+{
+	std::cout <<"data "<< data << std::endl;
+	std::cout <<"size "<< childs.size() << std::endl;
+	for(int i = 0 ; i < childs.size(); i++)
+	{
+		childs[i].treeTour();		
+	}
+}
+
+void NodeTreeC::setData(std::string _data)
+{
+	data = _data;
+}
+
+
+//---------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 ;
+}
+*/
 
 }