[Orxonox-commit 4118] r8789 - code/branches/output/src/libraries/util/output

[landauf at orxonox.net]

Author: landauf
Date: 2011-07-26 11:06:01 +0200 (Tue, 26 Jul 2011)
New Revision: 8789

Modified:
   code/branches/output/src/libraries/util/output/ConsoleWriter.cc
   code/branches/output/src/libraries/util/output/OutputDefinitions.h
   code/branches/output/src/libraries/util/output/OutputStream.cc
   code/branches/output/src/libraries/util/output/OutputStream.h
Log:
some small details, allow direct usage of OutputStream()

Modified: code/branches/output/src/libraries/util/output/ConsoleWriter.cc
===================================================================
--- code/branches/output/src/libraries/util/output/ConsoleWriter.cc	2011-07-25 22:05:23 UTC (rev 8788)
+++ code/branches/output/src/libraries/util/output/ConsoleWriter.cc	2011-07-26 09:06:01 UTC (rev 8789)
@@ -27,6 +27,8 @@
  */
 
 #include "ConsoleWriter.h"
+
+#include <iostream>
 
 #include "OutputManager.h"
 

Modified: code/branches/output/src/libraries/util/output/OutputDefinitions.h
===================================================================
--- code/branches/output/src/libraries/util/output/OutputDefinitions.h	2011-07-25 22:05:23 UTC (rev 8788)
+++ code/branches/output/src/libraries/util/output/OutputDefinitions.h	2011-07-26 09:06:01 UTC (rev 8789)
@@ -33,7 +33,7 @@
 #include <string>
 
 #define REGISTER_OUTPUT_CONTEXT(name) \
-    OutputContext name() { static OutputContext value = registerContext(#name); return value; }
+    OutputContext name() { static OutputContext context = registerContext(#name); return context; }
 
 namespace orxonox
 {

Modified: code/branches/output/src/libraries/util/output/OutputStream.cc
===================================================================
--- code/branches/output/src/libraries/util/output/OutputStream.cc	2011-07-25 22:05:23 UTC (rev 8788)
+++ code/branches/output/src/libraries/util/output/OutputStream.cc	2011-07-26 09:06:01 UTC (rev 8789)
@@ -34,11 +34,14 @@
 {
     OutputStream::OutputStream()
     {
-        this->level_ = level::none;
-        this->context_ = context::none;
-        this->bAcceptsOutput_ = false;
+        this->setOutputAttributes(level::debug_output, context::undefined());
     }
 
+    OutputStream::OutputStream(OutputLevel level, OutputContext context)
+    {
+        this->setOutputAttributes(level, context);
+    }
+
     void OutputStream::sendMessage()
     {
         OutputManager::getInstanceAndCreateListeners().pushMessage(this->level_, this->context_, this->str());
@@ -50,6 +53,6 @@
         this->level_ = level;
         this->context_ = context;
 
-        this->bAcceptsOutput_ = OutputManager::getInstanceAndCreateListeners().acceptsOutput(this->level_, this->context_);
+        this->bAcceptsOutput_ = OutputManager::getInstanceAndCreateListeners().acceptsOutput(level, context);
     }
 }

Modified: code/branches/output/src/libraries/util/output/OutputStream.h
===================================================================
--- code/branches/output/src/libraries/util/output/OutputStream.h	2011-07-25 22:05:23 UTC (rev 8788)
+++ code/branches/output/src/libraries/util/output/OutputStream.h	2011-07-26 09:06:01 UTC (rev 8789)
@@ -43,6 +43,7 @@
 
         public:
             _UtilExport OutputStream();
+            _UtilExport OutputStream(OutputLevel level, OutputContext context);
 
             void _UtilExport setOutputAttributes(OutputLevel level, OutputContext context);