X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDebug.cxx;h=3c712e7a0f2f1324db0339d15bc2d5b705ed086a;hb=d93bdc3a545dc713354ab0c8ad9558ee11dfe0e9;hp=a742c86b8bb56676d8e1b19ad284f3cfc88dc961;hpb=41559a6f2d66bcd4af4db17a0d9668df37d19f3b;p=gdcm.git

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index a742c86b..3c712e7a 100644
--- a/src/gdcmDebug.cxx
+++ b/src/gdcmDebug.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDebug.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/11/28 16:31:22 $
-  Version:   $Revision: 1.28 $
+  Date:      $Date: 2007/05/23 14:18:08 $
+  Version:   $Revision: 1.31 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,13 +21,14 @@
 
 #include <iostream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Warning message level to be displayed
 const int Debug::LINE_LENGTH = 79;
 
 bool Debug::DebugFlag     = false;
+bool Debug::LogFlag       = false;
 bool Debug::WarningFlag   = false;
 bool Debug::OutputToFile  = false;
 
@@ -66,12 +67,28 @@ void Debug::SetDebugFlag (bool flag)
  */ 
 void Debug::SetWarningFlag (bool flag) 
 {
-   // Cannot unset Warning flag if Debug flag is on.
-   if (flag == false && DebugFlag == true)
-      return;
+   // Cannot unset Warning flag if Debug flag is on or if LogFlag is on.
+   if (flag == false)
+   { 
+      if (DebugFlag == true)
+         return;
+      if (LogFlag == true)
+         return;
+   }
    WarningFlag = flag;
 }
 
+/**
+ * \brief   Sets the log flag
+ * @param   flag Set the log flag
+ */ 
+void Debug::SetLogFlag (bool flag) 
+{
+   // To log oddities, both flags are necessary      
+   WarningFlag = flag;   
+   LogFlag = flag;
+}
+
 /**
  * \brief   Accessor
  * @param   flag whether we want to redirect to file
@@ -121,7 +138,8 @@ std::ostream &Debug::GetOutput ()
 void Debug::SendToOutput(unsigned int type,std::string const &msg,const Base *object)
 {
    bool executed=false;
-   executed=CommandManager::ExecuteCommandConst(object,type,msg);
+   if( type != CMD_DEBUG && type != CMD_ASSERT )
+      executed=CommandManager::ExecuteCommandConst(object,type,msg);
 
    if(!executed)
       GetOutput() << Command::GetCommandAsString(type) << ": " << msg;