X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=4c053864a287ec7e4d79a998f0b6334c7d8aec58;hb=f6dbab059809959b586408f89330264a03cfe656;hp=349988731553713eca6126d0726d41ddbbd5bda8;hpb=9b3db5f141ec2b11eadefaa2ea2a3a20058b37f9;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 34998873..4c053864 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -1,103 +1,32 @@ -// gdcmUtil.cxx -//----------------------------------------------------------------------------- -#include "gdcmUtil.h" +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmUtil.cxx,v $ + Language: C++ + Date: $Date: 2004/07/17 22:47:01 $ + Version: $Revision: 1.47 $ + + 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 "gdcmUtil.h" +#include "gdcmDebug.h" #include #include // For isspace -#include - -//----------------------------------------------------------------------------- -// Library globals. -gdcmDebug dbg; - -//----------------------------------------------------------------------------- -gdcmDebug::gdcmDebug(int level) { - DebugLevel = level; -} - -void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - std::cerr << Msg1 << ' ' << Msg2 << std::endl; -} - -void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) { - if (!Test) - return; - std::cerr << Msg1 << ' ' << Msg2 << std::endl; - Exit(1); -} - -void gdcmDebug::Error(const char* Msg1, const char* Msg2, - const char* Msg3) { - std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl; - Exit(1); -} - -void gdcmDebug::Assert(int Level, bool Test, - const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - if (!Test) - std::cerr << Msg1 << ' ' << Msg2 << std::endl; -} - -void gdcmDebug::Exit(int a) { -#ifdef __GNUC__ - std::exit(a); -#endif -#ifdef _MSC_VER - exit(a); // Found in #include -#endif -} - -//----------------------------------------------------------------------------- -gdcmDictSet *gdcmGlobal::Dicts = (gdcmDictSet *)0; -gdcmVR *gdcmGlobal::VR = (gdcmVR *)0; -gdcmTS *gdcmGlobal::TS = (gdcmTS *)0; -gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0; -gdcmGlobal gdcmGlob; - -gdcmGlobal::gdcmGlobal(void) { - if (VR || TS || Dicts || ddElem) - dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated"); - Dicts = new gdcmDictSet(); - VR = new gdcmVR(); - TS = new gdcmTS(); - ddElem = new gdcmDicomDirElement(); -} - -gdcmGlobal::~gdcmGlobal() { - delete Dicts; - delete VR; - delete TS; - delete ddElem; -} - -gdcmVR *gdcmGlobal::GetVR(void) { - return VR; -} +#include // CLEANME: could this be only string ? Related to Win32 ? +#include -gdcmTS *gdcmGlobal::GetTS(void) { - return TS; -} - -gdcmDictSet *gdcmGlobal::GetDicts(void) { - return Dicts; -} - -gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) { - return ddElem; -} - -//----------------------------------------------------------------------------- -// Here are some usefull functions, belonging to NO class, -// dealing with strings, file names, etc -// that can be called from anywhere -// by whomsoever they can help. -//----------------------------------------------------------------------------- - -// Because is not yet available in g++2.96 +/** + * \ingroup Globals + * \brief Because is not yet available in g++2.96 + */ std::istream& eatwhite(std::istream& is) { char c; while (is.get(c)) { @@ -109,8 +38,10 @@ std::istream& eatwhite(std::istream& is) { return is; } -/////////////////////////////////////////////////////////////////////////// -// Because is not available in C++ (?) +/** + * \ingroup Globals + * \brief Because not available in C++ (?) + */ void Tokenize (const std::string& str, std::vector& tokens, const std::string& delimiters) { @@ -123,77 +54,71 @@ void Tokenize (const std::string& str, } } - -/////////////////////////////////////////////////////////////////////////// -// to prevent a flashing screen when non-printable character -char *_cleanString(char *v) { - char *d; - int i, l; - l = strlen(v); - for (i=0,d=v; - i0) if(!isprint(s[str.size()-1])) if(s[str.size()-1]==0) str[str.size()-1]=' '; - return(str); + return str; } -/////////////////////////////////////////////////////////////////////////// -/* +/** + * \ingroup Globals * \brief Add a SEPARATOR to the end of the name is necessary - * @param + * @param name file/directory name to normalize */ void NormalizePath(std::string &name) { -const char SEPARATOR_X = '/'; -const char SEPARATOR_WIN = '\\'; -const std::string SEPARATOR = "/"; + const char SEPARATOR_X = '/'; + const char SEPARATOR_WIN = '\\'; + const std::string SEPARATOR = "/"; int size=name.size(); + if((name[size-1]!=SEPARATOR_X)&&(name[size-1]!=SEPARATOR_WIN)) { name+=SEPARATOR; } } -/////////////////////////////////////////////////////////////////////////// -/* +/** + * \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) + int pos1 = fullName.rfind("/"); + int pos2 = fullName.rfind("\\"); + if( pos1 > pos2) + { fullName.resize(pos1); + } else + { fullName.resize(pos2); - return(fullName); + } + return fullName; } -/////////////////////////////////////////////////////////////////////////// -/* +/** + * \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) { @@ -202,14 +127,16 @@ std::string GetName(std::string &fullName) if (a == '/' || a == '\\') { fin--; } - int deb; + int deb = 0; for (int i=fin;i!=0;i--) { if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\') break; deb = i; } + std::string lastName; - for (int i=deb;i