Changeset 7316 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

Apr 17, 2006, 1:49:05 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Element2D uses Vector2D instead of Vector whenever possible

Location:

trunk/src/lib/shell

Files:

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

trunk/src/lib/shell/shell.cc

@@ -128 +128 @@
   EventHandler::getInstance()->withUNICODE(true);
 
-  this->setRelCoorSoft2D(0, 0, 1, 5);
+  this->setRelCoorSoft2D(0, 0, 5);
 
   list<std::string>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer().end();
@@ -157 +157 @@
   EventHandler::getInstance()->popState();
 
-  this->setRelCoorSoft2D(0, -(int)this->shellHeight, 1, 5);
+  this->setRelCoorSoft2D(0, -(int)this->shellHeight, 5);
 
   list<std::string>::const_iterator textLine = --ShellBuffer::getInstance()->getBuffer().end();
@@ -370 +370 @@
     lastText->setRelDir2D(-90);
     lastText->setRelDirSoft2D(0, 20);
-    lastText->setRelCoor2D(this->calculateLinePosition(0)- Vector(-1000,0,0));
+    lastText->setRelCoor2D(this->calculateLinePosition(0)- Vector2D(-1000,0));
     lastText->setRelCoorSoft2D(this->calculateLinePosition(0),10);
 
@@ -493 +493 @@
 
 /**
- * calculates the position of a Buffer-Display Line
+ * @brief calculates the position of a Buffer-Display Line
  * @param lineNumber the lineNumber from the bottom to calculate the position from
  * @returns the Position of the Line.
  */
-Vector Shell::calculateLinePosition(unsigned int lineNumber)
-{
-  return Vector(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize - lineNumber - 2) + this->textSize, 0);
-}
-
-
-
-/**
- * displays some nice output from the Shell
+Vector2D Shell::calculateLinePosition(unsigned int lineNumber)
+{
+  return Vector2D(5, (this->textSize + this->lineSpacing)*(this->bufferDisplaySize - lineNumber - 2) + this->textSize);
+}
+
+
+
+/**
+ * @brief displays some nice output from the Shell
  */
 void Shell::debug() const

trunk/src/lib/shell/shell.h

@@ -80 +80 @@
   private:
     // helpers //
-    Vector calculateLinePosition(unsigned int lineNumber);
+    Vector2D calculateLinePosition(unsigned int lineNumber);
 
     //     void testI (int i);

trunk/src/lib/shell/shell_buffer.cc

@@ -26 +26 @@
 
 /**
- * standard constructor
+ * @brief standard constructor
  */
 ShellBuffer::ShellBuffer ()
@@ -45 +45 @@
 
 /**
- * standard deconstructor
+ * @brief standard deconstructor
  */
 ShellBuffer::~ShellBuffer ()
@@ -62 +62 @@
 
 /**
- * registers the Shell to the Buffer
+ * @brief registers the Shell to the Buffer
  * @param shell the Shell to register.
  */
@@ -74 +74 @@
 
 /**
- * unregisters the Shell from the Buffer
+ * @brief unregisters the Shell from the Buffer
  * @param shell the Shell to unregister.
  */
@@ -86 +86 @@
 
 /**
- * deletes all the Buffers
+ * @brief deletes all the Buffers
  */
 void ShellBuffer::flush()
@@ -94 +94 @@
 
 /**
- * adds a new Line to the List of Buffers
+ * @brief adds a new Line to the List of Buffers
  * @param line the Line as in the first argument in printf
  */
@@ -121 +121 @@
 
 /**
- * add a Line to the List of Buffers
+ * @brief add a Line to the List of Buffers
  * @param line
  * @param arguments