X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.h;h=422f0789cb11d939c6aa0517060a6c48222473cf;hb=2a2c07baafb13cec37daad51975f394541406eac;hp=e35027af280aff272f4cd715d80598c93238b8a3;hpb=ba8974832cb94dca2c5f04954de92ebc92e5518e;p=gdcm.git

diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h
index e35027af..422f0789 100644
--- 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 21:53:32 $
-  Version:   $Revision: 1.20 $
+  Date:      $Date: 2005/01/20 11:07:07 $
+  Version:   $Revision: 1.24 $
                                                                                 
   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,51 +96,70 @@ 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;                \
-   }                                                       \
+#ifdef NDEBUG
+#define gdcmDebugMacro(msg)
+#else
+#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;              \
+   }                                                        \
 }
+#endif //NDEBUG
 
 /**
  * \brief   Verbose 
  * @param msg message part
  */
+#ifdef NDEBUG
 #define gdcmVerboseMacro(msg)                               \
 {                                                           \
-   if( gdcm::Debug::GetDebugFlag() )                        \
+}
+#else
+#define gdcmVerboseMacro(msg)                               \
+{                                                           \
+   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;              \
    }                                                        \
 }
+#endif //NDEBUG
 
 /**
  * \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);                                               \
-   }                                                      \
+#ifdef NDEBUG
+#define gdcmErrorMacro(msg)
+#else
+#define gdcmErrorMacro(msg)                                 \
+{                                                           \
+   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;              \
 }
+#endif //NDEBUG
 
 /**
  * \brief   Assert 
@@ -132,17 +167,24 @@ 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 );                                         \
-   }                                                       \
+#ifdef NDEBUG
+#define gdcmAssertMacro(arg)
+#else
+#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 //NDEBUG
 
 #endif