X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.h;h=dbc9a06cc0b74320e9f454f4bfa9d243136dfe1e;hb=880f6dfe2e061712fafbf75ab9547aadf170fc40;hp=33d22690df1dd49e20cd718c074d08053b6e66e5;hpb=6d79b5e185867ef00629f1ccb279c32daa6357d2;p=gdcm.git diff --git a/src/gdcmDebug.h b/src/gdcmDebug.h index 33d22690..dbc9a06c 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/11/28 16:50:32 $ - Version: $Revision: 1.51 $ + Date: $Date: 2006/04/11 16:03:26 $ + Version: $Revision: 1.54 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -35,11 +35,13 @@ class CommandManager; //----------------------------------------------------------------------------- /** - * \brief Debug is an object for debugging in program. - * It has 2 debugging modes : + * \brief Debug is an object for warning/logging/tracing programs. + * It has the following modes : * - error : for bad library use, seriously wrong DICOM * - debug : for information/debug messages - * - warning : for warning about DICOM quality (kosher) + * - warning : Warns the user when some oddity occured. + * - log : we display messages when anything is not Dicom Kosher + * - debug : we help developper to trace, at a glance, the execution * - assert : design by contract implementation. A function should have * proper input and proper output. * (should not happen, not user controlled) @@ -47,7 +49,24 @@ class CommandManager; * 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(); + * + * Warning : Warns the user when some oddity occured, and we used an heuristics + * to bypass the trouble. + * e.g. : SamplesPerPixel missing, we assume it's a grey level image + * e.g : Pixel Representation missing : we assume 'unsigned' + * (we hope our assumption is OK, but user may disagree.) + * Log : we display messages when anything is not Dicom Kosher + * e.g. : non even length field + * e.g : file is declared as Explicit VR, but a DataElement + * is Implicit + * e.g : a file holds an illegal group (0x0005, ...) + * Debug : We help developper to trace, at a glance, the execution. + * (before refining with a debugging tool) + * + * Setting ON Debug leads to set ON Warning (but not Log) + * Setting ON Log leads to set ON Warning (but not Debug) */ + class GDCM_EXPORT Debug { public: @@ -65,6 +84,16 @@ public: /// \brief Sets the Debug Flag to false static void DebugOff () { SetDebugFlag(false); } + /// \brief This is a global flag that controls whether + /// log messages are displayed. + static void SetLogFlag (bool flag); + /// \brief Gets the Log flag value + static bool GetLogFlag () {return LogFlag;} + /// \brief Sets the Log Flag to true + static void LogOn () { SetLogFlag(true); } + /// \brief Sets the Log Flag to false + static void LogOff () { SetLogFlag(false); } + /// \brief This is a global flag that controls whether /// warning messages are displayed. static void SetWarningFlag (bool flag); @@ -73,7 +102,7 @@ public: /// \brief Sets the Warning Flag to true static void WarningOn () { SetWarningFlag(true); } /// \brief Sets the Warning Flag to false - static void WarningOff () { SetWarningFlag(false); } + static void WarningOff () { SetWarningFlag(false); } /// \brief This is a global flag that controls if debug are redirected /// to a file or not @@ -88,11 +117,14 @@ public: static std::ostream &GetOutput (); - static void SendToOutput(unsigned int type,std::string const &msg,const Base *object = NULL); + static void SendToOutput(unsigned int type,std::string const &msg, + const Base *object = NULL); private: - static bool DebugFlag; static bool WarningFlag; + static bool LogFlag; + static bool DebugFlag; + static bool OutputToFile; static std::ofstream OutputFileStream; @@ -129,7 +161,7 @@ private: * \brief Debug : To be used to help bug tracking developer * @param msg message part */ -#define gdcmMessageBodyMacro(type,obj,msg,adds) \ +#define gdcmMessageBodyMacro(type, obj, msg, adds) \ { \ std::ostringstream osmacro; \ osmacro << "In " __FILE__ ", line " << __LINE__ \ @@ -138,16 +170,18 @@ private: gdcm::Debug::SendToOutput(type,osmacro.str(),obj); \ } +// ------------------------------------------------------------------------ + /** * \brief Debug : To be used to help bug tracking developer * @param msg message part */ #ifdef NDEBUG -#define gdcmDebugBodyMacro(obj,msg) {} +#define gdcmDebugBodyMacro(obj, msg) {} #define gdcmDebugMacro(msg) {} #define gdcmStaticDebugMacro(msg) {} #else -#define gdcmDebugBodyMacro(obj,msg) \ +#define gdcmDebugBodyMacro(obj, msg) \ { \ if( Debug::GetDebugFlag() ) \ { \ @@ -167,12 +201,33 @@ private: gdcmDebugBodyMacro(NULL,msg) #endif //NDEBUG +// ------------------------------------------------------------------------ + +/** + * \brief Log : we display messages when anything is not Dicom Kosher + * @param msg message part + */ +// No NDEBUG test to always have a return of warnings !!! +// -> Rien compris! JPRx +#define gdcmLogBodyMacro(obj, msg) \ +{ \ + if( Debug::GetLogFlag() ) \ + gdcmMessageBodyMacro(gdcm::CMD_LOG,obj,msg,""); \ +} +#define gdcmLogMacro(msg) \ + gdcmLogBodyMacro(this,msg) +#define gdcmStaticLogMacro(msg) \ + gdcmLogBodyMacro(NULL,msg) + +// ------------------------------------------------------------------------ + /** * \brief Warning : To be used to warn the user when some oddity occurs * @param msg message part */ // No NDEBUG test to always have a return of warnings !!! -#define gdcmWarningBodyMacro(obj,msg) \ +// -> Rien compris! JPRx +#define gdcmWarningBodyMacro(obj, msg) \ { \ if( Debug::GetWarningFlag() ) \ gdcmMessageBodyMacro(gdcm::CMD_WARNING,obj,msg,""); \ @@ -182,13 +237,16 @@ private: #define gdcmStaticWarningMacro(msg) \ gdcmWarningBodyMacro(NULL,msg) +// ------------------------------------------------------------------------ + /** * \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 */ // No NDEBUG test to always have a return of errors !!! -#define gdcmErrorBodyMacro(obj,msg) \ +// -> Rien compris! JPRx +#define gdcmErrorBodyMacro(obj, msg) \ { \ gdcmMessageBodyMacro(gdcm::CMD_ERROR,obj,msg,""); \ } @@ -197,6 +255,8 @@ private: #define gdcmStaticErrorMacro(msg) \ gdcmErrorBodyMacro(NULL,msg) +// ------------------------------------------------------------------------ + /** * \brief Assert : To be used when an *absolutely* impossible error occurs * No function should be allowed to stop the process instead of @@ -206,7 +266,8 @@ private: * gdcmAssertMacro( "my message" && 2 < 3 ) */ // No NDEBUG test to always have a return of asserts !!! -#define gdcmAssertBodyMacro(obj,arg) \ +// -> Rien compris! JPRx +#define gdcmAssertBodyMacro(obj, arg) \ { \ if( !(arg) ) \ { \