* src/gdcmFile.h : bug fix. Variable type and variable name had same name

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 3e8056ca2378078643983e99490dfb4ae10d5c84..6893f4d231cc7a121eade443f7d7c83538ee925e 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2004/10/08 04:43:38 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2004/11/16 05:03:35 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -23,24 +23,49 @@
 #include <vector>
 #include <string>
 
-
+namespace gdcm 
+{
 /**
  * \defgroup Globals Utility functions
- * \brief    Here are some utility functions, belonging to NO class,
+ * \brief    Here are some utility functions, belonging to the Util class,
  *           dealing with strings, file names... that can be called
  *           from anywhere by whomsoever they can help.
  */
 
 //-----------------------------------------------------------------------------
-GDCM_EXPORT void Tokenize (const std::string& str,
-                          std::vector<std::string>& tokens,
-                          const std::string& delimiters = " ");
-GDCM_EXPORT int  CountSubstring (const std::string& str,
-                                 const std::string& subStr);       
-
-GDCM_EXPORT std::string CreateCleanString(std::string s);
-GDCM_EXPORT void        NormalizePath(std::string &name);
-GDCM_EXPORT std::string GetPath(std::string &fullName);
-GDCM_EXPORT std::string GetName(std::string &fullName);
+
+class GDCM_EXPORT Util
+{
+public:
+   static std::string Format(const char* format, ...);
+   static void        Tokenize (const std::string& str,
+                                std::vector<std::string>& tokens,
+                                const std::string& delimiters = " ");
+   static int         CountSubstring (const std::string& str,
+                                      const std::string& subStr);       
+
+   static std::string CreateCleanString(std::string const & s);
+   static std::string NormalizePath(std::string const & name);
+   static std::string GetPath(std::string const &fullName);
+   static std::string GetName(std::string const &fullName);
+   static std::string GetCurrentDate();
+   static std::string GetCurrentTime();
+
+   static std::string DicomString(const char* s, size_t l);
+   static std::string DicomString(const char* s);
+   static bool        DicomStringEqual(const std::string& s1, const char *s2);
+   static std::string CreateUniqueUID(const std::string& root = "");
+
+private:
+   static std::string GetIPAddress(); //Do not expose this method
+};
+
+   template <class T> 
+   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, const T& val);
+   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, const uint16_t& val);
+   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, const uint32_t& val);
+   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, const char* val);
+   GDCM_EXPORT std::ostream& binary_write(std::ostream& os, std::string const & val);
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif