X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.h;h=3dca634d1b3b8ca6c54a2f0a79a84361447531d9;hb=e503428831ed53cbd0d206d87ac25bac3254af2b;hp=e00e8934f71e24994abad4fb2ac3d6931d974c33;hpb=05abd393cf82392c894dd1d852e2273b0648671d;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index e00e8934..3dca634d 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,38 +1,67 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.9 2003/05/21 14:42:46 frog Exp $
-
+// gdcmUtil.h
+//-----------------------------------------------------------------------------
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
+#include "gdcmVR.h"
+#include "gdcmTS.h"
+#include "gdcmDictSet.h"
+#include "gdcmDicomDirElement.h"
 #include <iostream>
 #include <vector>
 #include <string>
-#include "gdcmVR.h"
-#include "gdcmDictSet.h"
 
+//-----------------------------------------------------------------------------
+/*
+ * gdcmDebug is an object for debugging in program.
+ * It has 2 debugging modes :
+ *  - error : for bad library use
+ *  - debug : for debugging messages
+ * 
+ * A debugging message has a level of priority and is 
+ * Shown only when the debug level is higher than the 
+ * message level.
+ */
 class gdcmDebug {
-private:
-	int DebugLevel;
 public:
 	gdcmDebug(int  = 0);
-	void Verbose(int, const char*, const char* ="");
+	void SetDebug (int i) {DebugLevel = i;}
+
+   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);
-};
 
-class gdcmGlobal {
 private:
-   static gdcmVR *VR; 
-   static gdcmDictSet *Dicts; 
+	int DebugLevel;
+};
+
+//-----------------------------------------------------------------------------
+/*
+ * This class contains all globals elements that might be
+ * instanciated only one time
+ */
+class GDCM_EXPORT gdcmGlobal {
 public:
    gdcmGlobal(void);
    ~gdcmGlobal();
-   static gdcmVR * GetVR(void);
-   static gdcmDictSet * GetDicts(void);
+
+   static gdcmDictSet *GetDicts(void);
+   static gdcmVR *GetVR(void);
+   static gdcmTS *GetTS(void);
+   static gdcmDicomDirElement *GetDicomDirElements(void);
+
+private:
+   static gdcmDictSet *Dicts; 
+   static gdcmVR *VR;
+   static gdcmTS *TS; 
+   static gdcmDicomDirElement *ddElem;
 };
 
-istream & eatwhite(istream & is);
+//-----------------------------------------------------------------------------
+std::istream & eatwhite(std::istream & is);
 
 void Tokenize (const std::string& str,
                std::vector<std::string>& tokens,
@@ -40,4 +69,9 @@ void Tokenize (const std::string& str,
 
 extern gdcmDebug dbg;
 
+char *_cleanString(char *v);
+std::string _CreateCleanString(std::string s);
+
+//-----------------------------------------------------------------------------
 #endif
+