X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=f6de2c7dbc3198101ad870bda391340c84950872;hb=25c9af365d9221bd45f3fbe27275ff0f66a265b1;hp=325bde910b5bdf53f33cb03e3b8ce960b633d05c;hpb=541ed5b2824ff14630565a474b1406e58b677662;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 325bde91..f6de2c7d 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,41 +1,82 @@
-// gdcmUtil.h
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.h,v $
+  Language:  C++
+  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
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
-#include <iostream>
+#include "gdcmCommon.h"
 #include <vector>
 #include <string>
-#include "gdcmVR.h"
-using namespace std;
 
-class gdcmDebug {
-private:
-	int DebugLevel;
-public:
-	gdcmDebug(int  = 0);
-	void Verbose(int, const char*, const char* ="");
-	void Error(bool, const char*,  const char* ="");
-	void Error(const char*, const char* ="", const char* ="");
-	void Assert(int, bool, const char*, const char*);
-	void Exit(int);
-};
+namespace gdcm 
+{
+/**
+ * \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.
+ */
 
-class gdcmGlobal {
-private:
-   static gdcmVR *VR; 
+//-----------------------------------------------------------------------------
+
+class GDCM_EXPORT Util
+{
 public:
-   gdcmGlobal(void);
-   ~gdcmGlobal(void);
-   static gdcmVR * GetVR(void);
-};
+   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);       
 
-istream & eatwhite(istream & is);
+   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();
 
-void Tokenize (const string& str,
-               vector<string>& tokens,
-               const string& delimiters = " ");
+   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);
 
-extern gdcmDebug dbg;
+   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);
+} // end namespace gdcm
+//-----------------------------------------------------------------------------
 #endif