Changeset 8614 in orxonox.OLD for branches

Timestamp:

Jun 20, 2006, 11:51:17 AM (18 years ago)

Author:

bensch

Message:

gui: added table

Location:

branches/gui/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/gui/gl/Makefile.am (modified) (2 diffs)
• lib/gui/gl/glgui_table.cc (copied) (copied from branches/gui/src/lib/gui/gl/glgui_inputline.cc) (6 diffs)
• lib/gui/gl/glgui_table.h (copied) (copied from branches/gui/src/lib/gui/gl/glgui_inputline.h) (3 diffs)

branches/gui/src/defs/class_id.h

@@ -363 +363 @@
   CL_GLGUI_TEXTFIELD            =    0x00000b61,
   CL_GLGUI_IMAGE                =    0x00000b70,
+  CL_GLGUI_TABLE                =    0x00000b71,
 
   CL_GLGUI_NOTIFIER             =    0x00000b80,

branches/gui/src/lib/gui/gl/Makefile.am

@@ -26 +26 @@
                 glgui_inputline.cc \
                 glgui_textfield.cc \
+                glgui_table.cc \
                 glgui_image.cc \
                 glgui_window.cc \
@@ -52 +53 @@
                 glgui_inputline.h \
                 glgui_textfield.h \
+                glgui_table.h \
                 glgui_image.h \
                 glgui_window.h \

branches/gui/src/lib/gui/gl/glgui_table.cc

@@ -16 +16 @@
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_GUI
 
-#include "glgui_inputline.h"
+#include "glgui_table.h"
 
 namespace OrxGui
@@ -23 +23 @@
    * @brief standard constructor
    */
-  GLGuiInputLine::GLGuiInputLine ()
+  GLGuiTable::GLGuiTable ()
   {
     this->init();
@@ -32 +32 @@
    * @brief standard deconstructor
    */
-  GLGuiInputLine::~GLGuiInputLine()
+  GLGuiTable::~GLGuiTable()
   {}
-
-  float GLGuiInputLine::repeatDelay = 0.3f;
-  float GLGuiInputLine::repeatRate  = 0.01f;
-
 
   /**
    * @brief initializes the GUI-element
    */
-  void GLGuiInputLine::init()
+  void GLGuiTable::init()
   {
-    this->setClassID(CL_GLGUI_INPUTLINE, "GLGuiInputLine");
+    this->setClassID(CL_GLGUI_TABLE, "GLGuiTable");
 
     this->setFocusable(true);
+    this->setClickable(true);
 
-    this->_clearOnEnter = false;
-    this->_text.setParent2D(this);
-    this->_text.setRelCoor2D(4,4);
-    this->_text.setFont("fonts/final_frontier.ttf", 20);
-    this->_text.setLineWidth(400);
-    this->_text.setDotsPosition(LimitedWidthText::Begin);
-    this->_text.setColor(foregroundColor());
-    this->_text.setVisibility(false);
     this->resize();
-
-    this->delayNext = 0.0;
-    this->pressedKey = SDLK_FIRST;
-    this->pressedKeyName = SDLK_FIRST;
-
   }
 
 
-  /**
-   * @brief sets the Text of the InputLine
-   * @param text The new Text.
-   */
-  void GLGuiInputLine::setText(const std::string& text)
+  void GLGuiTable::setRowCount(unsigned int rowCount)
   {
-    this->_text.setText(text);
-    this->changedText();
+    this->_headers.resize(rowCount);
+    for (unsigned int i = 0; i < rowCount; i++)
+      this->_entries[i].resize(rowCount);
+
+    if (!this->isVisible())
+      this->hiding();
   }
 
-  /**
-   * @brief appends text to the InputLine
-   * @param appendText the Text to append
-   */
-  void GLGuiInputLine::append(const std::string& appendText)
+  void GLGuiTable::setColumnCount(unsigned int columnCount)
   {
-    this->_text.append(appendText);
-    this->changedText();
+    this->_entries.resize(columnCount);
+    if (!this->isVisible())
+      this->hiding();
   }
 
 
-  /**
-   * @brief appends a Character to the InputLine
-   * @param character the Character to append.
-   */
-  void GLGuiInputLine::appendCharacter(char character)
-  {
-    this->_text.appendCharacter(character);
-    this->changedText();
-  }
-
-
-  /**
-   * @brief Removes Characters from the InputLine
-   * @param chars The count of characters to remove
-   */
-  void GLGuiInputLine::removeCharacters(unsigned int chars)
-  {
-    this->_text.removeCharacters(chars);
-    this->changedText();
-  }
-
-  void GLGuiInputLine::clear()
-  {
-    this->_text.clear();
-    this->changedText();
-  }
-
-  /**
-   * @brief If the Text has been changed this function is called.
-   *
-   * This Function also emits the Signal textChanged.
-   */
-  void GLGuiInputLine::changedText()
-  {
-    this->resize();
-    this->setFrontColor(Color(1,1,1,1), true);
-    emit(this->textChanged(this->_text.text()));
-  }
 
 
@@ -129 +72 @@
    * removes the focus from this Widget.
    */
-  void GLGuiInputLine::removedFocus()
+  void GLGuiTable::removedFocus()
   {
     GLGuiWidget::removedFocus();
-    this->pressedKey = 0;
-    this->pressedKeyName = 0;
   }
 
-  /**
-   * @brief handles the EnterPush-Event.
-   *
-   * Emmits th EnterPushed Signal with the current Line,
-   * and if _clearOnEnter is pushed clears the Line.
-   */
-  void GLGuiInputLine::pushEnter()
-  {
-    emit(this->enterPushed(this->_text.text()));
-    if (this->_clearOnEnter)
-      this->clear();
-  }
 
 
@@ -155 +84 @@
    * @return true if the event was catched.
    */
-  bool GLGuiInputLine::processEvent(const Event& event)
+  bool GLGuiTable::processEvent(const Event& event)
   {
-    if (event.bPressed)
-    {
-      if (event.type == SDLK_BACKSPACE)
-      {
-        this->delayNext = GLGuiInputLine::repeatDelay;
-        this->pressedKey = SDLK_BACKSPACE;
-        this->pressedKeyName = SDLK_BACKSPACE;
-        this->removeCharacters(1);
-        return true;
-      }
-      else if(event.type == SDLK_RETURN || event.type == SDLK_KP_ENTER)
-      {
-        this->pushEnter();
-        return true;
-      }
-      // any other keyboard key
-      else if (likely(event.type < 127))
-      {
-        this->delayNext = GLGuiInputLine::repeatDelay;
-
-        this->appendCharacter(event.x);
-        this->pressedKey = event.type;
-        this->pressedKeyName = event.x;
-        return true;
-      }
-    }
-    else // if(!event.bPressed)
-    {
-      if (this->pressedKey == event.type)
-      {
-        this->pressedKeyName = 0;
-        this->pressedKey = 0;
-        this->delayNext = 0.0;
-        return true;
-      }
-    }
     return false;
   }
@@ -200 +93 @@
    * @brief Resizes the Widget to the new Size-constraints.
    */
-  void GLGuiInputLine::resize()
+  void GLGuiTable::resize()
   {
-    this->_text.setRelCoor2D(borderLeft(), borderTop());
-    this->setSize2D( this->_text.getSize2D() + Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));
     GLGuiWidget::resize();
-    /*    this->frontRect().setTopLeft(borderLeft(), borderTop());
-        this->frontRect().setSize(this->getSize2D() - Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));*/
   }
 
-  void GLGuiInputLine::updateFrontColor()
+  void GLGuiTable::updateFrontColor()
   {
-    this->_text.setColor(foregroundColor());
+    for (unsigned int i = 0; i < this->rowCount(); ++i)
+    {
+      this->_headers[i].setColor(this->foregroundColor());
+      for (unsigned int j = 0; j < this->columnCount(); ++j)
+        this->_entries[i][j].setColor(this->foregroundColor());
+    }
   }
 
-  void GLGuiInputLine::hiding()
+  void GLGuiTable::hiding()
   {
-    this->_text.setVisibility(false);
+    for (unsigned int i = 0; i < this->rowCount(); ++i)
+    {
+      this->_headers[i].setVisibility(false);
+      for (unsigned int j = 0; j < this->columnCount(); ++j)
+        this->_entries[i][j].setVisibility(false);
+    }
   }
 
-  void GLGuiInputLine::showing()
+  void GLGuiTable::showing()
   {
-    this->_text.setVisibility(true);
+    for (unsigned int i = 0; i < this->rowCount(); ++i)
+    {
+      this->_headers[i].setVisibility(true);
+      for (unsigned int j = 0; j < this->columnCount(); ++j)
+        this->_entries[i][j].setVisibility(true);
+    }
   }
 
   /**
-   * @brief ticks the InputLine
+   * @brief ticks the Table
    * @param dt the time passed.
    */
-  void GLGuiInputLine::tick(float dt)
+  void GLGuiTable::tick(float dt)
   {
-    GLGuiWidget::tick(dt);
-    if (this->delayNext > 0.0)
-      this->delayNext -= dt;
-    else if (this->pressedKey != SDLK_FIRST )
-    {
-      this->delayNext = GLGuiInputLine::repeatRate;
-      switch (this->pressedKey)
-      {
-        case SDLK_BACKSPACE:
-          this->removeCharacters(1);
-          break;
-        default:
-          {
-            if (likely(this->pressedKey < 127))
-              this->appendCharacter(this->pressedKeyName);
-          }
-      }
-    }
-
-
   }
 
   /**
-   * @brief draws the GLGuiInputLine
+   * @brief draws the GLGuiTable
    */
-  void GLGuiInputLine::draw() const
+  void GLGuiTable::draw() const
   {
     this->beginDraw();

branches/gui/src/lib/gui/gl/glgui_table.h

@@ -1 +1 @@
 /*!
- * @file glgui_inputline.h
- * The gl_INPUTLINE widget of th openglGUI
+ * @file glgui_table.h
+ * The gl_TABLE widget of th openglGUI
  *
  */
 
-#ifndef _GLGUI_INPUTLINE_H
-#define _GLGUI_INPUTLINE_H
+#ifndef _GLGUI_TABLE_H
+#define _GLGUI_TABLE_H
 
 #include "glgui_widget.h"
@@ -16 +16 @@
 {
 
-  //! This is InputLine part of the openglGUI class
+  //! This is Table part of the openglGUI class
   /**
-   * The InputLine is a Widget, that displays a Line, that can be manipulated through
+   * The Table is a Widget, that displays a Line, that can be manipulated through
    * Writing Text on it.
    *
    * Whenever the Text is changed the textChanged signal is emitted.
    */
-  class GLGuiInputLine : public OrxGui::GLGuiWidget
+  class GLGuiTable : public OrxGui::GLGuiWidget
   {
 
   public:
-    GLGuiInputLine();
-    virtual ~GLGuiInputLine();
+    GLGuiTable();
+    virtual ~GLGuiTable();
 
+    unsigned int columnCount() const { return this->_headers.size(); };
+    unsigned int rowCount() const { return this->_entries.size(); };
+    //const std::vector<std::string>& headers() const { return this->_headers; };
+    //const std::vector<std::vector<std::string> >& entries() const { return this->_entries; };
 
-    /** @returns the text of the inputLine */
-    const std::string& _getText() const { return this->_text.text(); };
+    void setRowCount(unsigned int rowCount);
+    void setColumnCount(unsigned int columnCount);
 
-    void setText(const std::string& text);
-    void append(const std::string& appendText);
-    void appendCharacter(char character);
-    void removeCharacters(unsigned int chars);
-    void clear();
+    void setHeader(unsigned int number, const std::string& headerName);
+    void setHeader(const std::vector<std::string>& headerNames);
 
-    void clearOnEnter(bool clear = true) { this->_clearOnEnter = clear; };
+    void setEntry(unsigned int column, unsigned int rowNumber, const std::string& name);
 
-    virtual void removedFocus();
+    void setColumnWidth(unsigned int column, float size);
+    void setRowSize(unsigned int row, unsigned int size);
 
     virtual void tick(float dt);
     virtual void draw() const;
 
-    virtual bool processEvent(const Event& event);
-
-    DeclareSignal1(textChanged, const std::string&);
-    DeclareSignal1(enterPushed, const std::string&);
 
   protected:
+    virtual void removedFocus();
+
     virtual void updateFrontColor();
     virtual void hiding();
@@ -58 +58 @@
     virtual void resize();
 
+    virtual bool processEvent(const Event& event);
+
 
   private:
     void init();
-    void pushEnter();
-    void changedText();
+
+  private:
+    typedef std::vector<LimitedWidthText> TableTextList;
+    TableTextList                _headers;
+    std::vector<TableTextList>   _entries;     //!< inner is by column, outer is by row.
 
 
-  private:
-    LimitedWidthText        _text;            //!< The Text to display inside of the InputLine.
-    bool                    _clearOnEnter;    //!< Clear on Enter
-
-    Uint16                  pressedKey;       //!< the pressed key that will be repeated.
-    Uint16                  pressedKeyName;   //!< The Name of the Key, that was pressed.
-
-    float                   delayNext;        //!< How much time must pass before next output.
-
-    static float            repeatDelay;      //!< Repead Delay.
-    static float            repeatRate;       //!< Repeat Rate.
   };
 }
 
-#endif /* _GLGUI_INPUTLINE_H */
+#endif /* _GLGUI_TABLE_H */