X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.cxx;h=224c9d5d84df101fb044e01bb41a54569d4bbf02;hb=e55fdb123dd302ba87d35cef044e9aab3477aa2f;hp=95e9a07781b0aaed6c26de3cd6b48f12eec5a8e0;hpb=cd6b936f711fcbc70918e6b623b4b7b2f65dc69c;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 95e9a077..224c9d5d 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/08/22 15:38:05 $
-  Version:   $Revision: 1.158 $
+  Date:      $Date: 2005/08/31 16:24:19 $
+  Version:   $Revision: 1.162 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -179,10 +179,46 @@ int Util::CountSubstring (const std::string &str,
    return count;
 }
 
+/**
+ * \brief  Checks whether a 'string' is printable or not (in order
+ *         to avoid corrupting the terminal of invocation when printing)
+ * @param s string to check
+ */
+bool Util::IsCleanString(std::string const &s)
+{
+  std::cout<< std::endl << s << std::endl;
+   for(unsigned int i=0; i<s.size(); i++)
+   {
+      std::cout<< std::endl << i << " : " << (unsigned char)s[i] << std::endl;
+      if (!isprint((unsigned char)s[i]) )
+      {
+         return false;
+      }
+   }
+return true;   
+}
+
+/**
+ * \brief  Checks whether an 'area' is printable or not (in order
+ *         to avoid corrupting the terminal of invocation when printing)
+ * @param s area to check (uint8_t is just for prototyping. feel free to cast)
+ * @param l area length to check
+ */
+bool Util::IsCleanArea(uint8_t *s, int l)
+{
+   for( int i=0; i<l; i++)
+   {
+      if (!isprint((unsigned char)s[i]) )
+      {
+         return false;
+      }
+   }
+   return true;   
+}
 /**
  * \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
+ * @param s string to check (uint8_t is just for prototyping. feel free to cast)
  */
 std::string Util::CreateCleanString(std::string const &s)
 {
@@ -210,6 +246,31 @@ std::string Util::CreateCleanString(std::string const &s)
    return str;
 }
 
+/**
+ * \brief  Weed out a string from the non-printable characters (in order
+ *         to avoid corrupting the terminal of invocation when printing)
+ * @param s area to process (uint8_t is just for prototyping. feel free to cast)
+ * @param l area length to check
+ */
+std::string Util::CreateCleanString(uint8_t *s, int l)
+{
+   std::string str;
+
+   for( int i=0; i<l; i++)
+   {
+      if (!isprint((unsigned char)s[i]) )
+      {
+         str = str + '.';
+      }
+   else
+      {
+         str = str + (char )s[i];
+      }
+   }
+
+
+   return str;
+}
 /**
  * \brief   Add a SEPARATOR to the end of the name is necessary
  * @param   pathname file/directory name to normalize 
@@ -331,14 +392,6 @@ std::string Util::GetCurrentDateTime()
    return tmpAll;
 }
 
-/* 
- * \brief Provide a simple static GetVersion() function
- */
-std::string Util::GetVersion()
-{
-  return GDCM_VERSION;
-}
-
 unsigned int Util::GetCurrentThreadID()
 {
 // FIXME the implementation is far from complete