BUG: There was some duplicated code I didnt see. This fix D.Clunie problem I was...

[gdcm.git] / src / gdcmDebug.cxx

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index 6868b8a4598104d6022ce2219635fc0b6b272e7a..f5ffc7df456271af0a18a9bf08fadc5dea305f87 100644 (file)
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/20 18:08:47 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2005/01/10 17:17:52 $
+  Version:   $Revision: 1.16 $
                                                                                 
   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
@@ -19,89 +19,30 @@
 #include <iostream>
 #include "gdcmDebug.h"
 
-/**
- * \ingroup Globals
- * \brief   Instance of debugging utility.
- */
-gdcmDebug dbg;
+namespace gdcm 
+{
 
+/// warning message level to be displayed
+static int DebugFlag = 0;
+//-----------------------------------------------------------------------------
 /**
- * \brief   constructor
- * @param level debug level
+ * \brief   Accessor
+ * @param   flag Set the debug flag
  */ 
-gdcmDebug::gdcmDebug(int level) {
-   DebugLevel = level;
+void Debug::SetDebugFlag (int flag) 
+{
+   DebugFlag = flag;
 }
 
 /**
  * \brief   Accessor
- * @param   level Set the debug level
+ * @param   level Get the debug flag
  */ 
-void gdcmDebug::SetDebug(int level) {
-   DebugLevel = level;
-}
-
-/**
- * \brief   Verbose 
- * @param Level level
- * @param Msg1 first message part
- * @param Msg2 second message part 
- */
-void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
-   if (Level > DebugLevel)
-      return ;
-   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-}
-
-/**
- * \brief   Error 
- * @param Test test
- * @param Msg1 first message part
- * @param Msg2 second message part 
- */
-void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
-   if (!Test)
-      return;
-   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-   Exit(1);
+int Debug::GetDebugFlag ()
+{
+   return DebugFlag;
 }
 
-/**
- * \brief   Error 
- * @param Msg1 first message part
- * @param Msg2 second message part
- * @param Msg3 Third message part  
- */
-void gdcmDebug::Error(const char* Msg1, const char* Msg2,
-                      const char* Msg3) {
-   std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl;
-   Exit(1);
-}
+} // end namespace gdcm
 
-/**
- * \brief   Assert 
- * @param Level level 
- * @param Test test
- * @param Msg1 first message part
- * @param Msg2 second message part
- */
- void gdcmDebug::Assert(int Level, bool Test,
-                 const char * Msg1, const char * Msg2) {
-   if (Level > DebugLevel)
-      return ;
-   if (!Test)
-      std::cerr << Msg1 << ' ' << Msg2 << std::endl;
-}
 
-/**
- * \brief   Exit 
- * @param a return code 
- */
-void gdcmDebug::Exit(int a) {
-#ifdef __GNUC__
-   std::exit(a);
-#endif
-#ifdef _MSC_VER
-   exit(a);    // Found in #include <stdlib.h>
-#endif
-}