X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=c6a9d0365d3f24bd109a49ed64acd5da43632638;hb=1aad11d86fa8d683d4f1a38b6f0483444e67f217;hp=0760f383b929f3daf3ffcdc140a614310baf572a;hpb=1a11accd11061d63d3c09db7b1445637207e81e4;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 0760f383..c6a9d036 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -1,157 +1,16 @@ // gdcmUtil.cxx //----------------------------------------------------------------------------- #include "gdcmUtil.h" - +#include "gdcmDebug.h" #include #include // For isspace -#include - -//----------------------------------------------------------------------------- -// Library globals. -gdcmDebug dbg; - -//----------------------------------------------------------------------------- -/** - * \ingroup gdcmDebug - * \brief constructor - * @param level debug level - */ - -gdcmDebug::gdcmDebug(int level) { - DebugLevel = level; -} +#include // CLEANME: could this be only string ? Related to Win32 ? +#include /** - * \ingroup gdcmDebug - * \brief Verbose - * @param Level level - * @param Msg1 first message part - * @param Msg2 second message part + * \ingroup Globals + * \brief Because is not yet available in g++2.96 */ -void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - std::cerr << Msg1 << ' ' << Msg2 << std::endl; -} - -/** - * \ingroup gdcmDebug - * \brief Error - * @param Test test - * @param Msg1 first message part - * @param Msg2 second message part - */ -void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) { - if (!Test) - return; - std::cerr << Msg1 << ' ' << Msg2 << std::endl; - Exit(1); -} - -/** - * \ingroup gdcmDebug - * \brief Error - * @param Msg1 first message part - * @param Msg2 second message part - * @param Msg3 Third message part - */ -void gdcmDebug::Error(const char* Msg1, const char* Msg2, - const char* Msg3) { - std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl; - Exit(1); -} - -/** - * \ingroup gdcmDebug - * \brief Assert - * @param Level level - * @param Test test - * @param Msg1 first message part - * @param Msg2 second message part - */ - 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; -} - -/** - * \ingroup gdcmDebug - * \brief Exit - * @param a return code - */ -void gdcmDebug::Exit(int a) { -#ifdef __GNUC__ - std::exit(a); -#endif -#ifdef _MSC_VER - exit(a); // Found in #include -#endif -} - -//----------------------------------------------------------------------------- -/// Pointer to a container, holding *all* the Dicom Dictionaries -gdcmDictSet *gdcmGlobal::Dicts = (gdcmDictSet *)0; -/// Pointer to a H table containing the 'Value Representations' -gdcmVR *gdcmGlobal::VR = (gdcmVR *)0; -/// Pointer to a H table containing the Transfer Syntax codes and their english description -gdcmTS *gdcmGlobal::TS = (gdcmTS *)0; -/// Pointer to a H table containing the Dicom Elements necessary to describe each part of a DICOMDIR -gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0; -/// gdcm Glob -gdcmGlobal gdcmGlob; - - -/** - * \ingroup gdcmGlobal - * \brief constructor : populates the - */ -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(); -} - -/** - * \ingroup gdcmGlobal - * \brief canonical destructor - */ -gdcmGlobal::~gdcmGlobal() { - delete Dicts; - delete VR; - delete TS; - delete ddElem; -} - -gdcmVR *gdcmGlobal::GetVR(void) { - return VR; -} - -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 std::istream& eatwhite(std::istream& is) { char c; while (is.get(c)) { @@ -163,8 +22,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) { @@ -177,40 +38,21 @@ void Tokenize (const std::string& str, } } - -/////////////////////////////////////////////////////////////////////////// /** - * \brief to prevent a flashing screen when non-printable character - * @param v characters array to remove non printable characters from - */ -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) @@ -219,27 +61,28 @@ std::string _CreateCleanString(std::string s) { return(str); } -/////////////////////////////////////////////////////////////////////////// /** + * \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 = "/"; + 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 + * @param fullName file/directory name to extract Path from */ std::string GetPath(std::string &fullName) { @@ -252,10 +95,10 @@ std::string GetPath(std::string &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 + * @param fullName file/directory name to extract end name from */ std::string GetName(std::string &fullName) {