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

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 729d400e..b4907d91 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,171 +1,194 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.25 2003/10/02 11:26:16 malaterre Exp $
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/10 00:42:55 $
+  Version:   $Revision: 1.53 $
+                                                                                
+  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.html 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 <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;
-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
-std::istream& eatwhite(std::istream& is) {
-   char c;
-   while (is.get(c)) {
-      if (!isspace(c)) {
-         is.putback(c);
-         break;
-      }
-   }
-   return is;
-}
-
-///////////////////////////////////////////////////////////////////////////
-// Because is not  available in C++ (?)
-
-void Tokenize (const std::string& str,
+#include "gdcmDebug.h"
+
+
+/**
+ * \ingroup Globals
+ * \brief Provide a better 'c++' approach for sprintf
+ * For example c code is:
+ * sprintf(trash, "%04x|%04x", group , element);
+ *
+ * c++ is 
+ * std::ostringstream buf;
+ * buf << std::right << std::setw(4) << std::setfill('0') << std::hex
+ *     << group << "|" << std::right << std::setw(4) << std::setfill('0') 
+ *     << std::hex <<  element;
+ * buf.str();
+ */
+#include <stdarg.h>  //only included in implementation file
+#include <stdio.h>   //only included in implementation file
+
+std::string gdcmUtil::Format(const char* format, ...)
+{
+   char buffer[2048];
+   va_list args;
+   va_start(args, format);
+   vsprintf(buffer, format, args);  //might be a security flaw
+   return buffer;
+}
+
+
+/**
+ * \ingroup Globals
+ * \brief Because not available in C++ (?)
+ */
+void gdcmUtil::Tokenize (const std::string& str,
                std::vector<std::string>& tokens,
-               const std::string& delimiters) {
+               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) {
+   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 Because not available in C++ (?)
+ *        Counts the number of occurences of a substring within a string
+ */
+ 
+int gdcmUtil::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;
+}
+
+/**
+ * \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 gdcmUtil::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
-
-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;
+   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 gdcmUtil::NormalizePath(std::string &name)
+{
+   const char SEPARATOR_X      = '/';
+   const char SEPARATOR_WIN    = '\\';
+   const std::string SEPARATOR = "/";
+   int size = name.size();
 
-///////////////////////////////////////////////////////////////////////////
-// to prevent a flashing screen when non-printable character
-
-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]='.';
-  }
-
-  return(str);
+   if((name[size-1]!=SEPARATOR_X)&&(name[size-1]!=SEPARATOR_WIN))
+   {
+      name+=SEPARATOR;
+   }
 }
 
-///////////////////////////////////////////////////////////////////////////
-//
-// 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;
-}
+/**
+ * \ingroup Globals
+ * \brief   Get the (directory) path from a full path file name
+ * @param   fullName file/directory name to extract Path from
+ */
+std::string gdcmUtil::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 gdcmUtil::GetName(std::string &fullName)
+{   
+   int fin = fullName.length()-1;
+   char a =fullName.c_str()[fin];
+   if (a == '/' || a == '\\')
+   {
+      fin--;
+   }
+   int deb = 0;
+   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;
+}