Changeset 6375

Timestamp:

Dec 18, 2009, 12:11:16 AM (14 years ago)

Author:

rgrieder

Message:

Fixed a problem with output being written directly to the Shell.
Use Shell::addOutput instead of Shell:addOutputLine now and include a new line if you want to print a whole line.

Location:

code/branches/presentation2/src

Files:

• libraries/core/IOConsole.cc (modified) (3 diffs)
• libraries/core/Shell.cc (modified) (5 diffs)
• libraries/core/Shell.h (modified) (1 diff)
• orxonox/overlays/InGameConsole.cc (modified) (1 diff)

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

@@ -60 +60 @@
     void IOConsole::executed()
     {
-        this->shell_->addOutputLine(this->promptString_ + this->shell_->getInput(), Shell::Command);
+        this->shell_->addOutput(this->promptString_ + this->shell_->getInput() + '\n', Shell::Command);
     }
 
@@ -509 +509 @@
         std::cout.flush();
         if (!this->origCout_.str().empty())
-            this->shell_->addOutputLine(this->origCout_.str(), Shell::None);
+            this->shell_->addOutput(this->origCout_.str(), Shell::None);
 
         this->shell_->unregisterListener(this);
@@ -602 +602 @@
         if (!this->origCout_.str().empty())
         {
-            this->shell_->addOutputLine(this->origCout_.str(), Shell::None);
+            this->shell_->addOutput(this->origCout_.str(), Shell::None);
             this->origCout_.str("");
         }

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

@@ -189 +189 @@
     }
 
-    void Shell::addOutputLine(const std::string& line, LineType type)
-    {
-        // Make sure we really only have one line per line (no new lines!)
-        SubString lines(line, '\n');
-        for (unsigned i = 0; i < lines.size(); ++i)
-        {
-            this->outputLines_.push_front(std::make_pair(lines[i], type));
-
-            if (this->scrollPosition_)
-                this->scrollPosition_++;
-            else
-                this->scrollIterator_ = this->outputLines_.begin();
-
-            this->bFinishedLastLine_ = true;
-            if (!this->scrollPosition_)
-                this->updateListeners<&ShellListener::lineAdded>();
-        }
+    void Shell::addOutput(const std::string& text, LineType type)
+    {
+        this->outputBuffer_ << text;
+        this->outputChanged(type);
     }
 
@@ -248 +235 @@
     }
 
-    void Shell::outputChanged(int level)
+    void Shell::outputChanged(int lineType)
     {
         bool newline = false;
@@ -268 +255 @@
 
             if (this->bFinishedLastLine_)
-                this->addOutputLine(output, static_cast<LineType>(level));
+            {
+                this->outputLines_.push_front(std::make_pair(output, static_cast<LineType>(lineType)));
+
+                if (this->scrollPosition_)
+                    this->scrollPosition_++;
+                else
+                    this->scrollIterator_ = this->outputLines_.begin();
+
+                this->bFinishedLastLine_ = newline;
+
+                if (!this->scrollPosition_)
+                    this->updateListeners<&ShellListener::lineAdded>();
+            }
             else
             {
                 this->outputLines_.front().first += output;
+                this->bFinishedLastLine_ = newline;
                 this->updateListeners<&ShellListener::onlyLastLineChanged>();
             }
@@ -308 +308 @@
 
         if (!CommandExecutor::execute(this->inputBuffer_->get()))
-            this->addOutputLine("Error: Can't execute \"" + this->inputBuffer_->get() + "\".", Error);
+        {
+            this->outputBuffer_ << "Error: Can't execute \"" << this->inputBuffer_->get() << "\"." << std::endl;
+            this->outputChanged(Error);
+        }
 
         this->clearInput();
@@ -316 +319 @@
     {
         this->inputBuffer_->set(CommandExecutor::complete(this->inputBuffer_->get()));
-        this->addOutputLine(CommandExecutor::hint(this->inputBuffer_->get()), Hint);
+        this->outputBuffer_ << CommandExecutor::hint(this->inputBuffer_->get()) << std::endl;
+        this->outputChanged(Hint);
 
         this->inputChanged();

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

@@ -103 +103 @@
             LineList::const_iterator getEndIterator() const;
 
-            void addOutputLine(const std::string& line, LineType type = None);
+            void addOutput(const std::string& text, LineType type = None);
             void clearOutput();
 

code/branches/presentation2/src/orxonox/overlays/InGameConsole.cc

@@ -340 +340 @@
     void InGameConsole::executed()
     {
-        this->shell_->addOutputLine(this->shell_->getInput(), Shell::Command);
+        this->shell_->addOutput(this->shell_->getInput() + '\n', Shell::Command);
     }