X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.h;h=bf8970157e28d472376924b80cf2adf3d5515d03;hb=a0091d68a2eaa1a0c128f962030bb6c45cc0c366;hp=ea5eb165654ce61f01c8fd38020a7010276c545e;hpb=7589d23967892c94462e22a49ec50fcd225c5c38;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index ea5eb165..bf897015 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,54 +1,71 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.13 2003/07/01 10:04:36 frog Exp $
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmUtil.h,v $
+  Language:  C++
+  Date:      $Date: 2004/11/16 02:54:35 $
+  Version:   $Revision: 1.44 $
+                                                                                
+  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 
+{
+/**
+ * \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.
+ */
 
-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);
-
-void Tokenize (const std::string& str,
-               std::vector<std::string>& tokens,
-               const std::string& delimiters = " ");
+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);       
 
-extern gdcmDebug dbg;
+   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();
 
-char * _cleanString(char *v);
-char * _CreateCleanString(std::string s);
+   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);
 
-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
-