Changeset 8629 in orxonox.OLD for branches

Timestamp:

Jun 20, 2006, 2:29:37 PM (18 years ago)

Author:

bensch

Message:

orxonox/gui: rasterized (strange look, but ok)

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_table.cc (modified) (11 diffs)
• glgui_table.h (modified) (2 diffs)

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

@@ -27 +27 @@
   {
     this->init();
+
     this->setRowCount(rows);
     this->setColumnCount(columns);
@@ -47 +48 @@
     this->setFocusable(true);
     this->setClickable(true);
-
-    this->resize();
   }
 
@@ -56 +55 @@
 
     unsigned int currentRowCount = this->rowCount();
+
+    this->_rowHeights.resize(rowCount, 20);
+
     this->_entries.resize(rowCount);
     for (unsigned int i = currentRowCount; i < this->rowCount(); ++i)
@@ -66 +68 @@
     assert(this->checkIntegrity());
     this->repositionText(currentRowCount, 0);
+
+
+    this->resize();
 
     if (!this->isVisible())
@@ -94 +99 @@
     this->repositionText(0, currentColumnCount);
 
+    this->resize();
     if (!this->isVisible())
       this->hiding();
@@ -134 +140 @@
   /// TODO.
   void GLGuiTable::setRowHeight(unsigned int row, unsigned int size)
-  {}
+{}
 
 
@@ -165 +171 @@
   void GLGuiTable::resize()
   {
+    Vector2D size;
+    unsigned int i;
+    for(i = 0; i < this->columnCount(); ++i)
+      size.x += this->_columnWidths[i];
+
+    for(i = 0; i < this->rowCount(); ++i)
+      size.y += this->_rowHeights[i];
+
+    this->setSize2D(size);
+    this->setSize2D( size + Vector2D(borderLeft() + borderRight(), borderTop() + borderBottom()));
+
     GLGuiWidget::resize();
   }
@@ -176 +193 @@
         this->_entries[j][i].setColor(this->foregroundColor());
     }
+
   }
 
@@ -214 +232 @@
     GLGuiWidget::draw();
 
+    float columnPos = 0.0f;
+    float rowPos = 0.0f;
+
+    unsigned int i;
+    glColor4fv(&this->foregroundColor()[0]);
+    glLineWidth(1.5);
+    glBegin(GL_LINES);
+
+    glVertex2f(0, 0);
+    glVertex2f(0, this->getSizeY2D());
+    for (i = 0; i < this->columnCount(); ++i)
+    {
+      columnPos +=this->_columnWidths[i];
+      glVertex2f(columnPos, 0);
+      glVertex2f(columnPos, this->getSizeY2D());
+    }
+
+    glVertex2f(0, 0);
+    glVertex2f(this->getSizeX2D(), 0);
+    for (i = 0; i < this->rowCount(); ++i)
+    {
+      rowPos +=this->_rowHeights[i];
+      glVertex2f(0, rowPos);
+      glVertex2f(this->getSizeX2D(), rowPos);
+    }
+
+
+    glEnd();
     //     this->frontMaterial().select();
     //     GLGuiWidget::drawRect(this->frontRect());
@@ -224 +270 @@
   {
     float columnPos = 0.0f;
-    float rowPos;
+    float rowPos = 0.0f;
     unsigned int i, j;
     for (i = 0; i< fromLeft; ++i)
-    {
       columnPos+=this->_columnWidths[i];
-    }
+    for (i = 0; i < fromTop; ++i)
+      rowPos += this->_rowHeights[i];
 
     for (i = fromLeft; i < this->columnCount(); ++i)
@@ -238 +284 @@
       this->_headers[i].setLineWidth(_columnWidths[i]);
 
-      rowPos = 10.0f;
+      float rowPosI = rowPos;
       for (j = fromTop; j < this->rowCount(); ++j)
       {
-        this->_entries[j][i].setRelCoor2D(columnPos, rowPos);
+        this->_entries[j][i].setRelCoor2D(columnPos, rowPosI);
         this->_entries[j][i].setLineWidth(_columnWidths[i]);
-        rowPos += 10.0f;
+        rowPosI += _rowHeights[j];
       }
       columnPos+=this->_columnWidths[i];

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

@@ -60 +60 @@
     virtual bool processEvent(const Event& event);
 
-
   private:
     void init();
@@ -72 +71 @@
     TableTextList                _headers;
     std::vector<float>           _columnWidths;
+    std::vector<float>           _rowHeights;
 
     std::vector<TableTextList>   _entries;     //!< inner is by column, outer is by row.