X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=ec96d5321b2941bf1cdcbc611d448212c812464b;hb=e62d57cbd05c8e864fd2ba197a271cdcac9a2128;hp=0760f383b929f3daf3ffcdc140a614310baf572a;hpb=1a11accd11061d63d3c09db7b1445637207e81e4;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 0760f383..ec96d532 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,157 +1,32 @@
-// gdcmUtil.cxx
-//-----------------------------------------------------------------------------
-#include "gdcmUtil.h"
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/09/07 14:11:57 $
+  Version:   $Revision: 1.49 $
+                                                                                
+  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>
-
-//-----------------------------------------------------------------------------
-// Library globals.
-gdcmDebug dbg;
-
-//-----------------------------------------------------------------------------
-/**
- * \ingroup gdcmDebug
- * \brief   constructor
- * @param level debug level
- */ 
-
-gdcmDebug::gdcmDebug(int level) {
-   DebugLevel = level;
-}
-
-/**
- * \ingroup gdcmDebug
- * \brief   Verbose 
- * @param Level level
- * @param Msg1 first message part
- * @param Msg2 second message part 
- */
-void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
-   if (Level > DebugLevel)
-      return ;
-   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-}
-
-/**
- * \ingroup gdcmDebug
- * \brief   Error 
- * @param Test test
- * @param Msg1 first message part
- * @param Msg2 second message part 
- */
-void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
-   if (!Test)
-      return;
-   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-   Exit(1);
-}
-
-/**
- * \ingroup gdcmDebug
- * \brief   Error 
- * @param Msg1 first message part
- * @param Msg2 second message part
- * @param Msg3 Third message part  
- */
-void gdcmDebug::Error(const char* Msg1, const char* Msg2,
-                      const char* Msg3) {
-   std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl;
-   Exit(1);
-}
-
-/**
- * \ingroup gdcmDebug
- * \brief   Assert 
- * @param Level level 
- * @param Test test
- * @param Msg1 first message part
- * @param Msg2 second message part
- */
- 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;
-}
+#include <string.h>  // CLEANME: could this be only string ? Related to Win32 ?
+#include <iostream>
 
 /**
- * \ingroup gdcmDebug
- * \brief   Exit 
- * @param a return code 
+ * \ingroup Globals
+ * \brief   Because is not yet available in g++2.96
  */
-void gdcmDebug::Exit(int a) {
-#ifdef __GNUC__
-   std::exit(a);
-#endif
-#ifdef _MSC_VER
-   exit(a);    // Found in #include <stdlib.h>
-#endif
-}
-
-//-----------------------------------------------------------------------------
-/// Pointer to a container, holding *all* the Dicom Dictionaries
-gdcmDictSet         *gdcmGlobal::Dicts  = (gdcmDictSet *)0;
-/// Pointer to a H table containing the 'Value Representations'
-gdcmVR              *gdcmGlobal::VR     = (gdcmVR *)0;
-/// Pointer to a H table containing the Transfer Syntax codes and their english description 
-gdcmTS              *gdcmGlobal::TS     = (gdcmTS *)0;
-/// Pointer to a H table containing the Dicom Elements necessary to describe each part of a DICOMDIR 
-gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0;
-/// gdcm Glob
-gdcmGlobal gdcmGlob;
-
-
-/**
- * \ingroup gdcmGlobal
- * \brief   constructor : populates the
- */
-gdcmGlobal::gdcmGlobal(void) {
-   if (VR || TS || Dicts || ddElem)
-      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
-   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 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;
-}
-
-//-----------------------------------------------------------------------------
-// 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;
    while (is.get(c)) {
@@ -163,8 +38,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) {
@@ -177,85 +54,94 @@ void Tokenize (const std::string& str,
    }
 }
 
-
-///////////////////////////////////////////////////////////////////////////
 /**
- * \brief  to prevent a flashing screen when non-printable character
- * @param v characters array to remove non printable characters from
+ * \ingroup Globals
+ * \brief Because not available in C++ (?)
+ *        Counts the number of occurences of a substring within a string
  */
-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;
+ 
+ int CountSubstring (const std::string& str,
+                     const std::string& subStr) {
+   int count = 0;   // counts how many times it appears
+   unsigned int x = 0;       // The index position in the string
+
+   do
+    { x = str.find(subStr,x);       // Find the substring
+      if (x != std::string::npos)   // If present
+        { count++;                  // increase the count
+          x += subStr.length();     // Skip this word
+        }
+    }
+   while (x != std::string::npos);  // Carry on until not present
+
+   return count;
 }
 
-///////////////////////////////////////////////////////////////////////////
 /**
- * \brief   to prevent a flashing screen when non-printable character
+ * \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 CreateCleanString(std::string s) {
    std::string str=s;
 
-   for(int i=0;i<str.size();i++)
+   for(unsigned 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);
+   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 = "/";
+   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
+ * @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)
+   int pos1 = fullName.rfind("/");
+   int pos2 = fullName.rfind("\\");
+   if( pos1 > pos2)
+   {
       fullName.resize(pos1);
+   }
    else
+   {
       fullName.resize(pos2);
-   return(fullName);
+   }
+   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
+ * @param   fullName file/directory name to extract end name from
  */
 std::string GetName(std::string &fullName)
 {   
@@ -264,7 +150,7 @@ std::string GetName(std::string &fullName)
   if (a == '/' || a == '\\') {
      fin--;
   }
-  int deb;
+  int deb = 0;
   for (int i=fin;i!=0;i--) {
      if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\')  
         break;
@@ -275,5 +161,5 @@ std::string GetName(std::string &fullName)
   for (int j=deb;j<fin+1;j++)
     lastName=lastName+fullName.c_str()[j];
 
-  return(lastName);
+  return lastName;
 }