X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=ebb8191d56b9cba8ba022c84109a29df7af67a4b;hb=82874940805320d00eecb834bfa8643822c49e45;hp=faad02548843d592f30abff1a2bfc3bdb439a2f2;hpb=fae5f95ae8cf044c024b1793b94032c9368f0f4b;p=gdcm.git

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index faad0254..ebb8191d 100644
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,155 +1,268 @@
-// gdcmUtil.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/05 20:23:14 $
+  Version:   $Revision: 1.60 $
+                                                                                
+  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 "gdcmDebug.h"
 
-#include <stdio.h>
-#include <ctype.h>   // For isspace
-#include <string.h>
+#include <stdarg.h>  //only included in implementation file
+#include <stdio.h>   //only included in implementation file
 
-//-----------------------------------------------------------------------------
-// Library globals.
-gdcmDebug dbg;
+namespace gdcm 
+{
 
-//-----------------------------------------------------------------------------
-gdcmDebug::gdcmDebug(int level) {
-   DebugLevel = level;
-}
+/**
+ * \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();
+ */
 
-void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
-   if (Level > DebugLevel)
-      return ;
-   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
+std::string Util::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;
 }
 
-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);
+/**
+ * \ingroup Globals
+ * \brief Because not available in C++ (?)
+ */
+void Util::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)
-      std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-}
+/**
+ * \ingroup Globals
+ * \brief Because not available in C++ (?)
+ *        Counts the number of occurences of a substring within a string
+ */
+ 
+int Util::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
 
-void gdcmDebug::Exit(int a) {
-#ifdef __GNUC__
-   std::exit(a);
-#endif
-#ifdef _MSC_VER
-   exit(a);    // Found in #include <stdlib.h>
-#endif
-}
+   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
 
-//-----------------------------------------------------------------------------
-gdcmDictSet         *gdcmGlobal::Dicts  = (gdcmDictSet *)0;
-gdcmVR              *gdcmGlobal::VR     = (gdcmVR *)0;
-gdcmTS              *gdcmGlobal::TS     = (gdcmTS *)0;
-gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0;
-gdcmGlobal gdcmGlob;
-
-gdcmGlobal::gdcmGlobal(void) {
-   if (VR || TS || Dicts)
-      dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated");
-   Dicts = new gdcmDictSet();
-   VR = new gdcmVR();
-   TS = new gdcmTS();
-   ddElem = new gdcmDicomDirElement();
+   return count;
 }
 
-gdcmGlobal::~gdcmGlobal() {
-   delete Dicts;
-   delete VR;
-   delete TS;
-   delete ddElem;
-}
+/**
+ * \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 Util::CreateCleanString(std::string const & s)
+{
+   std::string str = s;
 
-gdcmVR *gdcmGlobal::GetVR(void) {
-   return VR;
-}
+   for(unsigned int i=0;i<str.size();i++)
+   {
+      if(!isprint(str[i]))
+      {
+         str[i]='.';
+      }
+   }
 
-gdcmTS *gdcmGlobal::GetTS(void) {
-   return TS;
-}
+   if(str.size()>0)
+   {
+      if(!isprint(s[str.size()-1]))
+      {
+         if(s[str.size()-1]==0)
+         {
+            str[str.size()-1]=' ';
+         }
+      }
+   }
 
-gdcmDictSet *gdcmGlobal::GetDicts(void) {
-   return Dicts;
+   return str;
 }
 
-gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) {
-   return ddElem;
-}
+/**
+ * \ingroup Globals
+ * \brief   Add a SEPARATOR to the end of the name is necessary
+ * @param name file/directory name to normalize 
+ */
+std::string Util::NormalizePath(std::string const & pathname)
+{
+   const char SEPARATOR_X      = '/';
+   const char SEPARATOR_WIN    = '\\';
+   const std::string SEPARATOR = "/";
+   std::string name = pathname;
+   int size = name.size();
 
-//-----------------------------------------------------------------------------
-// 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;
-      }
+   if( name[size-1] != SEPARATOR_X && name[size-1] != SEPARATOR_WIN )
+   {
+      name += SEPARATOR;
    }
-   return is;
+   return name;
 }
 
-///////////////////////////////////////////////////////////////////////////
-// Because is 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);
+/**
+ * \ingroup Globals
+ * \brief   Get the (directory) path from a full path file name
+ * @param   fullName file/directory name to extract Path from
+ */
+std::string Util::GetPath(std::string const & fullName)
+{
+   std::string res = fullName;
+   int pos1 = res.rfind("/");
+   int pos2 = res.rfind("\\");
+   if( pos1 > pos2)
+   {
+      res.resize(pos1);
+   }
+   else
+   {
+      res.resize(pos2);
    }
-}
-
 
-///////////////////////////////////////////////////////////////////////////
-// 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;
+   return res;
 }
 
+/**
+ * \ingroup Util
+ * \brief   Get the (last) name of a full path file name
+ * @param   fullName file/directory name to extract end name from
+ */
+std::string Util::GetName(std::string const & fullName)
+{   
+  std::string filename = fullName;
 
-///////////////////////////////////////////////////////////////////////////
-// to prevent a flashing screen when non-printable character
-std::string _CreateCleanString(std::string s) {
-   std::string str=s;
+  std::string::size_type slash_pos = filename.rfind("/");
+  std::string::size_type backslash_pos = filename.rfind("\\");
+  slash_pos = slash_pos > backslash_pos ? slash_pos : backslash_pos;
+  if(slash_pos != std::string::npos)
+    {
+    return filename.substr(slash_pos + 1);
+    }
+  else
+    {
+    return filename;
+    }
+} 
 
-   for(int i=0;i<str.size();i++)
+/**
+ * \ingroup Util
+ * \brief Create a /DICOM/ string:
+ * It should a of even lenght (no odd length ever)
+ * It can contains as many \0 as you want.
+ * This function is similar to DicomString(const char*), 
+ * except it doesn't take a lenght. 
+ * It only pad with a null character if length is odd
+ */
+std::string Util::DicomString(const char* s)
+{
+   size_t l = strlen(s);
+   if( l%2 )
    {
-      if(!isprint(str[i]))
-         str[i]='.';
+      l++;
    }
+   std::string r(s, s+l);
+   assert( !(r.size() % 2) );
+   return r;
+}
 
+/**
+ * \ingroup Util
+ * \brief Create a /DICOM/ string:
+ * It should a of even length (no odd length ever)
+ * It can contains as many \0 as you want.
+ */
+std::string Util::DicomString(const char* s, size_t l)
+{
+   std::string r(s, s+l);
+   assert( !(r.size() % 2) );
+   return r;
+}
 
-   if(str.size()>0)
-      if(!isprint(s[str.size()-1]))
-         if(s[str.size()-1]==0)
-            str[str.size()-1]=' ';
+template <class T>
+std::ostream& binary_write(std::ostream& os, const T& val)
+{
+    return os.write(reinterpret_cast<const char*>(&val), sizeof val);
+}
+
+std::ostream& binary_write(std::ostream& os, const uint16_t& val)
+{
+#ifdef GDCM_WORDS_BIGENDIAN
+    uint16_t swap;
+    swap = ((( val << 8 ) & 0x0ff00 ) | (( val >> 8 ) & 0x00ff ) );
+    return os.write(reinterpret_cast<const char*>(&swap), 2);
+#else
+    return os.write(reinterpret_cast<const char*>(&val), 2);
+#endif //GDCM_WORDS_BIGENDIAN
+}
 
-   return(str);
+std::ostream& binary_write(std::ostream& os, const uint32_t& val)
+{
+#ifdef GDCM_WORDS_BIGENDIAN
+    uint32_t swap;
+    swap = ( ((val<<24) & 0xff000000) | ((val<<8)  & 0x00ff0000) | 
+             ((val>>8)  & 0x0000ff00) | ((val>>24) & 0x000000ff) );
+    return os.write(reinterpret_cast<const char*>(&swap), 4);
+#else
+    return os.write(reinterpret_cast<const char*>(&val), 4);
+#endif //GDCM_WORDS_BIGENDIAN
 }
+
+//template <>
+std::ostream& binary_write(std::ostream& os, const char* val)
+{
+    return os.write(val, strlen(val));
+}
+
+std::ostream& binary_write(std::ostream& os, std::string const & val)
+{
+    return os.write(val.c_str(), val.size());
+}
+
+
+} // end namespace gdcm
+