X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.h;h=0ea4fd7323f4ee1be6289144e00b56fc6c82b297;hb=fcaf25002e2d8ebf82bc5bd07dfb14aa7af05b2c;hp=a689936f29dbd1432b491ac4cf8a03efd22d7921;hpb=8a640d0e343dc47346cc7a72cd76582b9b429610;p=gdcm.git

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index a689936f..0ea4fd73 100644
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2004/07/19 11:51:26 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2005/01/07 16:39:59 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -21,14 +21,13 @@
 
 #include "gdcmCommon.h"
 
-//-----------------------------------------------------------------------------
-#define dbg gdcmDebug::GetReference()
-
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
 
 /**
- * \ingroup gdcmDebug
- * \brief gdcmDebug is an object for debugging in program.
+ * \ingroup Debug
+ * \brief Debug is an object for debugging in program.
  * It has 2 debugging modes :
  *  - error : for bad library use
  *  - debug : for debugging messages
@@ -37,26 +36,22 @@
  * Shown only when the debug level is higher than the 
  * message level.
  */
-class GDCM_EXPORT gdcmDebug {
+class GDCM_EXPORT Debug
+{
 public:
-   gdcmDebug(int level = -1);
-
-   void SetDebug (int level);
-   void Verbose(int, const char*, const char* ="");
-   void Error(bool, const char*,  const char* ="");
-   void Error(const char*, const char* ="", const char* ="");
+   /// This is a global flag that controls whether any debug, warning
+   /// messages are displayed.
+   static void SetDebugLevel (int level);
+   static int  GetDebugLevel ();
 
-   void Assert(int, bool, const char*, const char*);
-   void Exit(int);
+   static void Verbose(int level, const char *msg1, const char *msg2 = "") ;
+   static void Error  (bool test, const char *msg1, const char *msg2 = "");
+   static void Error  (const char *msg1, const char *msg2 = "", const char *msg3 = "");
 
-   static gdcmDebug &GetReference();
-
-private:
-/// warning message level to be displayed
-   int DebugLevel;
-
-/// Instance of debugging utility.
-   static gdcmDebug debug;
+   static void Assert(int level, bool test, const char *msg1, const char *msg2);
+   static void Exit  (int a);
 };
 
+} // end namespace gdcm
+
 #endif