Changeset 699 for code/branches/FICN/src/orxonox/core/DebugLevel.cc

Timestamp:

Dec 27, 2007, 4:58:52 PM (17 years ago)

Author:

landauf

Message:

introduced 3 different soft debug levels: one for each output device (console, logfile, ingame-shell (to come))
all are configurable in the config file

File:

• code/branches/FICN/src/orxonox/core/DebugLevel.cc (modified) (5 diffs)

code/branches/FICN/src/orxonox/core/DebugLevel.cc

@@ -32 +32 @@
 
 #include "CoreIncludes.h"
-#include "Debug.h"
 #include "DebugLevel.h"
 
@@ -53 +52 @@
     void DebugLevel::setConfigValues()
     {
-        SetConfigValue(softDebugLevel_, 2);
+        SetConfigValue(softDebugLevelConsole_, 3);
+        SetConfigValue(softDebugLevelLogfile_, 3);
+        SetConfigValue(softDebugLevelShell_, 1);
+
+        // softDebugLevel_ is the maximum of the 3 variables
+        this->softDebugLevel_ = this->softDebugLevelConsole_;
+        if (this->softDebugLevelLogfile_ > this->softDebugLevel_)
+            this->softDebugLevel_ = this->softDebugLevelLogfile_;
+        if (this->softDebugLevelShell_ > this->softDebugLevel_)
+            this->softDebugLevel_ = this->softDebugLevelShell_;
     }
 
@@ -59 +67 @@
         @brief Static function that holds the singleton.
     */
-    int DebugLevel::getSoftDebugLevel()
+    int DebugLevel::getSoftDebugLevel(OutputHandler::OutputDevice device)
     {
         static bool bCreatingSoftDebugLevelObject = true;   // Static variable - used to enhance the performance
@@ -67 +75 @@
         // If bReturnSoftDebugLevel is true, the instance of DebugLevel was created (it's set to true at the end of the constructor, call by reference)
         if (bReturnSoftDebugLevel)
-            return theOnlyDebugLevelObject->softDebugLevel_;
+        {
+            if (device == OutputHandler::LD_All)
+                return theOnlyDebugLevelObject->softDebugLevel_;
+            else if (device == OutputHandler::LD_Console)
+                return theOnlyDebugLevelObject->softDebugLevelConsole_;
+            else if (device == OutputHandler::LD_Logfile)
+                return theOnlyDebugLevelObject->softDebugLevelLogfile_;
+            else if (device == OutputHandler::LD_Shell)
+                return theOnlyDebugLevelObject->softDebugLevelShell_;
+        }
 
         // If bCreatingSoftDebugLevelObject is true, we're just about to create an instance of the DebugLevel class
@@ -74 +91 @@
             bCreatingSoftDebugLevelObject = false;
             theOnlyDebugLevelObject = new DebugLevel(bReturnSoftDebugLevel);
-            return theOnlyDebugLevelObject->softDebugLevel_;
+            return getSoftDebugLevel(device);
         }