Changeset 8798 for code/branches/output/src/libraries/core/GUIManager.cc

Timestamp:

Jul 30, 2011, 3:55:35 PM (13 years ago)

Author:

landauf

Message:

adjusted output levels for ogre and cegui messages
added config value for cegui logfile

File:

• code/branches/output/src/libraries/core/GUIManager.cc (modified) (5 diffs)

code/branches/output/src/libraries/core/GUIManager.cc

@@ -33 +33 @@
 #include <memory>
 #include <boost/bind.hpp>
-#include <boost/preprocessor/stringize.hpp>
 #include <OgreRenderQueue.h>
 #include <OgreRenderWindow.h>
@@ -93 +92 @@
 namespace orxonox
 {
+    namespace context
+    {
+        namespace
+        {
+            REGISTER_OUTPUT_CONTEXT(cegui);
+        }
+    }
+
     static void key_esc()
         { GUIManager::getInstance().keyESC(); }
@@ -107 +114 @@
                 case CEGUI::Errors:      orxonoxLevel = level::internal_error; break;
                 case CEGUI::Warnings:    orxonoxLevel = level::internal_warning; break;
-                case CEGUI::Standard:    orxonoxLevel = level::internal_status; break;
-                case CEGUI::Informative: orxonoxLevel = level::internal_info; break;
-                case CEGUI::Insane:      orxonoxLevel = level::verbose; break;
+                case CEGUI::Standard:    orxonoxLevel = level::verbose; break;
+                case CEGUI::Informative: orxonoxLevel = level::verbose_more; break;
+                case CEGUI::Insane:      orxonoxLevel = level::verbose_ultra; break;
                 default: OrxAssert(false, "CEGUI log level out of range, inspect immediately!");
             }
 
-#pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: use correct level (and remove boost include)")
-            orxout(debug_output, context::cegui) << "CEGUI (level: " << level << "): " << message << endl;
+            orxout(orxonoxLevel, context::cegui) << message << endl;
 
             CEGUI::DefaultLogger::logEvent(message, level);
@@ -302 +308 @@
         std::auto_ptr<CEGUILogger> ceguiLogger(new CEGUILogger());
         ceguiLogger->setLogFilename(PathConfig::getLogPathString() + "cegui.log");
-#pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: inspect this (and remove boost include)")
-//        // Set the log level according to ours (translate by subtracting 1)
-//        ceguiLogger->setLoggingLevel(
-//            static_cast<LoggingLevel>(OutputHandler::getInstance().getSoftDebugLevel("logFile") - 1));
+        ceguiLogger->setLoggingLevel(static_cast<CEGUI::LoggingLevel>(this->outputLevelCeguiLog_));
         this->ceguiLogger_ = ceguiLogger.release();
 
@@ -363 +366 @@
     void GUIManager::setConfigValues(void)
     {
-        SetConfigValue(guiScheme_, GUIManager::defaultScheme_) .description("Changes the current GUI scheme.") .callback(this, &GUIManager::changedGUIScheme);
+        SetConfigValue(guiScheme_, GUIManager::defaultScheme_).description("Changes the current GUI scheme.").callback(this, &GUIManager::changedGUIScheme);
         SetConfigValue(numScrollLines_, 1).description("How many lines to scroll in a list if the scroll wheel is used");
+        SetConfigValueExternal(outputLevelCeguiLog_, "OutputHandler", "outputLevelCeguiLog", CEGUI::Standard).description("The log level of the CEGUI log file").callback(this, &GUIManager::changedCeguiOutputLevel);
     }
 
     void GUIManager::changedGUIScheme(void)
     {
+    }
+
+    void GUIManager::changedCeguiOutputLevel()
+    {
+        if (this->ceguiLogger_)
+            this->ceguiLogger_->setLoggingLevel(static_cast<CEGUI::LoggingLevel>(this->outputLevelCeguiLog_));
     }