X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkUtilities.cxx;h=7e85dc76787497b9e350fc332188b4283f88304b;hb=87efce51877a540d943b1aa26307994b38bba55b;hp=7f8ed76c1e9bcd6a384edc3af0e72710cc03b07e;hpb=d9a9ad1dfc4015176c8e6220b56f9246e112fd87;p=bbtk.git diff --git a/kernel/src/bbtkUtilities.cxx b/kernel/src/bbtkUtilities.cxx index 7f8ed76..7e85dc7 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/28 11:54:04 $ - Version: $Revision: 1.12 $ + 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"; @@ -279,11 +287,15 @@ namespace bbtk #endif #elif defined(_WIN32) - if (c != '\\') - libname = path+"\\bb"; + if (c != '\\') + libname += "\\bb"; + else + libname += "bb"; libname += pkgname; libname += ".dll"; #endif + } + return libname; } @@ -292,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; } // ======================================================================= @@ -317,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; } @@ -333,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; @@ -753,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"<