X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=592f8b025a90b777e45a644fc127b59e3ed746b1;hb=fa8fa610de8d935491343df2d8a543ff6fdb6e69;hp=e4490b624db2866613ed47541471fb8629abd30a;hpb=327dfe7647e3720b0f3125f9b19397cb9afc0ed3;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index e4490b62..592f8b02 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 20:03:28 $
-  Version:   $Revision: 1.48 $
+  Date:      $Date: 2005/08/25 14:55:47 $
+  Version:   $Revision: 1.62 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -26,8 +26,7 @@
 namespace gdcm 
 {
 /**
- * \defgroup Globals Utility functions
- * \brief    Here are some utility functions, belonging to the Util class,
+ * \brief    Here are some utility functions, belonging to the gdcm::Util class,
  *           dealing with strings, file names... that can be called
  *           from anywhere by whomsoever they can help.
  */
@@ -45,30 +44,54 @@ public:
                                       const std::string &subStr);       
 
    static std::string CreateCleanString(std::string const &s);
+   static std::string CreateCleanString(uint8_t *s, int l);
+   static bool IsCleanString(std::string const &s);
+   static bool IsCleanArea(uint8_t *s, int l);
    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();
+   /// Provides a simple static GetVersion() function
+   static std::string GetVersion() 
+                      { return GDCM_VERSION;}
+   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 bool        CompareDicomString(const std::string &s1, 
+                                         const char *s2, int op);
+   static std::string GetMACAddress();
+
    static std::string CreateUniqueUID(const std::string &root = "");
-   static bool        IsCurrentProcessorBigEndian();
+   static void SetRootUID(const std::string &root = "");
+   static const std::string &GetRootUID();
 
-   static std::string GetMACAddress();
+   static const uint8_t *GetFileMetaInformationVersion() 
+                     { return FileMetaInformationVersion;}
+   static void SetFileMetaInformationVersion( uint16_t fmiv )
+                     { FileMetaInformationVersion = (uint8_t *)&fmiv; }
 
 private:
    static std::string GetIPAddress(); //Do not expose this method
+
+   static std::string RootUID;
+   static const std::string GDCM_UID;
+   static uint8_t *FileMetaInformationVersion;
+   static const uint16_t FMIV;
+   static std::string GDCM_MAC_ADRESS;
 };
 
-   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);
+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);
+GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const uint8_t *val, size_t len);
+GDCM_EXPORT std::ostream &binary_write(std::ostream &os, const uint16_t *val, size_t len);
 } // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif