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

Timestamp:

Jun 10, 2008, 3:35:50 PM (17 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.cc (moved) (moved from code/branches/core3/src/core/OutputHandler.cc) (8 diffs)

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

@@ -33 +33 @@
 
 #include "OutputHandler.h"
-#include "Core.h"
-#include "ConsoleCommand.h"
-#include "Shell.h"
 
 namespace orxonox
 {
-    SetConsoleCommandShortcutGeneric(log,     createConsoleCommand(createFunctor(&OutputHandler::log),     "log"    ));
-    SetConsoleCommandShortcutGeneric(error,   createConsoleCommand(createFunctor(&OutputHandler::error),   "error"  ));
-    SetConsoleCommandShortcutGeneric(warning, createConsoleCommand(createFunctor(&OutputHandler::warning), "warning"));
-    SetConsoleCommandShortcutGeneric(info,    createConsoleCommand(createFunctor(&OutputHandler::info),    "info"   ));
-    SetConsoleCommandShortcutGeneric(debug,   createConsoleCommand(createFunctor(&OutputHandler::debug),   "debug"  ));
-
     /**
         @brief Constructor: Opens the logfile and writes the first line.
@@ -51 +42 @@
     OutputHandler::OutputHandler(const std::string& logfilename)
     {
+        this->outputBuffer_ = &this->fallbackBuffer_;
+        this->softDebugLevel_[0] = this->softDebugLevel_[1] = this->softDebugLevel_[2] = this->softDebugLevel_[3] = 2;
         this->logfilename_ = logfilename;
         this->logfile_.open(this->logfilename_.c_str(), std::fstream::out);
@@ -77 +70 @@
 
     /**
+        @brief Sets the soft debug level for a given output device.
+        @param device The output device
+        @param level The debug level
+    */
+    void OutputHandler::setSoftDebugLevel(OutputHandler::OutputDevice device, int level)
+    {
+        OutputHandler::getOutStream().softDebugLevel_[(unsigned int)device] = level;
+    }
+
+    /**
         @brief Returns the soft debug level for a given output device.
         @param device The output device
@@ -83 +86 @@
     int OutputHandler::getSoftDebugLevel(OutputHandler::OutputDevice device)
     {
-        return Core::getSoftDebugLevel(device);
+        return OutputHandler::getOutStream().softDebugLevel_[(unsigned int)device];
     }
 
     /**
-        @brief Returns the Shell's OutputBuffer. This is mere placed here to avoid
-               recompiling the entire project when Shell.h changes.
-        @return The OutputBuffer of the Shell
+        @brief Sets the OutputBuffer, representing the third output stream.
+        @param buffer The OutputBuffer
     */
-    OutputBuffer& OutputHandler::getShellOutputBuffer()
+    void OutputHandler::setOutputBuffer(OutputBuffer& buffer)
     {
-        return Shell::getInstance().getOutputBuffer();
+        buffer.getStream() >> this->outputBuffer_->getStream().rdbuf();
+        this->outputBuffer_ = &buffer;
     }
 
@@ -113 +116 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << sb;
+            (*this->outputBuffer_) << sb;
 
         return *this;
@@ -135 +138 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << manipulator;
+            (*this->outputBuffer_) << manipulator;
 
         return *this;
@@ -157 +160 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << manipulator;
+            (*this->outputBuffer_) << manipulator;
 
         return *this;
@@ -179 +182 @@
 
         if (OutputHandler::getSoftDebugLevel(OutputHandler::LD_Shell) >= this->outputLevel_)
-            Shell::getInstance().getOutputBuffer() << manipulator;
+            (*this->outputBuffer_) << manipulator;
 
         return *this;