Changeset 8626 in orxonox.OLD

Timestamp:

Jun 20, 2006, 1:57:33 PM (18 years ago)

Author:

bensch

Message:

repositioning Text

Location:

branches/gui/src/lib/gui/gl

Files:

• glgui_table.cc (modified) (8 diffs)
• glgui_table.h (modified) (3 diffs)

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

@@ -65 +65 @@
 
     assert(this->checkIntegrity());
-    this->debug();
+    this->repositionText(currentRowCount, 0);
 
     if (!this->isVisible())
@@ -75 +75 @@
     unsigned int i;
     unsigned int currentColumnCount = this->columnCount();
+
+    this->_columnWidths.resize(columnCount, 100);
 
     // setup Headers.
@@ -89 +91 @@
     }
     assert(this->checkIntegrity());
-    this->debug();
+
+    this->repositionText(0, currentColumnCount);
 
     if (!this->isVisible())
@@ -111 +114 @@
   }
 
-  void GLGuiTable::setEntry(unsigned int column, unsigned int row, const std::string& name)
+  void GLGuiTable::setEntry(unsigned int row, unsigned int column, const std::string& name)
   {
     if (column >= this->columnCount() )
@@ -125 +128 @@
     for (unsigned int i = 0; i < this->rowCount(); ++i)
       this->_entries[i][column].setLineWidth(size);
-
-  }
+  }
+
+
 
   /// TODO.
   void GLGuiTable::setRowHeight(unsigned int row, unsigned int size)
-{}
+  {}
 
 
@@ -217 +221 @@
 
 
+  void GLGuiTable::repositionText(unsigned int fromLeft, unsigned int fromTop)
+  {
+    float columnPos = 0.0f;
+    unsigned int i, j;
+    for (i = 0; i< fromLeft; ++i)
+    {
+      columnPos+=this->_columnWidths[i];
+    }
+
+    for (i = fromLeft; i < this->columnCount(); ++i)
+    {
+      this->_headers[i].setRelCoor2D(columnPos, 0);
+
+      for (j = fromTop; j < this->rowCount(); ++j)
+      {
+
+      }
+      columnPos+=this->_columnWidths[i];
+    }
+  }
+
   /**
    * @brief applies the GLGuiNotifiers Settings to a single Text of the GLGuiNotifier.
@@ -224 +249 @@
   {
     text->setSize(this->textSize());
-    //text->setLineWidth(  );
+    text->setLineWidth( this->_columnWidths[column] );
     text->setFont("fonts/final_frontier.ttf", (int)this->textSize());
 
@@ -257 +282 @@
     for (unsigned int i = 0; i < this->rowCount(); ++i)
       if (this->_entries[i].size() != this->columnCount())
-    {
-      PRINTF(1)("COLUMN-COUNT OF ROW %d WRONG (is %d should be %d)\n", i, this->_entries[i].size(), this->columnCount());
-      retVal = false;
-    }
+      {
+        PRINTF(1)("COLUMN-COUNT OF ROW %d WRONG (is %d should be %d)\n", i, this->_entries[i].size(), this->columnCount());
+        retVal = false;
+      }
     return retVal;
   }

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

@@ -39 +39 @@
     void setHeader(const std::vector<std::string>& headerNames);
 
-    void setEntry(unsigned int column, unsigned int row, const std::string& name);
+    void setEntry(unsigned int row, unsigned int column, const std::string& name);
 
     void setColumnWidth(unsigned int column, float size);
@@ -64 +64 @@
     void init();
 
+    void repositionText(unsigned int fromLeft, unsigned int fromTop);
     void applyTextSettings(unsigned int row, unsigned int column, LimitedWidthText* text);
     bool checkIntegrity() const;
@@ -70 +71 @@
     typedef std::vector<LimitedWidthText> TableTextList;
     TableTextList                _headers;
+    std::vector<float>           _columnWidths;
+
     std::vector<TableTextList>   _entries;     //!< inner is by column, outer is by row.