X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=f6de2c7dbc3198101ad870bda391340c84950872;hb=4ab107a1742293840034b7d7f2b8691dcc91db87;hp=4d44df6023d42bd5ba3b0b1c6cfa114778c44a19;hpb=3306c0c4d4513e73e1ca1ab60922ca02dc86a870;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 4d44df60..f6de2c7d 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmUtil.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/06 19:10:07 $
-  Version:   $Revision: 1.47 $
+  Date:      $Date: 2005/02/02 15:07:41 $
+  Version:   $Revision: 1.53 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,7 +26,6 @@
 namespace gdcm 
 {
 /**
- * \defgroup Globals Utility functions
  * \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.
@@ -37,38 +36,47 @@ namespace gdcm
 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 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 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 GetCurrentDateTime();
+   static unsigned int GetCurrentThreadID();
+   static unsigned int GetCurrentProcessID();
+   static bool         IsCurrentProcessorBigEndian();
 
-   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 = "");
-   static bool        IsCurrentProcessorBigEndian();
+   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 GetMACAddress();
 
+   static std::string CreateUniqueUID(const std::string &root = "");
+   static void SetRootUID(const std::string &root = "");
+   static const std::string &GetRootUID();
+
 private:
    static std::string GetIPAddress(); //Do not expose this method
+
+   static std::string RootUID;
+   static const std::string GDCM_UID;
 };
 
-   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);
+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