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

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index cb9dcbd3..7683ed4f 100644
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,44 +1,49 @@
 // 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"
-using namespace std;
+#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 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);
-};
+   gdcmGlobal(void);
+   ~gdcmGlobal();
+
+   static gdcmDictSet *GetDicts(void);
+   static gdcmVR *GetVR(void);
+   static gdcmTS *GetTS(void);
+   static gdcmDicomDirElement *GetDicomDirElements(void);
 
-class gdcmGlobal {
 private:
-   static gdcmVR *VR; 
    static gdcmDictSet *Dicts; 
-public:
-   gdcmGlobal(void);
-   ~gdcmGlobal();
-   static gdcmVR * GetVR(void);
-   static gdcmDictSet * GetDicts(void);
+   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);
 
+void NormalizePath (std::string &name);
+std::string GetPath(std::string &fullName);
+std::string GetName(std::string &fullName);
 #endif