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

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index ea5eb165..7683ed4f 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,54 +1,49 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.13 2003/07/01 10:04:36 frog Exp $
-
+// gdcmUtil.h
+//-----------------------------------------------------------------------------
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
-#include <iostream>
-#include <vector>
-#include <string>
+#include "gdcmCommon.h"
 #include "gdcmVR.h"
 #include "gdcmTS.h"
 #include "gdcmDictSet.h"
+#include "gdcmDicomDirElement.h"
+#include <vector>
+#include <string>
 
-class gdcmDebug {
-private:
-	int DebugLevel;
+//-----------------------------------------------------------------------------
+/*
+ * This class contains all globals elements that might be
+ * instanciated only one time
+ */
+class GDCM_EXPORT gdcmGlobal {
 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;}
-};
+   gdcmGlobal(void);
+   ~gdcmGlobal();
+
+   static gdcmDictSet *GetDicts(void);
+   static gdcmVR *GetVR(void);
+   static gdcmTS *GetTS(void);
+   static gdcmDicomDirElement *GetDicomDirElements(void);
 
-class gdcmGlobal {
 private:
+   static gdcmDictSet *Dicts; 
    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);
+   static gdcmDicomDirElement *ddElem;
 };
 
+//-----------------------------------------------------------------------------
 std::istream & eatwhite(std::istream & is);
 
 void Tokenize (const std::string& str,
                std::vector<std::string>& tokens,
                const std::string& delimiters = " ");
 
-extern gdcmDebug dbg;
-
-char * _cleanString(char *v);
-char * _CreateCleanString(std::string s);
-
-std::string TranslateToKey(guint16 group, guint16 element);
+char *_cleanString(char *v);
+std::string _CreateCleanString(std::string s);
 
+void NormalizePath (std::string &name);
+std::string GetPath(std::string &fullName);
+std::string GetName(std::string &fullName);
 #endif
-