* FIX : Set the elements to create the DicomDir in a dictionary file

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index ea90d950231603531bb53703f7c677c8a98f6acc..faad02548843d592f30abff1a2bfc3bdb439a2f2 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,70 +1,155 @@
 // gdcmUtil.cxx
+//-----------------------------------------------------------------------------
+#include "gdcmUtil.h"
 
+#include <stdio.h>
 #include <ctype.h>   // For isspace
-#include "gdcmUtil.h"
+#include <string.h>
 
+//-----------------------------------------------------------------------------
+// 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';
-}
-
-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 ;
+   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
 }
 
 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 << std::endl;
+   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 << 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);
+   std::exit(a);
 #endif
 #ifdef _MSC_VER
-       exit(a);    // Found in #include <stdlib.h>
+   exit(a);    // Found in #include <stdlib.h>
 #endif
 }
 
-gdcmDebug dbg;
+//-----------------------------------------------------------------------------
+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)
+      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;
+}
+
+gdcmTS *gdcmGlobal::GetTS(void) {
+   return TS;
+}
+
+gdcmDictSet *gdcmGlobal::GetDicts(void) {
+   return Dicts;
+}
+
+gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) {
+   return ddElem;
+}
+
+//-----------------------------------------------------------------------------
 // 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;
-}
-
-void Tokenize (const string& str,
-               vector<string>& 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) {
+std::istream& eatwhite(std::istream& 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 std::string& str,
+               std::vector<std::string>& 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);
+      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<l ; 
+      i++,d++) {
+         if (!isprint(*d))
+         *d = '.';
+   }   
+   return v;
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// to prevent a flashing screen when non-printable character
+std::string _CreateCleanString(std::string s) {
+   std::string str=s;
+
+   for(int i=0;i<str.size();i++)
+   {
+      if(!isprint(str[i]))
+         str[i]='.';
+   }
+
+
+   if(str.size()>0)
+      if(!isprint(s[str.size()-1]))
+         if(s[str.size()-1]==0)
+            str[str.size()-1]=' ';
+
+   return(str);
+}