X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=6893f4d231cc7a121eade443f7d7c83538ee925e;hb=3ba8c03aa6cb08add6599a1ec7b2b693a967db62;hp=3ec7b666d11ff4dbba58c53fd82fca55e97f1305;hpb=1d69b92978803204089d270599133917d944c651;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 3ec7b666..6893f4d2 100644
--- 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/12 04:35:48 $
-  Version:   $Revision: 1.36 $
+  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
@@ -27,7 +27,7 @@ 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.
  */
@@ -39,16 +39,33 @@ 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 = " ");
+                                std::vector<std::string>& tokens,
+                                const std::string& delimiters = " ");
    static int         CountSubstring (const std::string& str,
-                               const std::string& subStr);       
+                                      const std::string& subStr);       
 
-   static std::string CreateCleanString(std::string s);
-   static void        NormalizePath(std::string &name);
-   static std::string GetPath(std::string &fullName);
-   static std::string GetName(std::string &fullName);
+   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