X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=a2c491cc6d14722d7fd12f2ac533e6badee68f64;hb=36065b288af82c4259a56523a3bd5fb4a529d7b5;hp=729d400eaf5ef8b9a99fb8b664ebffae47e2351c;hpb=29bdd1e88a28b6267618f633f304e1154537ce7b;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 729d400e..a2c491cc 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,87 +1,107 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.25 2003/10/02 11:26:16 malaterre Exp $
-
+// gdcmUtil.cxx
+//-----------------------------------------------------------------------------
 #include "gdcmUtil.h"
-
+#include "gdcmDebug.h"
 #include <stdio.h>
 #include <ctype.h>   // For isspace
-#include <string.h>
-
-// 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 << std::endl;
-}
-
-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::Error( bool Test, const char * Msg1, const char * Msg2) {
-   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 << std::endl;
-   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;
+#include <string.h>  // CLEANME: could this be only string ? Related to Win32 ?
+
+/**
+ * \ingroup Globals
+ * \brief Pointer to a container, holding _all_ the Dicom Dictionaries.
+ */
+gdcmDictSet         *gdcmGlobal::Dicts  = (gdcmDictSet *)0;
+
+/**
+ * \ingroup Globals
+ * \brief   Pointer to a hash table containing the 'Value Representations'.
+ */
+gdcmVR              *gdcmGlobal::VR     = (gdcmVR *)0;
+
+/**
+ * \ingroup Globals
+ * \brief   Pointer to a hash table containing the Transfer Syntax codes
+ *          and their english description 
+ */
+gdcmTS              *gdcmGlobal::TS     = (gdcmTS *)0;
+
+/**
+ * \ingroup Globals
+ * \brief   Pointer to the hash table containing the Dicom Elements
+ *          necessary to describe each part of a DICOMDIR 
+ */
+gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0;
+
+/**
+ * \ingroup Globals
+ * \brief   Global container
+ */
 gdcmGlobal gdcmGlob;
 
+/**
+ * \ingroup gdcmGlobal
+ * \brief   constructor : populates the various H Tables
+ */
 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();
 }
 
+/**
+ * \ingroup gdcmGlobal
+ * \brief   canonical destructor 
+ */
 gdcmGlobal::~gdcmGlobal() {
+   delete Dicts;
    delete VR;
    delete TS;
-   delete Dicts;
+   delete ddElem;
 }
-
-gdcmVR * gdcmGlobal::GetVR(void) {
+/**
+ * \ingroup gdcmGlobal
+ * \brief   returns a pointer to the 'Value Representation Table' 
+ */
+gdcmVR *gdcmGlobal::GetVR(void) {
    return VR;
 }
-
-gdcmTS * gdcmGlobal::GetTS(void) {
+/**
+ * \ingroup gdcmGlobal
+ * \brief   returns a pointer to the 'Transfert Syntax Table' 
+ */
+gdcmTS *gdcmGlobal::GetTS(void) {
    return TS;
 }
-gdcmDictSet * gdcmGlobal::GetDicts(void) {
+/**
+ * \ingroup gdcmGlobal
+ * \brief   returns a pointer to Dictionaries Table 
+ */
+gdcmDictSet *gdcmGlobal::GetDicts(void) {
    return Dicts;
 }
+/**
+ * \ingroup gdcmGlobal
+ * \brief   returns a pointer to the DicomDir related elements Table 
+ */
+gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) {
+   return ddElem;
+}
+
+/**
+ * \defgroup Globals Utility functions
+ * \brief    Here are some utility functions, belonging to NO class,
+ *           dealing with strings, file names... that can be called
+ *           from anywhere by whomsoever they can help.
+ */
 
-///////////////////////////////////////////////////////////////////////////
-// Because is not yet available in g++2.96
+
+/**
+ * \ingroup Globals
+ * \brief   Because is not yet available in g++2.96
+ */
 std::istream& eatwhite(std::istream& is) {
    char c;
    while (is.get(c)) {
@@ -93,9 +113,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<std::string>& tokens,
                const std::string& delimiters) {
@@ -108,64 +129,103 @@ void Tokenize (const std::string& str,
    }
 }
 
-
-///////////////////////////////////////////////////////////////////////////
-// to prevent a flashing screen when non-printable character
-
-char * _cleanString(char *v) {
+/**
+ * \ingroup Globals
+ * \brief  Weed out a string from the non-printable characters (in order
+ *         to avoid corrupting the terminal of invocation when printing)
+ * @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; 
-        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
-
+/**
+ * \ingroup Globals
+ * \brief   to prevent a flashing screen when non-printable character
+ * @param s string to remove non printable characters from
+ */
 std::string _CreateCleanString(std::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;*/
-  std::string str=s;
-  for(int i=0;i<str.size();i++)
-  {
-    if(!isprint(str[i]))
-      str[i]='.';
-  }
+   std::string str=s;
 
-  return(str);
-}
+   for(int i=0;i<str.size();i++)
+   {
+      if(!isprint(str[i]))
+         str[i]='.';
+   }
 
-///////////////////////////////////////////////////////////////////////////
-//
-// because it may not be associated to a dictionary ...
-
-std::string TranslateToKey(guint16 group, guint16 element) {
-	char trash[10];
-	std::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;
+   if(str.size()>0)
+      if(!isprint(s[str.size()-1]))
+         if(s[str.size()-1]==0)
+            str[str.size()-1]=' ';
+
+   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 = "/";
+   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);
+}