X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.cxx;h=ba0a2fa49c9915ae31dccb0620c54c8ddabdef95;hb=271eb7c302eceb58b57889462385751d4fe4271f;hp=9963df5a1e699001a949e5efcdfe76523b6b8491;hpb=0e82725d64f17545e782c18039ced7ea898f8cad;p=gdcm.git

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index 9963df5a..ba0a2fa4 100644
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -1,96 +1,141 @@
-#include <iostream>
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDebug.cxx,v $
+  Language:  C++
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmDebug.h"
+#include <iostream>
 
-/**
- * \ingroup Globals
- * \brief   Instance of debugging utility.
- */
-gdcmDebug dbg;
+namespace gdcm 
+{
+//-----------------------------------------------------------------------------
+// Warning message level to be displayed
+static bool DebugFlag     = false;
+static bool WarningFlag   = false;
+static bool DebugToFile   = false;
+static std::ofstream DebugFile;
+
+//-----------------------------------------------------------------------------
+// Constructor / Destructor
+Debug::Debug()
+{
+
+}
+
+Debug::~Debug()
+{
+  if ( DebugFile.is_open() )
+      DebugFile.close();     
+}
 
+//-----------------------------------------------------------------------------
+// Public
 /**
- * \ingroup gdcmDebug
- * \brief   constructor
- * @param level 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
  */ 
-gdcmDebug::gdcmDebug(int level) {
-   DebugLevel = level;
+void Debug::SetDebugFlag (bool flag) 
+{
+   // To help tracking a bug, both flags are necessary
+   DebugFlag   = flag;
+   WarningFlag = flag;
 }
 
 /**
- * \ingroup gdcmDebug
- * \brief   Accessor
- * @param   level Set the debug level
+ * \brief   Gets the debug flag value
+ *          (used to warn user when file contains some oddity)
+ * @return debug flag value
  */ 
-void gdcmDebug::SetDebug(int level) {
-   DebugLevel = level;
+bool Debug::GetDebugFlag ()
+{
+   return DebugFlag;
 }
 
 /**
- * \ingroup gdcmDebug
- * \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   Sets the warning flag
+ * @param   flag Set the warning flag
+ */ 
+void Debug::SetWarningFlag (bool flag) 
+{
+   // Cannot unset Warning flag if Debug flag is on.
+   if (flag == false && DebugFlag == true)
+      return;
+   WarningFlag = flag;
 }
 
 /**
- * \ingroup gdcmDebug
- * \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);
+ * \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) 
+{
+   DebugToFile = flag;
 }
 
 /**
- * \ingroup gdcmDebug
- * \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);
+ * \brief   Accessor to know whether debug info are redirected to file
+ */ 
+bool Debug::GetDebugToFile ()
+{
+   return DebugToFile;
 }
 
 /**
- * \ingroup gdcmDebug
- * \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 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)
+{
+   DebugToFile = true;  // Just in case ... 
+   DebugFlag   = true;  // Just in case ...
+   if ( DebugFile.is_open() )
+      DebugFile.close();
+   DebugFile.open( filename.c_str() );
 }
 
 /**
- * \ingroup gdcmDebug
- * \brief   Exit 
- * @param a return code 
+ * \brief Internal use only. Allow us to retrieve the static from anywhere
+ *        in gdcm code
+ * @return Debug file
  */
-void gdcmDebug::Exit(int a) {
-#ifdef __GNUC__
-   std::exit(a);
-#endif
-#ifdef _MSC_VER
-   exit(a);    // Found in #include <stdlib.h>
-#endif
+std::ofstream &Debug::GetDebugFile ()
+{
+  return DebugFile;
 }
+
+//-----------------------------------------------------------------------------
+// Protected
+
+//-----------------------------------------------------------------------------
+// Private
+   
+//-----------------------------------------------------------------------------
+// Print
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm