Changeset 8973 in orxonox.OLD for trunk/src

Timestamp:

Jul 1, 2006, 11:37:42 AM (18 years ago)

Author:

bensch

Message:

trunk: gui: full functionality of Text

Location:

trunk/src

Files:

• defs/class_id.h (modified) (1 diff)
• lib/gui/gl/Makefile.am (modified) (2 diffs)
• lib/gui/gl/glgui_text.cc (modified) (2 diffs)
• lib/gui/gl/glgui_text.h (modified) (1 diff)
• world_entities/elements/glgui_energywidget.cc (modified) (1 diff)
• world_entities/elements/glgui_energywidget.h (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -370 +370 @@
   CL_GLGUI_BAR                  =    0x00000b30,
   CL_GLGUI_CURSOR               =    0x00000b50,
+  CL_GLGUI_TEXT                 =    0x00000b51,
   CL_GLGUI_INPUTLINE            =    0x00000b60,
   CL_GLGUI_TEXTFIELD            =    0x00000b61,

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

@@ -24 +24 @@
                 glgui_box.cc \
                 glgui_frame.cc \
+                glgui_text.cc \
                 glgui_inputline.cc \
                 glgui_textfield.cc \
@@ -51 +52 @@
                 glgui_box.h \
                 glgui_frame.h \
+                glgui_text.h \
                 glgui_inputline.h \
                 glgui_textfield.h \

trunk/src/lib/gui/gl/glgui_text.cc

@@ -36 +36 @@
   */
   GLGuiText::~GLGuiText()
-  {
-  }
+  {}
 
   /**
@@ -44 +43 @@
   void GLGuiText::init()
   {
-    this->setClassID(CL_GLGUI_, "GLGuiText");
+    this->setClassID(CL_GLGUI_TEXT, "GLGuiText");
 
+    this->_text.setParent2D(this);
+    this->_text.setRelCoor2D(4,4);
+    this->_text.setFont("fonts/final_frontier.ttf", 20);
+    this->_text.setColor(foregroundColor());
+    this->_text.setVisibility(false);
+    this->resize();
   }
+
+  /**
+  * @brief sets the Text of the Text
+  * @param text The new Text.
+   */
+  void GLGuiText::setText(const std::string& text)
+  {
+    this->_text.setText(text);
+    this->changedText();
+  }
+
+  /**
+   * @brief appends text to the Text
+   * @param appendText the Text to append
+   */
+  void GLGuiText::append(const std::string& appendText)
+  {
+    this->_text.append(appendText);
+    this->changedText();
+  }
+
+
+  /**
+   * @brief appends a Character to the Text
+   * @param character the Character to append.
+   */
+  void GLGuiText::appendCharacter(char character)
+  {
+    this->_text.appendCharacter(character);
+    this->changedText();
+  }
+
+
+  /**
+   * @brief Removes Characters from the Text
+   * @param chars The count of characters to remove
+   */
+  void GLGuiText::removeCharacters(unsigned int chars)
+  {
+    this->_text.removeCharacters(chars);
+    this->changedText();
+  }
+
+  void GLGuiText::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 GLGuiText::changedText()
+  {
+    this->resize();
+    this->setFrontColor(Color(1,1,1,1), true);
+    emit(this->textChanged(this->_text.text()));
+  }
+
+
+
+  /**
+   * @brief Resizes the Widget to the new Size-constraints.
+   */
+  void GLGuiText::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 GLGuiText::updateFrontColor()
+  {
+    this->_text.setColor(foregroundColor());
+  }
+
+  void GLGuiText::hiding()
+  {
+    this->_text.setVisibility(false);
+  }
+
+  void GLGuiText::showing()
+  {
+    this->_text.setVisibility(true);
+  }
+
+
 
   /**
    * draws the GLGuiText
    */
-  void GLGuiText::draw()
+  void GLGuiText::draw() const
   {
+    this->beginDraw();
+    GLGuiWidget::draw();
+
+    //     this->frontMaterial().select();
+    //     GLGuiWidget::drawRect(this->frontRect());
+
+    this->endDraw();
   }
 }

trunk/src/lib/gui/gl/glgui_text.h

@@ -25 +25 @@
     virtual ~GLGuiText();
 
-    void setText();
+    void setText(const std::string& text);
+    void append(const std::string& appendText);
+    void appendCharacter(char character);
+    void removeCharacters(unsigned int chars);
+    void clear();
 
-    virtual void draw();
+    const std::string& text() const { return _text.text(); };
+
+
+    virtual void draw() const;
+
+    DeclareSignal1(textChanged, const std::string&);
+
+  protected:
+    virtual void updateFrontColor();
+    virtual void hiding();
+    virtual void showing();
+    virtual void resize();
 
   private:
     void init();
+    void changedText();
 
 
   private:
-    Text              text;
+    Text              _text;
   };
 }

trunk/src/world_entities/elements/glgui_energywidget.cc

@@ -27 +27 @@
   {
     //   this->setClassID(CL_PROTO_ID, "GLGuiEnergyWidget");
+
+    this->text.setParent2D(this);
+    this->bar.setParent2D(this);
   }
 

trunk/src/world_entities/elements/glgui_energywidget.h

@@ -18 +18 @@
   {
 
-    public:
+  public:
     GLGuiEnergyWidget();
     virtual ~GLGuiEnergyWidget();
 
+  protected:
+    virtual void resize();
 
-    private:
-      GLGuiBar                bar;
-      GLGuiText               text;
+  private:
+    GLGuiBar                bar;
+    GLGuiText               text;
 
   };