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

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.h (modified) (4 diffs)

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

@@ -65 +65 @@
     {
         public:
-            Shell(const std::string& consoleName, bool bScrollable, bool bPrependOutputLevel = false);
+            enum LineType
+            {
+                None    = OutputLevel::None,
+                Warning = OutputLevel::Warning,
+                Error   = OutputLevel::Error,
+                Info    = OutputLevel::Info,
+                Debug   = OutputLevel::Debug,
+                Verbose = OutputLevel::Verbose,
+                Ultra   = OutputLevel::Ultra,
+                Input,
+                Command,
+                Hint
+            };
+
+            Shell(const std::string& consoleName, bool bScrollable);
             ~Shell();
 
@@ -85 +99 @@
                 { return this->inputBuffer_->get(); }
 
-            std::list<std::string>::const_iterator getNewestLineIterator() const;
-            std::list<std::string>::const_iterator getEndIterator() const;
+            typedef std::list<std::pair<std::string, LineType> > LineList;
+            LineList::const_iterator getNewestLineIterator() const;
+            LineList::const_iterator getEndIterator() const;
 
-            void addOutputLine(const std::string& line, int level = 0);
+            void addOutputLine(const std::string& line, LineType type = None);
             void clearOutput();
 
@@ -139 +154 @@
             std::stringstream         outputBuffer_;
             bool                      bFinishedLastLine_;
-            std::list<std::string>    outputLines_;
-            std::list<std::string>::const_iterator scrollIterator_;
+            LineList                  outputLines_;
+            LineList::const_iterator  scrollIterator_;
             unsigned int              scrollPosition_;
             unsigned int              historyPosition_;
@@ -147 +162 @@
             std::string               promptPrefix_;
             const std::string         consoleName_;
-            const bool                bPrependOutputLevel_;
             const bool                bScrollable_;