X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=649f98931c97b482af7a5ffd10ef2ec7d05d2a7a;hb=16887ff26b068405a235a6a8a37f4e62516de393;hp=1c521040b7e4ec7916a33d4f558dec67a960eb70;hpb=3e78befc911eac2ecc70747854911d1f803797b5;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 1c521040..649f9893 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -1,98 +1,138 @@ -// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.11 2003/05/21 16:26:28 regrain Exp $ +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmUtil.cxx,v $ + Language: C++ + Date: $Date: 2004/06/23 03:36:24 $ + Version: $Revision: 1.45 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ -#include // For isspace #include "gdcmUtil.h" -using namespace std; - -// Library globals. -gdcmDebug dbg; +#include "gdcmDebug.h" +#include +#include // For isspace +#include // CLEANME: could this be only string ? Related to Win32 ? +#include -gdcmDebug::gdcmDebug(int level) { - DebugLevel = level; +/** + * \ingroup Globals + * \brief Because is not yet available in g++2.96 + */ +std::istream& eatwhite(std::istream& is) { + char c; + while (is.get(c)) { + if (!isspace(c)) { + is.putback(c); + break; + } + } + return is; } -void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - cerr << Msg1 << ' ' << Msg2 << '\n'; +/** + * \ingroup Globals + * \brief Because not available in C++ (?) + */ +void Tokenize (const std::string& str, + std::vector& tokens, + const std::string& delimiters) { + std::string::size_type lastPos = str.find_first_not_of(delimiters,0); + std::string::size_type pos = str.find_first_of (delimiters,lastPos); + while (std::string::npos != pos || std::string::npos != lastPos) { + tokens.push_back(str.substr(lastPos, pos - lastPos)); + lastPos = str.find_first_not_of(delimiters, pos); + pos = str.find_first_of (delimiters, lastPos); + } } -void gdcmDebug::Assert(int Level, bool Test, - const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - if (!Test) - cerr << Msg1 << ' ' << Msg2 << '\n'; -} +/** + * \ingroup Globals + * \brief Weed out a string from the non-printable characters (in order + * to avoid corrupting the terminal of invocation when printing) + * @param s string to remove non printable characters from + */ +std::string CreateCleanString(std::string s) { + std::string str=s; -void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) { - if (!Test) - return; - std::cerr << Msg1 << ' ' << Msg2 << '\n'; - Exit(1); -} + for(unsigned int i=0;i0) + if(!isprint(s[str.size()-1])) + if(s[str.size()-1]==0) + str[str.size()-1]=' '; -void gdcmDebug::Exit(int a) { -#ifdef __GNUC__ - std::exit(a); -#endif -#ifdef _MSC_VER - exit(a); // Found in #include -#endif + return str; } -/////////////////////////////////////////////////////////////////////////// -gdcmVR * gdcmGlobal::VR = (gdcmVR*)0; -gdcmDictSet * gdcmGlobal::Dicts = (gdcmDictSet*)0; -gdcmGlobal gdcmGlob; - -gdcmGlobal::gdcmGlobal(void) { - if (VR || Dicts) - dbg.Verbose(0, "gdcmGlobal::gdcmGlobal: VR or Dicts allready allocated"); - VR = new gdcmVR(); - Dicts = new gdcmDictSet(); -} +/** + * \ingroup Globals + * \brief Add a SEPARATOR to the end of the name is necessary + * @param name file/directory name to normalize + */ +void NormalizePath(std::string &name) +{ + const char SEPARATOR_X = '/'; + const char SEPARATOR_WIN = '\\'; + const std::string SEPARATOR = "/"; + int size=name.size(); -gdcmGlobal::~gdcmGlobal() { - delete VR; - delete Dicts; + if((name[size-1]!=SEPARATOR_X)&&(name[size-1]!=SEPARATOR_WIN)) + { + name+=SEPARATOR; + } } -gdcmVR * gdcmGlobal::GetVR(void) { - return VR; +/** + * \ingroup Globals + * \brief Get the (directory) path from a full path file name + * @param fullName file/directory name to extract Path from + */ +std::string GetPath(std::string &fullName) +{ + int pos1=fullName.rfind("/"); + int pos2=fullName.rfind("\\"); + if(pos1>pos2) + fullName.resize(pos1); + else + fullName.resize(pos2); + return fullName; } -gdcmDictSet * gdcmGlobal::GetDicts(void) { - return Dicts; -} +/** + * \ingroup Globals + * \brief Get the (last) name of a full path file name + * @param fullName file/directory name to extract end name from + */ +std::string GetName(std::string &fullName) +{ + int fin=fullName.length()-1; + char a =fullName.c_str()[fin]; + if (a == '/' || a == '\\') { + fin--; + } + int deb; + for (int i=fin;i!=0;i--) { + if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\') + break; + deb = i; + } -/////////////////////////////////////////////////////////////////////////// -// Because is not yet available in g++2.96 -istream& eatwhite(istream& is) { - char c; - while (is.get(c)) { - if (!isspace(c)) { - is.putback(c); - break; - } - } - return is; -} + std::string lastName; + for (int j=deb;j& tokens, - const string& delimiters) { - string::size_type lastPos = str.find_first_not_of(delimiters,0); - string::size_type pos = str.find_first_of(delimiters,lastPos); - while (string::npos != pos || string::npos != lastPos) { - tokens.push_back(str.substr(lastPos, pos - lastPos)); - lastPos = str.find_first_not_of(delimiters, pos); - pos = str.find_first_of(delimiters, lastPos); - } -} + return lastName; +}