X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=b2eba37b64048a9f674353ce7b4b5c67f9b7fe8f;hb=060ddb1e7fabdfc43c258dfd575df80e4023fd32;hp=b96faa3c6db55bb06bc7adedb28d5ece470891d3;hpb=39ebfe7d84122eb1ded9089ba5678fabbb901f34;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index b96faa3c..b2eba37b 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,54 +1,74 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.15 2003/09/22 08:28:43 regrain Exp $
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.h,v $
+  Language:  C++
+  Date:      $Date: 2005/01/11 15:15:38 $
+  Version:   $Revision: 1.49 $
+                                                                                
+  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"
-#include "gdcmTS.h"
-#include "gdcmDictSet.h"
 
-class gdcmDebug {
-private:
-	int DebugLevel;
-public:
-	gdcmDebug(int  = 0);
-	void Verbose(int, const char*, const char* ="");
-//	void Verbose(int, char*, 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);
-	void SetDebug (int i) {DebugLevel = i;}
-};
+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.
+ */
 
-class gdcmGlobal {
-private:
-   static gdcmVR *VR;
-   static gdcmTS *TS; 
-   static gdcmDictSet *Dicts; 
-public:
-   gdcmGlobal(void);
-   ~gdcmGlobal();
-   static gdcmVR * GetVR(void);
-   static gdcmTS * GetTS(void);
-   static gdcmDictSet * GetDicts(void);
-};
+//-----------------------------------------------------------------------------
 
-std::istream & eatwhite(std::istream & is);
+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);       
 
-void Tokenize (const std::string& str,
-               std::vector<std::string>& tokens,
-               const std::string& delimiters = " ");
+   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();
 
-extern gdcmDebug dbg;
+   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();
 
-char * _cleanString(char *v);
-std::string _CreateCleanString(std::string s);
+   static std::string GetMACAddress();
 
-std::string TranslateToKey(guint16 group, guint16 element);
+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
-