X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.h;h=f181276accd6fb37df5bc539b66ba9cc9f0f489c;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=cdf1e47e886129861f930187a28bf6c833097ffc;hpb=d4968107a4bf830f86bd8fc46f188230c9b35b90;p=gdcm.git diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index cdf1e47e..f181276a 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/08 23:14:05 $ - Version: $Revision: 1.18 $ + Date: $Date: 2005/02/01 13:11:49 $ + Version: $Revision: 1.28 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,14 +22,15 @@ #include "gdcmCommon.h" #include +#include #include +#include 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 @@ -37,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: + Debug(); + ~Debug(); + /// 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 void SetDebugFlag (bool flag); + static bool GetDebugFlag (); + static void DebugOn () { SetDebugFlag(true); }; + static void DebugOff () { SetDebugFlag(false); }; + + /// This is a global flag that controls if debug are redirected + /// to a file or not + static void SetDebugToFile (bool flag); + static bool GetDebugToFile (); + static void DebugToFileOn () { SetDebugToFile(true); }; + static void DebugToFileOff () { 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 @@ -63,6 +82,9 @@ public: #ifdef GDCM_COMPILER_HAS_FUNCTION // Handle particular case for GNU C++ which also defines __PRETTY_FUNCTION__ // which is a lot nice in C++ +#ifdef __BORLANDC__ +# define __FUNCTION__ __FUNC__ +#endif #ifdef __GNUC__ # define GDCM_FUNCTION __PRETTY_FUNCTION__ #else @@ -76,50 +98,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' \ - << 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 @@ -127,17 +169,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