Changeset 6004 for code/branches/console/src/libraries/util/OutputHandler.cc

Timestamp:

Oct 30, 2009, 12:39:51 PM (15 years ago)

Author:

rgrieder

Message:

De-singletonised Shell so that both consoles have their own Shell instance. However they share the history.
Also modified IOConsole to hopefully work with status lines.

File:

• code/branches/console/src/libraries/util/OutputHandler.cc (modified) (3 diffs)

code/branches/console/src/libraries/util/OutputHandler.cc

@@ -93 +93 @@
             this->outputStream_ = &this->logFile_;
             // Use default level until we get the configValue from the Core
-            outputHandler.setSoftDebugLevel(this->getOutputListenerName(), OutputLevel::Debug);
+            this->setSoftDebugLevel(OutputLevel::Debug);
             outputHandler.registerOutputListener(this);
         }
@@ -152 +152 @@
             this->outputStream_ = &this->buffer_;
             // We capture as much input as the listener with the highest level
-            outputHandler.setSoftDebugLevel(this->getOutputListenerName(), OutputHandler::getSoftDebugLevel());
+            this->setSoftDebugLevel(OutputHandler::getSoftDebugLevel());
             outputHandler.registerOutputListener(this);
         }
 
         //! Pushed the just written output to the internal array
-        void outputChanged()
+        void outputChanged(int level)
         {
             // Read ostringstream and store it
-            this->output_.push_back(std::make_pair(OutputHandler::getInstance().getOutputLevel(), this->buffer_.str()));
+            this->output_.push_back(std::make_pair(level, this->buffer_.str()));
             // Clear content and flags
             this->buffer_.str(std::string());
@@ -210 +210 @@
         }
         this->listeners_.push_back(listener);
+        // Update global soft debug level
+        this->setSoftDebugLevel(listener->getOutputListenerName(), listener->getSoftDebugLevel());
     }