X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.cxx;h=ba0a2fa49c9915ae31dccb0620c54c8ddabdef95;hb=0e030c69b4fec60eaf0c92a6c1701a3e8de5e794;hp=2891b21cb6e358abdcc151f868420c160404a39a;hpb=c92079b4881cba2560589210d4baeed9dd4d9cac;p=gdcm.git

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index 2891b21c..ba0a2fa4 100644
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/31 14:24:47 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2005/11/05 13:21:32 $
+  Version:   $Revision: 1.26 $
                                                                                 
   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
@@ -16,115 +16,126 @@
                                                                                 
 =========================================================================*/
 
-#include <iostream>
 #include "gdcmDebug.h"
+#include <iostream>
 
+namespace gdcm 
+{
 //-----------------------------------------------------------------------------
-gdcmDebug gdcmDebug::debug;
+// Warning message level to be displayed
+static bool DebugFlag     = false;
+static bool WarningFlag   = false;
+static bool DebugToFile   = false;
+static std::ofstream DebugFile;
 
 //-----------------------------------------------------------------------------
-/**
- * \brief   constructor
- * @param level debug level
- */ 
-gdcmDebug::gdcmDebug(int level) 
+// Constructor / Destructor
+Debug::Debug()
+{
+
+}
+
+Debug::~Debug()
 {
-   DebugLevel = level;
+  if ( DebugFile.is_open() )
+      DebugFile.close();     
 }
 
+//-----------------------------------------------------------------------------
+// Public
 /**
- * \brief   Accessor
- * @param   level Set the debug level
+ * \brief   Sets both the debug flag and warning flag
+ *          (both used for debugging purpose)
+ * @param   flag Set the debug flag and warning flag
  */ 
-void gdcmDebug::SetDebug(int level) 
+void Debug::SetDebugFlag (bool flag) 
 {
-   DebugLevel = level;
+   // To help tracking a bug, both flags are necessary
+   DebugFlag   = flag;
+   WarningFlag = flag;
 }
 
 /**
- * \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) 
+ * \brief   Gets the debug flag value
+ *          (used to warn user when file contains some oddity)
+ * @return debug flag value
+ */ 
+bool Debug::GetDebugFlag ()
 {
-   if (level > DebugLevel)
-   {
-      return ;
-   }
-   std::cerr << msg1 << ' ' << msg2 << std::endl;
+   return DebugFlag;
 }
 
 /**
- * \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) 
+ * \brief   Sets the warning flag
+ * @param   flag Set the warning flag
+ */ 
+void Debug::SetWarningFlag (bool flag) 
 {
-   if (!test)
-   {
+   // Cannot unset Warning flag if Debug flag is on.
+   if (flag == false && DebugFlag == true)
       return;
-   }
-   std::cerr << msg1 << ' ' << msg2 << std::endl;
-   Exit(1);
+   WarningFlag = flag;
 }
 
 /**
- * \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) 
+ * \brief   Gets the warning flag value
+ * @return warning flag value
+ */ 
+bool Debug::GetWarningFlag ()
+{
+   return WarningFlag;
+}
+/**
+ * \brief   Accessor
+ * @param   flag whether we want to redirect to file
+ */ 
+void Debug::SetDebugToFile (bool flag) 
 {
-   std::cerr << msg1 << ' ' << msg2 << ' ' << msg3 << std::endl;
-   Exit(1);
+   DebugToFile = flag;
 }
 
 /**
- * \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) 
+ * \brief   Accessor to know whether debug info are redirected to file
+ */ 
+bool Debug::GetDebugToFile ()
 {
-   if (level > DebugLevel)
-   {
-      return ;
-   }
-   if (!test)
-   {
-      std::cerr << msg1 << ' ' << msg2 << std::endl;
-   }
+   return DebugToFile;
 }
 
 /**
- * \brief   Exit 
- * @param a return code 
- */
-void gdcmDebug::Exit(int a) 
+ * \brief Set the filename the debug stream should be redirect to
+ *        Settting a filename also sets DebugToFile to true
+ * @param   filename  File to redirect debug info
+ *          Absolutely nothing is check. You have to pass in
+ *          a correct filename
+ */ 
+void Debug::SetDebugFilename (std::string const &filename)
 {
-#ifdef __GNUC__
-   std::exit(a);
-#endif
-#ifdef _MSC_VER
-   exit(a);    // Found in #include <stdlib.h>
-#endif
+   DebugToFile = true;  // Just in case ... 
+   DebugFlag   = true;  // Just in case ...
+   if ( DebugFile.is_open() )
+      DebugFile.close();
+   DebugFile.open( filename.c_str() );
 }
 
 /**
- * \brief  Get the debug instance 
- * \return Reference to the debug instance
+ * \brief Internal use only. Allow us to retrieve the static from anywhere
+ *        in gdcm code
+ * @return Debug file
  */
-gdcmDebug &gdcmDebug::GetReference()
+std::ofstream &Debug::GetDebugFile ()
 {
-   return gdcmDebug::debug;
+  return DebugFile;
 }
 
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+   
+//-----------------------------------------------------------------------------
+// Print
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm