X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=40143310270811fa753301afa7bf6ac6663befc2;hb=2908e8e550cb43a54f081c41a94e143f5a9b573e;hp=207b66f13351b1d435182b411c09947c9838565c;hpb=0457e1e8fc68df6d9e2d1a0fcd0053ecee3c5ad7;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 207b66f1..40143310 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,65 +1,73 @@
 // 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
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-----------------------------------------------------------------------------
 gdcmVR      * gdcmGlobal::VR    = (gdcmVR*)0;
+gdcmTS      * gdcmGlobal::TS    = (gdcmTS*)0;
 gdcmDictSet * gdcmGlobal::Dicts = (gdcmDictSet*)0;
 gdcmGlobal gdcmGlob;
 
 gdcmGlobal::gdcmGlobal(void) {
-   if (VR || Dicts)
-      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal: VR or Dicts allready allocated");
+   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();
 }
 
 gdcmGlobal::~gdcmGlobal() {
    delete VR;
+   delete TS;
    delete Dicts;
 }
 
@@ -67,31 +75,68 @@ 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;
+std::istream& eatwhite(std::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) {
+///////////////////////////////////////////////////////////////////////////
+// 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]='.';
+  }
+
+  return(str);
+}
+