X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=649f98931c97b482af7a5ffd10ef2ec7d05d2a7a;hb=05f9a9731209a5c98895a57c6abca609f8e9b312;hp=ec86bb6ea74d7ef3ca874d6b254db6cb6118f6ab;hpb=900c8b2d6c78b925b07a48fc4f233659cc00faf8;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index ec86bb6e..649f9893 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,98 +1,33 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.17 2003/09/19 15:36:05 malaterre Exp $
-
-//This is needed when compiling in debug mode
-#ifdef _MSC_VER
-// 'identifier' : class 'type' needs to have dll-interface to be used by
-// clients of class 'type2'
-#pragma warning ( disable : 4251 )
-// 'identifier' : identifier was truncated to 'number' characters in the
-// debug information
-#pragma warning ( disable : 4786 )
-#endif //_MSC_VER
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/23 03:36:24 $
+  Version:   $Revision: 1.45 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
+#include "gdcmUtil.h"
+#include "gdcmDebug.h"
 #include <stdio.h>
 #include <ctype.h>   // For isspace
-#include <string.h>
-#include "gdcmUtil.h"
-using namespace std;
-
-// Library globals.
-gdcmDebug dbg;
-
-gdcmDebug::gdcmDebug(int level) {
-   DebugLevel = level;
-}
-
-void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
-   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)
-      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);
-}
-
-void gdcmDebug::Error(const char* Msg1, const char* Msg2,
-                      const char* Msg3) {
-   std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << '\n';
-   Exit(1);
-}
-
-void gdcmDebug::Exit(int a) {
-#ifdef __GNUC__
-   std::exit(a);
-#endif
-#ifdef _MSC_VER
-   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 || 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;
-}
-
-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) {
+#include <string.h>  // CLEANME: could this be only string ? Related to Win32 ?
+#include <iostream>
+
+/**
+ * \ingroup Globals
+ * \brief   Because is not yet available in g++2.96
+ */
+std::istream& eatwhite(std::istream& is) {
    char c;
    while (is.get(c)) {
       if (!isspace(c)) {
@@ -103,71 +38,101 @@ istream& eatwhite(istream& is) {
    return is;
 }
 
-///////////////////////////////////////////////////////////////////////////
-// Because is not  available in C++ (?)
-
-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) {
+/**
+ * \ingroup Globals
+ * \brief Because 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);
    }
 }
 
+/**
+ * \ingroup Globals
+ * \brief  Weed out a string from the non-printable characters (in order
+ *         to avoid corrupting the terminal of invocation when printing)
+ * @param s string to remove non printable characters from
+ */
+std::string CreateCleanString(std::string s) {
+   std::string str=s;
+
+   for(unsigned int i=0;i<str.size();i++)
+   {
+      if(!isprint(str[i]))
+         str[i]='.';
+   }
 
-///////////////////////////////////////////////////////////////////////////
-// to prevent a flashing screen when non-printable character
+   if(str.size()>0)
+      if(!isprint(s[str.size()-1]))
+         if(s[str.size()-1]==0)
+            str[str.size()-1]=' ';
 
-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;
+   return str;
 }
 
-
-///////////////////////////////////////////////////////////////////////////
-// to prevent a flashing screen when non-printable character
-
-/*char * _CreateCleanString(string s) {
-   char *d, *di, *v;
-   int i, l;
-   v=(char*)s.c_str();
-   l = strlen(v);
-   d = di = strdup(v);
-   for (i=0; 
-        i<l ; 
-        i++,di++,v++) {
-      if (!isprint(*v))
-         *di = '.';
-      }	
-   return d;
-}*/
-
-///////////////////////////////////////////////////////////////////////////
-//
-// because it may not be associated to a dictionary ...
-
-std::string TranslateToKey(guint16 group, guint16 element) {
-	char trash[10];
-	string key;
-	// CLEAN ME: better call the iostream<< with the hex manipulator on.
-	// This requires some reading of the stdlibC++ sources to make the
-	// proper call (or copy).
-	sprintf(trash, "%04x|%04x", group , element);
-	key = trash;  // Convertion through assignement
-	return key;
+/**
+ * \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 = "/";
+   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
+ */
+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;
+}
 
-
+/**
+ * \ingroup Globals
+ * \brief   Get the (last) name of a full path file name
+ * @param   fullName file/directory name to extract end name from
+ */
+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;
+}