Changeset 5176 in orxonox.OLD

Timestamp:

Sep 12, 2005, 12:18:25 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: More clean-up

Location:

trunk/src/lib/shell

Files:

• shell.cc (modified) (1 diff)
• shell.h (modified) (2 diffs)
• shell_buffer.cc (modified) (2 diffs)
• shell_buffer.h (modified) (2 diffs)

trunk/src/lib/shell/shell.cc

@@ -433 +433 @@
   }
 }
-
 /**
  * displays the Shell

trunk/src/lib/shell/shell.h

@@ -40 +40 @@
     inline static Shell* getInstance() { if (!Shell::singletonRef) Shell::singletonRef = new Shell();  return Shell::singletonRef; };
     /** @returns true if this class is instanciated, false otherwise */
-    inline static bool isInstanciated() { return (Shell::singletonRef == NULL)?true:false; };
+    inline static bool isInstanciated() { return (Shell::singletonRef == NULL)?false:true; };
 
     void activate();
     void deactivate();
+    inline bool isActive() const { return this->bActive; };
 
     void setTextSize(unsigned int textSize, unsigned int lineSpacing = 1);
@@ -49 +50 @@
 
     // BUFFERS
+    void flush();
     void setBufferDisplaySize(unsigned int bufferDisplaySize);
-    void flush();
     void printToDisplayBuffer(const char* text);
 

trunk/src/lib/shell/shell_buffer.cc

@@ -70 +70 @@
   {
     delete charElem;
-
     charElem = bufferIterator->nextElement();
   }
@@ -149 +148 @@
     strcpy(addLine, newLineBegin);
 
+    this->lineCount++;
     this->buffer->add(addLine);
-    this->lineCount++;
+    if (Shell::isInstanciated() && Shell::getInstance()->isActive())
+      Shell::getInstance()->printToDisplayBuffer(addLine);
 
     if (this->buffer->getSize() > this->bufferSize)

trunk/src/lib/shell/shell_buffer.h

@@ -26 +26 @@
   inline static ShellBuffer* getInstance() { if (!ShellBuffer::singletonRef) ShellBuffer::singletonRef = new ShellBuffer();  return ShellBuffer::singletonRef; };
   /** @returns true if this class is instanciated, false otherwise */
-  inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?true:false; };
+  inline static bool isInstanciated() { return (ShellBuffer::singletonRef == NULL)?false:true; };
 
   // BUFFER //
@@ -37 +37 @@
 // void moveBufferTo(unsigned int lineNumber);
   const char* getBufferLine(unsigned int lineNumber);
-  inline tIterator<char>*  getBufferIterator() const { return bufferIterator; };
+  /** @returns the Buffer Iterator, that enables externals to walk through the Buffer */
+  inline tIterator<char>* getBufferIterator() const { return bufferIterator; };
+  /** @returns the Count of lines processed by the Shell.
+  inline long getLineCount() const { return this->lineCount; };
 
   private: