X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=8e7ac623f5b8980813291665d1c97588f7e6d349;hb=b3a89cd11ea30d76fac69e83e1047d7e833d2ff4;hp=b2eba37b64048a9f674353ce7b4b5c67f9b7fe8f;hpb=ac0c6624e5206f25f5adc7deb53f937e00e6e264;p=gdcm.git diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h index b2eba37b..8e7ac623 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/11 15:15:38 $ - Version: $Revision: 1.49 $ + Date: $Date: 2005/02/11 20:04:08 $ + Version: $Revision: 1.55 $ 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 { /** - * \ingroup 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. @@ -50,25 +49,34 @@ public: 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 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 - 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