X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.h;h=df9e02f831f4d412b1b43a710ae4c2454e46715a;hb=e7ed9c263ead790fecfa6bdac9d6e535fbe1b0cc;hp=85eda8b3cae08ec08fdc3d24982d99946ff3af16;hpb=066996143ee597cc94ffc6d27751301931afad30;p=gdcm.git diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index 85eda8b3..df9e02f8 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/07/19 14:43:48 $ - Version: $Revision: 1.36 $ + Date: $Date: 2005/11/05 13:21:32 $ + Version: $Revision: 1.47 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,6 +21,7 @@ #include "gdcmCommon.h" +#include #include #include #include @@ -40,7 +41,7 @@ namespace gdcm * proper input and proper output. * (should not happen, not user controlled) * - * A debugging message is only show if the flag is on (DebugFlag) + * A debugging message is only shown if the flag is on (DebugFlag) * This is static var and can be set at beginning of code: * gdcm::Debug::SetDebugOn(); */ @@ -50,23 +51,32 @@ public: Debug(); ~Debug(); - /// \brief This is a global flag that controls whether any debug, warning - /// messages are displayed. + /// \brief This is a global flag that controls whether + /// both debug and warning messages are displayed. static void SetDebugFlag (bool flag); static bool GetDebugFlag (); /// \brief Sets the Debug Flag to true - static void DebugOn () { SetDebugFlag(true); }; + static void DebugOn () { SetDebugFlag(true); } /// \brief Sets the Debug Flag to false - static void DebugOff () { SetDebugFlag(false); }; + static void DebugOff () { SetDebugFlag(false); } + + /// \brief This is a global flag that controls whether + /// warning messages are displayed. + static void SetWarningFlag (bool flag); + static bool GetWarningFlag (); + /// \brief Sets the Warning Flag to true + static void WarningOn () { SetWarningFlag(true); } + /// \brief Sets the Warning Flag to false + static void WarningOff () { SetWarningFlag(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); }; + static void DebugToFileOn () { SetDebugToFile(true); } /// \brief Next debug messages will be sent in the standard output - static void DebugToFileOff () { SetDebugToFile(false); }; + static void DebugToFileOff () { SetDebugToFile(false); } static void SetDebugFilename (std::string const &filename); @@ -98,7 +108,7 @@ public: #endif //GDCM_COMPILER_HAS_FUNCTION /** - * \brief Debug + * \brief Debug : To be used to help bug tracking developer * @param msg message part */ #ifdef NDEBUG @@ -110,9 +120,11 @@ public: { \ std::ostringstream osmacro; \ osmacro << "Debug: In " __FILE__ ", line " << __LINE__ \ - << ", function " << GDCM_FUNCTION << '\n' \ - << "Last system error was: " << strerror(errno) \ - << '\n' << msg << "\n\n"; \ + << ", function " << GDCM_FUNCTION << '\n'; \ + if( errno ) \ + osmacro << "Last system error was: " << \ + strerror(errno) << '\n'; \ + osmacro << msg << "\n\n"; \ if( Debug::GetDebugToFile() ) \ Debug::GetDebugFile() << osmacro.str() << std::endl; \ else \ @@ -122,7 +134,7 @@ public: #endif //NDEBUG /** - * \brief Warning + * \brief Warning : To be used to warn the user when some oddity occurs * @param msg message part */ #ifdef NDEBUG @@ -130,7 +142,7 @@ public: #else #define gdcmWarningMacro(msg) \ { \ - if( Debug::GetDebugFlag() ) \ + if( Debug::GetWarningFlag() ) \ { \ std::ostringstream osmacro; \ osmacro << "Warning: In " __FILE__ ", line " << __LINE__ \ @@ -145,7 +157,8 @@ public: #endif //NDEBUG /** - * \brief Error + * \brief Error : To be used when unecoverabale error occurs + * at a 'deep' level. (don't use it if file is not ACR/DICOM!) * @param msg second message part */ #ifdef NDEBUG @@ -165,7 +178,9 @@ public: #endif //NDEBUG /** - * \brief Assert + * \brief Assert : To be used when an *absolutely* impossible error occurs + * No function should be allowed to stop the process instead of + * warning the caller! * @param arg argument to test * An easy solution to pass also a message is to do: * gdcmAssertMacro( "my message" && 2 < 3 ) @@ -193,21 +208,31 @@ public: //----------------------------------------------------------------------------- // // Define GDCM_LEGACY macro to mark legacy methods where they are -// declared in their class. Example usage: +// declared in their class. +// +// WARNING : Don't try to use it with 'inline' methods ! +// +//Example usage: // // // @deprecated Replaced by MyOtherMethod() as of gdcm 2.0. // GDCM_LEGACY(void MyMethod()); #if defined(GDCM_LEGACY_REMOVE) // Remove legacy methods completely. # define GDCM_LEGACY(method) -#elif defined(GDCM_LEGACY_SILENT) +#elif defined(GDCM_LEGACY_SILENT) || defined(SWIG) // Provide legacy methods with no warnings. # define GDCM_LEGACY(method) method #else // Setup compile-time warnings for uses of deprecated methods if // possible on this compiler. # if defined(__GNUC__) && !defined(__INTEL_COMPILER) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)) +#if defined(__APPLE__) && (__GNUC__ == 3) && (__GNUC_MINOR__ == 3) +// Seems like there is a bug in APPLE gcc for deprecated attribute and ctor +// This is fixed in g++ 4.0 (Tiger) +# define GDCM_LEGACY(method) method +#else # define GDCM_LEGACY(method) method __attribute__((deprecated)) +#endif # elif defined(_MSC_VER) && _MSC_VER >= 1300 # define GDCM_LEGACY(method) __declspec(deprecated) method # else