X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=5cb02ac3ebb4f96ad0e092b8974388ed7e4ad1f7;hb=5fbee0c35cc0f02ceea5d5a8be0c1900c63143bb;hp=c6a7576e6485b7d8e92841610b75daba9df99877;hpb=1aa2bb207fb6b9ce78f35e7547dd4c770e516adb;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index c6a7576e..5cb02ac3 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -1,48 +1,163 @@ -#include +// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.15 2003/07/01 15:48:27 jpr Exp $ + +#include +#include // For isspace +#include #include "gdcmUtil.h" +using namespace std; + +// Library globals. +gdcmDebug dbg; gdcmDebug::gdcmDebug(int level) { - DebugLevel = level; + DebugLevel = level; } void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - cerr << Msg1 << ' ' << Msg2 << '\n'; + if (Level > DebugLevel) + return ; + std::cerr << Msg1 << ' ' << Msg2 << '\n'; } void gdcmDebug::Assert(int Level, bool Test, const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - if (!Test) - cerr << Msg1 << ' ' << Msg2 << '\n'; + if (Level > DebugLevel) + return ; + if (!Test) + std::cerr << Msg1 << ' ' << Msg2 << '\n'; } void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) { - if (!Test) - return; - std::cerr << Msg1 << ' ' << Msg2 << '\n'; - exit(1); + if (!Test) + return; + std::cerr << Msg1 << ' ' << Msg2 << '\n'; + Exit(1); } void gdcmDebug::Error(const char* Msg1, const char* Msg2, const char* Msg3) { - std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << '\n'; - exit(1); + std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << '\n'; + Exit(1); } -gdcmDebug dbg; +void gdcmDebug::Exit(int a) { +#ifdef __GNUC__ + std::exit(a); +#endif +#ifdef _MSC_VER + exit(a); // Found in #include +#endif +} + +/////////////////////////////////////////////////////////////////////////// +gdcmVR * gdcmGlobal::VR = (gdcmVR*)0; +gdcmTS * gdcmGlobal::TS = (gdcmTS*)0; +gdcmDictSet * gdcmGlobal::Dicts = (gdcmDictSet*)0; +gdcmGlobal gdcmGlob; + +gdcmGlobal::gdcmGlobal(void) { + if (VR || TS || Dicts) + dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated"); + VR = new gdcmVR(); + TS = new gdcmTS(); + Dicts = new gdcmDictSet(); +} -// Because is not yet available in g++2.06 +gdcmGlobal::~gdcmGlobal() { + delete VR; + delete TS; + delete Dicts; +} + +gdcmVR * gdcmGlobal::GetVR(void) { + return VR; +} + +gdcmTS * gdcmGlobal::GetTS(void) { + return TS; +} +gdcmDictSet * gdcmGlobal::GetDicts(void) { + return Dicts; +} + +/////////////////////////////////////////////////////////////////////////// +// 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; + char c; + while (is.get(c)) { + if (!isspace(c)) { + is.putback(c); + break; + } + } + return is; } +/////////////////////////////////////////////////////////////////////////// +// Because is not available in C++ (?) + +void Tokenize (const string& str, + vector& 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); + } +} + + +/////////////////////////////////////////////////////////////////////////// +// 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; + i