Changeset 5247 in orxonox.OLD for trunk

Timestamp:

Sep 24, 2005, 9:27:48 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed an error in ShellDisplay: did not show the last line on first open

Location:

trunk/src/lib

Files:

• shell/shell.cc (modified) (2 diffs)
• shell/shell.h (modified) (2 diffs)
• util/list.h (modified) (1 diff)

trunk/src/lib/shell/shell.cc

@@ -109 +109 @@
   bufferIT->lastElement();
   for (int i = 0; i < this->bufferDisplaySize; i++)
-    this->bufferText[i]->setText(bufferIT->prevElement(), true);
+  {
+    this->bufferText[i]->setText(bufferIT->getCurrent(), true);
+    bufferIT->prevStep();
+  }
   delete bufferIT;
 }
@@ -128 +131 @@
   bufferIT->lastElement();
   for (int i = 0; i < this->bufferDisplaySize; i++)
-    this->bufferText[i]->setText(bufferIT->prevElement(), false);
+  {
+    this->bufferText[i]->setText(bufferIT->getCurrent(), true);
+    bufferIT->prevStep();
+  }
   delete bufferIT;
 }

trunk/src/lib/shell/shell.h

@@ -18 +18 @@
 class Text;
 class ShellInput;
-class ShellCommandBase;
-template<class T> class tList;
 template<class T> class tIterator;
 
@@ -94 +92 @@
     Text**                   bufferText;             //!< A list of stored bufferTexts for the display of the buffer.
     int                      bufferOffset;           //!< how many lines from the bottom up we display the Buffer.
+    tIterator<char>*         bufferIterator;         //!< used to move through and print the Buffer
 };
 

trunk/src/lib/util/list.h

@@ -563 +563 @@
     inline T* tIterator<T>::getCurrent()
 {
-  if (likeley(this->tmpEl))
+  if (likely(this->tmpEl != NULL))
     return this->tmpEl->curr;
   else