ENH: Adding the Debug redirection to a file stream instead of cerr. I guess is useful...

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index f5ffc7df456271af0a18a9bf08fadc5dea305f87..82c4ee96a91e1fbb45b22ed59bc42e5092fcef4c 100644 (file)
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/10 17:17:52 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2005/01/13 22:30:11 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,20 +16,22 @@
                                                                                 
 =========================================================================*/
 
-#include <iostream>
 #include "gdcmDebug.h"
+#include <iostream>
 
 namespace gdcm 
 {
 
 /// warning message level to be displayed
-static int DebugFlag = 0;
+static bool DebugFlag = false;
+static bool DebugToFile = false;
+static std::ofstream DebugFile;
 //-----------------------------------------------------------------------------
 /**
  * \brief   Accessor
  * @param   flag Set the debug flag
  */ 
-void Debug::SetDebugFlag (int flag) 
+void Debug::SetDebugFlag (bool flag) 
 {
    DebugFlag = flag;
 }
@@ -38,11 +40,47 @@ void Debug::SetDebugFlag (int flag)
  * \brief   Accessor
  * @param   level Get the debug flag
  */ 
-int Debug::GetDebugFlag ()
+bool Debug::GetDebugFlag ()
 {
    return DebugFlag;
 }
 
+/**
+ * \brief   Accessor
+ * @param   flag Set the debug flag to redirect to file
+ */ 
+void Debug::SetDebugToFile (bool flag) 
+{
+   DebugToFile = flag;
+}
+
+/**
+ * \brief   Accessor
+ * @param   level Get the debug flag to redirect to file
+ */ 
+bool Debug::GetDebugToFile ()
+{
+   return DebugToFile;
+}
+
+/**
+ * \brief   Accessor
+ * @param   flag Set the debug flag to redirect to file
+ *          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 ... 
+   DebugFile.open( filename.c_str() );
+}
+
+std::ofstream & Debug::GetDebugFile ()
+{
+  return DebugFile;
+}
+
 } // end namespace gdcm
 
 

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index 73743f260a2d98369aa15f94dce91e27f1f15601..35c61e71112d710503969b988aabc71403a0d6cf 100644 (file)
--- a/src/gdcmDebug.h
+++ b/src/gdcmDebug.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.h,v $
   Language:  C++
-  Date:      $Date: 2005/01/12 22:19:23 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2005/01/13 22:30:11 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -22,6 +22,7 @@
 #include "gdcmCommon.h"
 
 #include <sstream>
+#include <fstream>
 #include <assert.h>
 #include <errno.h>
 
@@ -46,10 +47,25 @@ class GDCM_EXPORT Debug
 public:
    /// This is a global flag that controls whether any debug, warning
    /// messages are displayed.
-   static int  GetDebugFlag ();
-   static void SetDebugFlag (int flag);
-   static void SetDebugOn  () { SetDebugFlag(1); };
-   static void SetDebugOff () { SetDebugFlag(0); };
+   static bool GetDebugFlag ();
+   static void SetDebugFlag (bool flag);
+   static void SetDebugOn  () { SetDebugFlag(true); };
+   static void SetDebugOff () { SetDebugFlag(false); };
+
+   /// This is a global flag that controls if debug are redirected
+   /// to a file or not
+   static bool GetDebugToFile ();
+   static void SetDebugToFile (bool flag);
+   static void SetDebugToFileOn  () { SetDebugToFile(true); };
+   static void SetDebugToFileOff () { SetDebugToFile(false); };
+
+   /// Set the filename the debug stream should be redirect to
+   /// Settting a filename also set DebugToFile to true
+   static void SetDebugFilename (std::string const& filename);
+
+   /// Internal use only. Allow us to retrieve the static from anywhere
+   /// in gdcm code
+   static std::ofstream & GetDebugFile ();
 };
 
 } // end namespace gdcm
@@ -80,17 +96,20 @@ public:
  * \brief   Debug
  * @param msg message part
  */
-#define gdcmDebugMacro(msg)                                \
-{                                                          \
-   if( gdcm::Debug::GetDebugFlag() )                       \
-   {                                                       \
-   std::ostringstream osmacro;                             \
-   osmacro << "Debug: In " __FILE__ ", line " << __LINE__  \
-           << ", function " << GDCM_FUNCTION << '\n'       \
-           << "Last system error was: " << strerror(errno) \
-           << '\n' << msg << "\n\n";                       \
-   std::cerr << osmacro.str() << std::endl;                \
-   }                                                       \
+#define gdcmDebugMacro(msg)                                 \
+{                                                           \
+   if( Debug::GetDebugFlag() )                              \
+   {                                                        \
+   std::ostringstream osmacro;                              \
+   osmacro << "Debug: In " __FILE__ ", line " << __LINE__   \
+           << ", function " << GDCM_FUNCTION << '\n'        \
+           << "Last system error was: " << strerror(errno)  \
+           << '\n' << msg << "\n\n";                        \
+   if( Debug::GetDebugToFile() )                            \
+      Debug::GetDebugFile() << osmacro.str() << std::endl;  \
+   else                                                     \
+      std::cerr << osmacro.str() << std::endl;              \
+   }                                                        \
 }
 
 /**
@@ -99,13 +118,16 @@ public:
  */
 #define gdcmVerboseMacro(msg)                               \
 {                                                           \
-   if( gdcm::Debug::GetDebugFlag() )                        \
+   if( Debug::GetDebugFlag() )                              \
    {                                                        \
    std::ostringstream osmacro;                              \
    osmacro << "Verbose: In " __FILE__ ", line " << __LINE__ \
            << ", function " << GDCM_FUNCTION << "\n"        \
            << msg << "\n\n";                                \
-   std::cerr << osmacro.str() << std::endl;                 \
+   if( Debug::GetDebugToFile() )                            \
+      Debug::GetDebugFile() << osmacro.str() << std::endl;  \
+   else                                                     \
+      std::cerr << osmacro.str() << std::endl;              \
    }                                                        \
 }
 
@@ -113,17 +135,20 @@ public:
  * \brief   Error 
  * @param msg second message part 
  */
-#define gdcmErrorMacro(msg)                               \
-{                                                         \
-   if( gdcm::Debug::GetDebugFlag() )                      \
-   {                                                      \
-   std::ostringstream osmacro;                            \
-   osmacro << "Error: In " __FILE__ ", line " << __LINE__ \
-           << ", function " << GDCM_FUNCTION << '\n'      \
-           << msg << "\n\n";                              \
-   std::cerr << osmacro.str() << std::endl;               \
-   exit(1);                                               \
-   }                                                      \
+#define gdcmErrorMacro(msg)                                 \
+{                                                           \
+   if( Debug::GetDebugFlag() )                              \
+   {                                                        \
+   std::ostringstream osmacro;                              \
+   osmacro << "Error: In " __FILE__ ", line " << __LINE__   \
+           << ", function " << GDCM_FUNCTION << '\n'        \
+           << msg << "\n\n";                                \
+   if( Debug::GetDebugToFile() )                            \
+      Debug::GetDebugFile() << osmacro.str() << std::endl;  \
+   else                                                     \
+      std::cerr << osmacro.str() << std::endl;              \
+   exit(1);                                                 \
+   }                                                        \
 }
 
 /**
@@ -132,17 +157,20 @@ public:
  *        An easy solution to pass also a message is to do:
  *        gdcmAssertMacro( "my message" && 2 < 3 )
  */
-#define gdcmAssertMacro(arg)                               \
-{                                                          \
-   if( !(arg) )                                            \
-   {                                                       \
-   std::ostringstream osmacro;                             \
-   osmacro << "Assert: In " __FILE__ ", line " << __LINE__ \
-           << ", function " << GDCM_FUNCTION               \
-           << "\n\n";                                      \
-   std::cerr << osmacro.str() << std::endl;                \
-   assert ( arg );                                         \
-   }                                                       \
+#define gdcmAssertMacro(arg)                                \
+{                                                           \
+   if( !(arg) )                                             \
+   {                                                        \
+   std::ostringstream osmacro;                              \
+   osmacro << "Assert: In " __FILE__ ", line " << __LINE__  \
+           << ", function " << GDCM_FUNCTION                \
+           << "\n\n";                                       \
+   if( Debug::GetDebugToFile() )                            \
+      Debug::GetDebugFile() << osmacro.str() << std::endl;  \
+   else                                                     \
+      std::cerr << osmacro.str() << std::endl;              \
+   assert ( arg );                                          \
+   }                                                        \
 }
 
 #endif

diff --git a/src/gdcmFile.cxx b/src/gdcmFile.cxx
index 5b43dc21a688f13cff19db848afc7cfe17a98ee5..7766e1029290a158188a2b3b785122ccad393c75 100644 (file)
--- a/src/gdcmFile.cxx
+++ b/src/gdcmFile.cxx
@@ -1,10 +1,10 @@
-  /*=========================================================================
+/*=========================================================================
                                                                                 
   Program:   gdcm
   Module:    $RCSfile: gdcmFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/12 11:33:39 $
-  Version:   $Revision: 1.191 $
+  Date:      $Date: 2005/01/13 22:30:11 $
+  Version:   $Revision: 1.192 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or