Changeset 6180 for code/branches/presentation2/src/libraries/core/Shell.cc

Timestamp:

Nov 29, 2009, 10:43:43 PM (14 years ago)

Author:

rgrieder

Message:

Extended Shell line colouring in order to distinguish output from COUT, entered commands and hints.

File:

• code/branches/presentation2/src/libraries/core/Shell.cc (modified) (9 diffs)

code/branches/presentation2/src/libraries/core/Shell.cc

@@ -45 +45 @@
     SetConsoleCommandShortcut(OutputHandler, debug);
 
-    Shell::Shell(const std::string& consoleName, bool bScrollable, bool bPrependOutputLevel)
+    Shell::Shell(const std::string& consoleName, bool bScrollable)
         : OutputListener(consoleName)
         , inputBuffer_(new InputBuffer())
         , consoleName_(consoleName)
-        , bPrependOutputLevel_(bPrependOutputLevel)
         , bScrollable_(bScrollable)
     {
@@ -191 +190 @@
     }
 
-    void Shell::addOutputLine(const std::string& line, int level)
+    void Shell::addOutputLine(const std::string& line, LineType type)
     {
         // Make sure we really only have one line per line (no new lines!)
@@ -197 +196 @@
         for (unsigned i = 0; i < lines.size(); ++i)
         {
-            if (level <= this->softDebugLevel_)
-                this->outputLines_.push_front(lines[i]);
+            this->outputLines_.push_front(std::make_pair(lines[i], type));
             this->updateListeners<&ShellListener::lineAdded>();
         }
@@ -214 +212 @@
     }
 
-    std::list<std::string>::const_iterator Shell::getNewestLineIterator() const
+    Shell::LineList::const_iterator Shell::getNewestLineIterator() const
     {
         if (this->scrollPosition_)
@@ -222 +220 @@
     }
 
-    std::list<std::string>::const_iterator Shell::getEndIterator() const
+    Shell::LineList::const_iterator Shell::getEndIterator() const
     {
         return this->outputLines_.end();
@@ -264 +262 @@
             if (this->bFinishedLastLine_)
             {
-                if (this->bPrependOutputLevel_)
-                {
-                    if (level == 0)
-                        output.insert(0, 1, static_cast<char>(-1));
-                    else
-                        output.insert(0, 1, static_cast<char>(level));
-                }
-
-                this->outputLines_.push_front(output);
+                this->outputLines_.push_front(std::make_pair(output, static_cast<LineType>(level)));
 
                 if (this->scrollPosition_)
@@ -288 +278 @@
             else
             {
-                (*this->outputLines_.begin()) += output;
+                this->outputLines_.front().first += output;
                 this->bFinishedLastLine_ = newline;
                 this->updateListeners<&ShellListener::onlyLastLineChanged>();
@@ -325 +315 @@
 
         if (!CommandExecutor::execute(this->inputBuffer_->get()))
-            this->addOutputLine("Error: Can't execute \"" + this->inputBuffer_->get() + "\".", 1);
+            this->addOutputLine("Error: Can't execute \"" + this->inputBuffer_->get() + "\".", Error);
 
         this->clearInput();
@@ -333 +323 @@
     {
         this->inputBuffer_->set(CommandExecutor::complete(this->inputBuffer_->get()));
-        this->addOutputLine(CommandExecutor::hint(this->inputBuffer_->get()), -1);
+        this->addOutputLine(CommandExecutor::hint(this->inputBuffer_->get()), Hint);
 
         this->inputChanged();