X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.h;h=dcc1068c516012b043028c48615f04f12eedd63f;hb=9232388f3d3f9defdc6a8ac291a79b9a97b79dcf;hp=2e4696258e524baddc8fd267ea68a42a12279ad5;hpb=15d7b1b38f5ddb59d395e0e4e3f9b0250eb90eec;p=gdcm.git

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 2e469625..dcc1068c 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,15 +1,18 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.17 2004/01/12 13:12:28 regrain Exp $
-
+// 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>
 
+//-----------------------------------------------------------------------------
 /*
  * gdcmDebug is an object for debugging in program.
  * It has 2 debugging modes :
@@ -21,35 +24,45 @@
  * 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);
-	void SetDebug (int i) {DebugLevel = i;}
+
+private:
+	int DebugLevel;
 };
 
+//-----------------------------------------------------------------------------
 /*
  * This class contains all globals elements that might be
  * instanciated only one time
  */
-class gdcmGlobal {
-private:
-   static gdcmVR *VR;
-   static gdcmTS *TS; 
-   static gdcmDictSet *Dicts; 
+class GDCM_EXPORT gdcmGlobal {
 public:
    gdcmGlobal(void);
    ~gdcmGlobal();
-   static gdcmVR * GetVR(void);
-   static gdcmTS * GetTS(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;
 };
 
+//-----------------------------------------------------------------------------
 std::istream & eatwhite(std::istream & is);
 
 void Tokenize (const std::string& str,
@@ -58,10 +71,9 @@ void Tokenize (const std::string& str,
 
 extern gdcmDebug dbg;
 
-char * _cleanString(char *v);
+char *_cleanString(char *v);
 std::string _CreateCleanString(std::string s);
 
-std::string TranslateToKey(guint16 group, guint16 element);
-
+//-----------------------------------------------------------------------------
 #endif