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

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 325bde91..dcc1068c 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,41 +1,79 @@
 // gdcmUtil.h
-
+//-----------------------------------------------------------------------------
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
+#include "gdcmCommon.h"
+#include "gdcmVR.h"
+#include "gdcmTS.h"
+#include "gdcmDictSet.h"
+#include "gdcmDicomDirElement.h"
 #include <iostream>
 #include <vector>
 #include <string>
-#include "gdcmVR.h"
-using namespace std;
 
+//-----------------------------------------------------------------------------
+/*
+ * 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* ="");
+	gdcmDebug(int level = GDCM_DEBUG);
+
+	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; 
+	int DebugLevel;
+};
+
+//-----------------------------------------------------------------------------
+/*
+ * This class contains all globals elements that might be
+ * instanciated only one time
+ */
+class GDCM_EXPORT gdcmGlobal {
 public:
    gdcmGlobal(void);
-   ~gdcmGlobal(void);
-   static gdcmVR * GetVR(void);
+   ~gdcmGlobal();
+
+   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 string& str,
-               vector<string>& tokens,
-               const string& delimiters = " ");
+void Tokenize (const std::string& str,
+               std::vector<std::string>& tokens,
+               const std::string& delimiters = " ");
 
 extern gdcmDebug dbg;
 
+char *_cleanString(char *v);
+std::string _CreateCleanString(std::string s);
+
+//-----------------------------------------------------------------------------
 #endif
+