X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=cabc9675112250c470f7a2decc523f3c7080b7fc;hb=2012716d624d631dcdb825fdd4470908e115a717;hp=78bcff738034e44448562b9ef22a2a1a154849bb;hpb=8e657a0766489604ade10a101d0d8995bcb79280;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 78bcff73..cabc9675 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,57 +1,138 @@
-#include <ctype.h>   // For isspace
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/06/20 18:08:48 $
+  Version:   $Revision: 1.44 $
+                                                                                
+  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>  // CLEANME: could this be only string ? Related to Win32 ?
+#include <iostream>
 
-gdcmDebug::gdcmDebug(int level) {
-	DebugLevel = level;
+/**
+ * \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)) {
+         is.putback(c);
+         break;
+      }
+   }
+   return is;
 }
 
-void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
-	if (Level > DebugLevel)
-		return ;
-	cerr << Msg1 << ' ' << Msg2 << '\n';
+/**
+ * \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);
+   }
 }
 
-void gdcmDebug::Assert(int Level, bool Test,
-                 const char * Msg1, const char * Msg2) {
-	if (Level > DebugLevel)
-		return ;
-	if (!Test)
-		cerr << Msg1 << ' ' << Msg2 << '\n';
-}
+/**
+ * \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;
 
-void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
-	if (!Test)
-		return;
-	std::cerr << Msg1 << ' ' << Msg2 << '\n';
-	Exit(1);
-}
+   for(unsigned int i=0;i<str.size();i++)
+   {
+      if(!isprint(str[i]))
+         str[i]='.';
+   }
 
-void gdcmDebug::Error(const char* Msg1, const char* Msg2,
-                      const char* Msg3) {
-	std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << '\n';
-	Exit(1);
+   if(str.size()>0)
+      if(!isprint(s[str.size()-1]))
+         if(s[str.size()-1]==0)
+            str[str.size()-1]=' ';
+
+   return(str);
 }
 
-void gdcmDebug::Exit(int a) {
-#ifdef __GNUC__
-	std::exit(a);
-#endif
-#ifdef _MSC_VER
-	exit(a);    // Found in #include <stdlib.h>
-#endif
+/**
+ * \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;
+   }
 }
 
-gdcmDebug dbg;
-
-// Because is not yet available in g++2.06
-istream& eatwhite(istream& is) {
-	char c;
-	while (is.get(c)) {
-		if (!isspace(c)) {
-			is.putback(c);
-			break;
-		}
-	}
-	return is;
+/**
+ * \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);
+}