Zilch.

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 7b35b952b6eb373fcfcc2944059f3cc54bb7ea97..7683ed4f91b80087a9253dd5d81d4823b3a92dcc 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -3,58 +3,34 @@
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
 
+#include "gdcmCommon.h"
 #include "gdcmVR.h"
 #include "gdcmTS.h"
 #include "gdcmDictSet.h"
-#include <iostream>
+#include "gdcmDicomDirElement.h"
 #include <vector>
 #include <string>
 
-//-----------------------------------------------------------------------------
-/*
- * 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 {
-public:
-       gdcmDebug(int  = 0);
-       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);
-
-private:
-       int DebugLevel;
-};
-
 //-----------------------------------------------------------------------------
 /*
  * This class contains all globals elements that might be
  * instanciated only one time
  */
-class gdcmGlobal {
+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 gdcmDictSet *Dicts; 
+   static gdcmDicomDirElement *ddElem;
 };
 
 //-----------------------------------------------------------------------------
@@ -64,11 +40,10 @@ void Tokenize (const std::string& str,
                std::vector<std::string>& tokens,
                const std::string& delimiters = " ");
 
-extern gdcmDebug dbg;
-
-char * _cleanString(char *v);
+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
-