Changeset 1586 for code/branches/core3/src/util/OutputHandler.h

Timestamp:

Jun 10, 2008, 3:35:50 PM (16 years ago)

Author:

landauf

Message:

moved Debug.h, OutputHandler and OutputBuffer to util, to make COUT(x) available everywhere

File:

• code/branches/core3/src/util/OutputHandler.h (moved) (moved from code/branches/core3/src/core/OutputHandler.h) (7 diffs)

code/branches/core3/src/util/OutputHandler.h

@@ -38 +38 @@
 #define _OutputHandler_H__
 
-#include "CorePrereqs.h"
+#include "UtilPrereqs.h"
 
 #include <iostream>
@@ -49 +49 @@
 {
     //! The OutputHandler acts like std::cout, but redirects output to the console AND the logfile.
-    class _CoreExport OutputHandler
+    class _UtilExport OutputHandler
     {
         public:
             enum OutputDevice
             {
-                LD_All,
-                LD_Console,
-                LD_Logfile,
-                LD_Shell
+                LD_All = 0,
+                LD_Console = 1,
+                LD_Logfile = 2,
+                LD_Shell = 3
             };
 
@@ -86 +86 @@
                 { return this->logfile_; }
 
+            /** @brief Returns a pointer to the OutputBuffer. @return The OutputBuffer */
+            inline OutputBuffer* getOutputBuffer()
+                { return this->outputBuffer_; }
+
             /** @brief Sets the level of the incoming output. @param level The level of the incoming output @return The OutputHandler itself */
             inline OutputHandler& setOutputLevel(int level)
@@ -94 +98 @@
                 { return this->outputLevel_; }
 
-            static int getSoftDebugLevel(OutputHandler::OutputDevice device);
-
-            OutputBuffer& getShellOutputBuffer();
+            static void setSoftDebugLevel(OutputHandler::OutputDevice device, int level);
+            static int getSoftDebugLevel(OutputHandler::OutputDevice device = OutputHandler::LD_All);
+
+            void setOutputBuffer(OutputBuffer& buffer);
 
             template <class T>
@@ -136 +141 @@
             OutputHandler(const OutputHandler& oh);  // don't copy
             virtual ~OutputHandler();
-            std::ofstream logfile_;     //!< The logfile where the output is logged
-            std::string logfilename_;   //!< The name of the logfile
-            int outputLevel_;           //!< The level of the incoming output
+
+            std::ofstream logfile_;              //!< The logfile where the output is logged
+            std::string logfilename_;            //!< The name of the logfile
+            OutputBuffer fallbackBuffer_;        //!< The OutputBuffer that gets used if there is no other OutputBuffer
+            OutputBuffer* outputBuffer_;         //!< The OutputBuffer to put output in (usually used by the Shell)
+            int outputLevel_;                    //!< The level of the incoming output
+            int softDebugLevel_[4];              //!< The soft debug level for each OutputDevice - the configurable maximal output level
     };
 
@@ -159 +168 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            OutputHandler::getOutStream().getShellOutputBuffer() << output;
+            (*this->outputBuffer_) << output;
 
         return *this;
@@ -183 +192 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= out.getOutputLevel())
-            OutputHandler::getOutStream().getShellOutputBuffer() << output;
+            (*out.getOutputBuffer()) << output;
 
         return out;
     }
-
 }