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

diff --git a/src/gdcmDebug.cxx b/src/gdcmDebug.cxx
index ba0a2fa4..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/05 13:21:32 $
-  Version:   $Revision: 1.26 $
+  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
@@ -17,28 +17,34 @@
 =========================================================================*/
 
 #include "gdcmDebug.h"
+#include "gdcmCommandManager.h"
+
 #include <iostream>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 //-----------------------------------------------------------------------------
 // Warning message level to be displayed
-static bool DebugFlag     = false;
-static bool WarningFlag   = false;
-static bool DebugToFile   = false;
-static std::ofstream DebugFile;
+const int Debug::LINE_LENGTH = 79;
+
+bool Debug::DebugFlag     = false;
+bool Debug::LogFlag       = false;
+bool Debug::WarningFlag   = false;
+bool Debug::OutputToFile  = false;
+
+std::ofstream Debug::OutputFileStream;
+std::ostream &Debug::StandardStream = std::cerr;
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
 Debug::Debug()
 {
-
 }
 
 Debug::~Debug()
 {
-  if ( DebugFile.is_open() )
-      DebugFile.close();     
+  if ( OutputFileStream.is_open() )
+      OutputFileStream.close();     
 }
 
 //-----------------------------------------------------------------------------
@@ -55,51 +61,49 @@ void Debug::SetDebugFlag (bool flag)
    WarningFlag = flag;
 }
 
-/**
- * \brief   Gets the debug flag value
- *          (used to warn user when file contains some oddity)
- * @return debug flag value
- */ 
-bool Debug::GetDebugFlag ()
-{
-   return DebugFlag;
-}
-
 /**
  * \brief   Sets the warning flag
  * @param   flag Set the warning 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   Gets the warning flag value
- * @return warning flag value
+ * \brief   Sets the log flag
+ * @param   flag Set the log flag
  */ 
-bool Debug::GetWarningFlag ()
+void Debug::SetLogFlag (bool flag) 
 {
-   return WarningFlag;
+   // To log oddities, both flags are necessary      
+   WarningFlag = flag;   
+   LogFlag = flag;
 }
+
 /**
  * \brief   Accessor
  * @param   flag whether we want to redirect to file
  */ 
-void Debug::SetDebugToFile (bool flag) 
+void Debug::SetOutputToFile (bool flag) 
 {
-   DebugToFile = flag;
+   OutputToFile = flag;
 }
 
 /**
  * \brief   Accessor to know whether debug info are redirected to file
  */ 
-bool Debug::GetDebugToFile ()
+bool Debug::GetOutputToFile ()
 {
-   return DebugToFile;
+   return OutputToFile;
 }
 
 /**
@@ -109,13 +113,13 @@ bool Debug::GetDebugToFile ()
  *          Absolutely nothing is check. You have to pass in
  *          a correct filename
  */ 
-void Debug::SetDebugFilename (std::string const &filename)
+void Debug::SetOutputFileName (std::string const &filename)
 {
-   DebugToFile = true;  // Just in case ... 
+   OutputToFile = true;  // Just in case ... 
    DebugFlag   = true;  // Just in case ...
-   if ( DebugFile.is_open() )
-      DebugFile.close();
-   DebugFile.open( filename.c_str() );
+   if ( OutputFileStream.is_open() )
+      OutputFileStream.close();
+   OutputFileStream.open( filename.c_str() );
 }
 
 /**
@@ -123,9 +127,22 @@ void Debug::SetDebugFilename (std::string const &filename)
  *        in gdcm code
  * @return Debug file
  */
-std::ofstream &Debug::GetDebugFile ()
+std::ostream &Debug::GetOutput ()
 {
-  return DebugFile;
+   if(OutputToFile)
+      return OutputFileStream;
+   else
+      return StandardStream;
+}
+
+void Debug::SendToOutput(unsigned int type,std::string const &msg,const Base *object)
+{
+   bool executed=false;
+   if( type != CMD_DEBUG && type != CMD_ASSERT )
+      executed=CommandManager::ExecuteCommandConst(object,type,msg);
+
+   if(!executed)
+      GetOutput() << Command::GetCommandAsString(type) << ": " << msg;
 }
 
 //-----------------------------------------------------------------------------