* FIX : src/gdcmDicomDir.cxx : make windows compilable

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 475d71c2ece3d5e43b7cca71b430bd84714e680c..5b5243de71dfc5e0cce0752de859131744817082 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -52,23 +52,26 @@ void gdcmDebug::Exit(int a) {
 }
 
 //-----------------------------------------------------------------------------
-gdcmVR      *gdcmGlobal::VR    = (gdcmVR *)0;
-gdcmTS      *gdcmGlobal::TS    = (gdcmTS *)0;
-gdcmDictSet *gdcmGlobal::Dicts = (gdcmDictSet *)0;
+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)
+   if (VR || TS || Dicts || ddElem)
       dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
-   VR = new gdcmVR();
-   TS = new gdcmTS();
-   Dicts = new gdcmDictSet();
+   Dicts  = new gdcmDictSet();
+   VR     = new gdcmVR();
+   TS     = new gdcmTS();
+   ddElem = new gdcmDicomDirElement();
 }
 
 gdcmGlobal::~gdcmGlobal() {
+   delete Dicts;
    delete VR;
    delete TS;
-   delete Dicts;
+   delete ddElem;
 }
 
 gdcmVR *gdcmGlobal::GetVR(void) {
@@ -83,7 +86,17 @@ 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;
@@ -118,33 +131,87 @@ char *_cleanString(char *v) {
    int i, l;
    l = strlen(v);
    for (i=0,d=v; 
-        i<l ; 
-        i++,d++) {
-      if (!isprint(*d))
+      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;
-  int n = str.size();
-  for(int i=0;i<n-1;i++)
-  {
-    if(!isprint(str[i]))
-      str[i]='.';
-  }
-  if(!isprint(str[n])) { // to avoid trouble with odd length fields
-                        // padded with zeo to become even
-  
-     if (str[n] == '\0') 
-        str[n] = ' ';
-     else
-        str[n] = '.';
-  }
-  return(str);
+   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);
+}
+
+///////////////////////////////////////////////////////////////////////////
+/*
+ * \brief   Add a SEPARATOR to the end of the name is necessary
+ * @param   
+ */
+void NormalizePath(std::string &name)
+{
+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;
+   }
 }
 
+///////////////////////////////////////////////////////////////////////////
+/*
+ * \brief   Get the (directory) path from a full path file name
+ */
+std::string GetPath(std::string &fullName)
+{
+   int pos1=fullName.rfind("/");
+   int pos2=fullName.rfind("\\");
+   if(pos1>pos2)
+      fullName.resize(pos1);
+   else
+      fullName.resize(pos2);
+   return(fullName);
+}
+
+///////////////////////////////////////////////////////////////////////////
+/*
+ * \brief   Get the (last) name of a full path file name
+ */
+std::string GetName(std::string &fullName)
+{   
+  int fin=fullName.length()-1;
+  char a =fullName.c_str()[fin];
+  if (a == '/' || a == '\\') {
+     fin--;
+  }
+  int deb;
+  for (int i=fin;i!=0;i--) {
+     if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\')  
+        break;
+      deb = i;
+  }    
+
+  std::string lastName;
+  for (int j=deb;j<fin+1;j++)
+    lastName=lastName+fullName.c_str()[j];
+
+  return(lastName);
+}