X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.h;h=35e159506d636b4b451cb2ea85c14e0bfbf9dcaa;hb=04f3bbda36168ed865e04de8b94d2c60206f962a;hp=73743f260a2d98369aa15f94dce91e27f1f15601;hpb=0b04b4a7b8017908748af66be8eec4f22a9ab884;p=gdcm.git diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index 73743f26..35e15950 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 22:19:23 $ - Version: $Revision: 1.21 $ + Date: $Date: 2005/02/11 20:14:55 $ + Version: $Revision: 1.33 $ 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 +#include #include #include @@ -30,7 +31,6 @@ namespace gdcm //----------------------------------------------------------------------------- /** - * \ingroup Debug * \brief Debug is an object for debugging in program. * It has 2 debugging modes : * - error : for bad library use, seriously wrong DICOM @@ -38,18 +38,36 @@ namespace gdcm * - warning : for warning about DICOM quality (kosher) * * A debugging message is only show if the flag is on (DebugFlag) - * This is static var and can be set at begining of code: + * This is static var and can be set at beginning of code: * gdcm::Debug::SetDebugOn(); */ 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); }; + Debug(); + ~Debug(); + + /// \brief This is a global flag that controls whether any debug, warning + /// messages are displayed. + static void SetDebugFlag (bool flag); + static bool GetDebugFlag (); + /// \brief Sets the Debug Flag to true + static void DebugOn () { SetDebugFlag(true); }; + /// \brief Sets the Debug Flag to false + static void DebugOff () { SetDebugFlag(false); }; + + /// \brief This is a global flag that controls if debug are redirected + /// to a file or not + static void SetDebugToFile (bool flag); + static bool GetDebugToFile (); + /// \brief Next debug messages will be sent in the debug file + static void DebugToFileOn () { SetDebugToFile(true); }; + /// \brief Next debug messages will be sent in the standard output + static void DebugToFileOff () { SetDebugToFile(false); }; + + static void SetDebugFilename (std::string const &filename); + + static std::ofstream &GetDebugFile (); }; } // end namespace gdcm @@ -80,51 +98,68 @@ 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 + * \brief Warning * @param msg message part */ -#define gdcmVerboseMacro(msg) \ +#ifdef NDEBUG +#define gdcmWarningMacro(msg) +#else +#define gdcmWarningMacro(msg) \ { \ - if( gdcm::Debug::GetDebugFlag() ) \ + if( Debug::GetDebugFlag() ) \ { \ std::ostringstream osmacro; \ - osmacro << "Verbose: In " __FILE__ ", line " << __LINE__ \ + osmacro << "Warning: 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