Changeset 1586 for code/branches/core3/src/core

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

Location:

code/branches/core3/src/core

Files:

• CMakeLists.txt (modified) (1 diff)
• ClassFactory.h (modified) (1 diff)
• CommandEvaluation.cc (modified) (1 diff)
• CommandExecutor.cc (modified) (1 diff)
• ConsoleCommandCompilation.cc (modified) (1 diff)
• Core.cc (modified) (3 diffs)
• Core.h (modified) (1 diff)
• CoreIncludes.h (modified) (1 diff)
• CorePrereqs.h (modified) (1 diff)
• Error.cc (modified) (1 diff)
• Executor.h (modified) (1 diff)
• Factory.cc (modified) (1 diff)
• Functor.h (modified) (1 diff)
• Identifier.h (modified) (1 diff)
• Language.cc (modified) (1 diff)
• Loader.cc (modified) (1 diff)
• MetaObjectList.cc (modified) (1 diff)
• NamespaceNode.cc (modified) (1 diff)
• Shell.cc (modified) (2 diffs)
• Shell.h (modified) (1 diff)
• SignalHandler.cc (modified) (1 diff)
• TclBind.cc (modified) (1 diff)
• TclThreadManager.cc (modified) (1 diff)
• XMLPort.h (modified) (1 diff)
• input/Button.cc (modified) (1 diff)
• input/InputManager.cc (modified) (1 diff)
• input/KeyBinder.cc (modified) (1 diff)
• input/KeyDetector.cc (modified) (1 diff)

code/branches/core3/src/core/CMakeLists.txt

@@ -7 +7 @@
   ObjectListBase.cc
   OrxonoxClass.cc
-  OutputBuffer.cc
-  OutputHandler.cc
   Script.cc
   SignalHandler.cc

code/branches/core3/src/core/ClassFactory.h

@@ -43 +43 @@
 #include "Factory.h"
 #include "Identifier.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/CommandEvaluation.cc

@@ -30 +30 @@
 #include "ConsoleCommand.h"
 #include "Identifier.h"
-#include "Debug.h"
+#include "util/Debug.h"
 #include "util/String.h"
 

code/branches/core3/src/core/CommandExecutor.cc

@@ -31 +31 @@
 #include "util/String.h"
 #include "util/Convert.h"
+#include "util/Debug.h"
 #include "Identifier.h"
 #include "Language.h"
-#include "Debug.h"
 #include "TclBind.h"
 

code/branches/core3/src/core/ConsoleCommandCompilation.cc

@@ -29 +29 @@
 #include "ConsoleCommandCompilation.h"
 #include "ConsoleCommand.h"
-#include "Debug.h"
+#include "util/Debug.h"
 #include "util/ExprParser.h"
 

code/branches/core3/src/core/Core.cc

@@ -107 +107 @@
             this->softDebugLevel_ = this->softDebugLevelShell_;
 
+        OutputHandler::setSoftDebugLevel(OutputHandler::LD_All,     this->softDebugLevel_);
+        OutputHandler::setSoftDebugLevel(OutputHandler::LD_Console, this->softDebugLevelConsole_);
+        OutputHandler::setSoftDebugLevel(OutputHandler::LD_Logfile, this->softDebugLevelLogfile_);
+        OutputHandler::setSoftDebugLevel(OutputHandler::LD_Shell,   this->softDebugLevelShell_);
 
         std::string temp = this->language_;
@@ -158 +162 @@
             else if (device == OutputHandler::LD_Shell)
                 Core::getInstance().softDebugLevelShell_ = level;
+
+            OutputHandler::setSoftDebugLevel(device, level);
         }
      }
@@ -199 +205 @@
     }
 }
-
-/**
-    @brief Returns the soft debug level, stored in the only existing instance of the DebugLevel class, configured in the config-file.
-    @return The soft debug level
-*/
-int getSoftDebugLevel()
-{
-    return orxonox::Core::getSoftDebugLevel();
-}

code/branches/core3/src/core/Core.h

@@ -41 +41 @@
 
 #include "OrxonoxClass.h"
-#include "OutputHandler.h"
+#include "util/OutputHandler.h"
 
 namespace orxonox

code/branches/core3/src/core/CoreIncludes.h

@@ -46 +46 @@
 #include "Factory.h"
 #include "ClassFactory.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 

code/branches/core3/src/core/CorePrereqs.h

@@ -139 +139 @@
   class ObjectListBaseElement;
   class OrxonoxClass;
-  class OutputBuffer;
-  class OutputBufferListener;
-  class OutputHandler;
   class Shell;
   class ShellListener;

code/branches/core3/src/core/Error.cc

@@ -33 +33 @@
 
 #include "Error.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/Executor.h

@@ -37 +37 @@
 #include "util/Math.h"
 #include "Functor.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 

code/branches/core3/src/core/Factory.cc

@@ -34 +34 @@
 #include "Factory.h"
 #include "Identifier.h"
-#include "Debug.h"
 #include "BaseObject.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/Functor.h

@@ -34 +34 @@
 
 #include "util/MultiTypeMath.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 #define MAX_FUNCTOR_ARGUMENTS 5

code/branches/core3/src/core/Identifier.h

@@ -60 +60 @@
 #include <utility>
 
-#include "Debug.h"
 #include "Iterator.h"
+#include "util/Debug.h"
 #include "util/String.h"
 

code/branches/core3/src/core/Language.cc

@@ -37 +37 @@
 
 #include "Core.h"
-
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/Loader.cc

@@ -33 +33 @@
 #include "Iterator.h"
 #include "ObjectList.h"
-#include "Debug.h"
 #include "CoreIncludes.h"
 #include "Script.h"
 #include "Namespace.h"
+#include "util/Debug.h"
 
 #include "tinyxml/ticpp.h"

code/branches/core3/src/core/MetaObjectList.cc

@@ -33 +33 @@
 
 #include "MetaObjectList.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/NamespaceNode.cc

@@ -28 +28 @@
 
 #include "NamespaceNode.h"
-#include "Debug.h"
+#include "util/Debug.h"
 
 namespace orxonox

code/branches/core3/src/core/Shell.cc

@@ -34 +34 @@
 #include "ConsoleCommand.h"
 #include "input/InputInterfaces.h"
+#include "util/OutputHandler.h"
 
 #define SHELL_UPDATE_LISTENERS(function) \
@@ -43 +44 @@
     SetConsoleCommand(Shell, clearShell, true);
     SetConsoleCommand(Shell, history, true);
+
+    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"  ));
 
     Shell::Shell()

code/branches/core3/src/core/Shell.h

@@ -37 +37 @@
 #include "OrxonoxClass.h"
 #include "input/InputBuffer.h"
-#include "OutputBuffer.h"
+#include "util/OutputBuffer.h"
 
 namespace orxonox

code/branches/core3/src/core/SignalHandler.cc

@@ -36 +36 @@
 #include <assert.h>
 #include <iostream>
-
-#include "Debug.h"
 
 SignalHandler * SignalHandler::singletonRef = NULL;

code/branches/core3/src/core/TclBind.cc

@@ -32 +32 @@
 #include "ConsoleCommand.h"
 #include "CommandExecutor.h"
-#include "Debug.h"
 #include "TclThreadManager.h"
 #include "TclBind.h"
+#include "util/Debug.h"
 #include "util/String.h"
 

code/branches/core3/src/core/TclThreadManager.cc

@@ -38 +38 @@
 #include "ConsoleCommand.h"
 #include "CommandExecutor.h"
-#include "Debug.h"
 #include "TclBind.h"
 #include "TclThreadManager.h"
+#include "util/Debug.h"
 #include "util/Convert.h"
 

code/branches/core3/src/core/XMLPort.h

@@ -32 +32 @@
 #include "CorePrereqs.h"
 
+#include "util/Debug.h"
 #include "util/XMLIncludes.h"
 #include "util/MultiTypeMath.h"
 #include "tinyxml/ticpp.h"
 #include "Executor.h"
-#include "Debug.h"
 #include "CoreIncludes.h"
 #include "BaseObject.h"

code/branches/core3/src/core/input/Button.cc

@@ -36 +36 @@
 #include "util/SubString.h"
 #include "util/String.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/ConsoleCommand.h"
 #include "core/CommandEvaluation.h"

code/branches/core3/src/core/input/InputManager.cc

@@ -39 +39 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Debug.h"
 #include "core/CommandExecutor.h"
 #include "core/ConsoleCommand.h"
 #include "core/Shell.h"               // hack!
+#include "util/Debug.h"
 
 #include "InputBuffer.h"

code/branches/core3/src/core/input/KeyBinder.cc

@@ -36 +36 @@
 #include <string>
 #include "util/Convert.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/ConfigValueIncludes.h"
 #include "core/CoreIncludes.h"

code/branches/core3/src/core/input/KeyDetector.cc

@@ -33 +33 @@
 
 #include "KeyDetector.h"
-#include "core/Debug.h"
+#include "util/Debug.h"
 #include "core/CoreIncludes.h"
 #include "core/CommandExecutor.h"