X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftable.cpp;h=32db6c4af30ddbee2546730291bb8942e4477d3d;hb=3d84860cb25cf05ed36ee6cbd07d9e58cee52422;hp=7f0ae796f9c7077599990ee1fd563fe64bec0b29;hpb=75a16eae9eb2714f8112d46fa5b8f7908b6d2487;p=libs%2Fgltk.git

diff --git a/source/table.cpp b/source/table.cpp
index 7f0ae79..32db6c4 100644
--- a/source/table.cpp
+++ b/source/table.cpp
@@ -1,12 +1,6 @@
-/* $Id$
-
-This file is part of libmspgltk
-Copyright © 2008  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <stdexcept>
 #include <msp/gl/matrix.h>
-#include <msp/gl/transform.h>
+#include <msp/gl/meshbuilder.h>
 #include "part.h"
 #include "style.h"
 #include "table.h"
@@ -16,20 +10,18 @@ using namespace std;
 namespace Msp {
 namespace GLtk {
 
-Table::Table(const Resources &r):
-	Widget(r),
+Table::Table():
 	rows(1),
 	columns(1),
 	data(1),
 	col_w(1)
 {
-	focusable=false;
-	update_style();
+	focusable = false;
 }
 
 void Table::set_rows(unsigned r)
 {
-	rows=r;
+	rows = r;
 	data.resize(rows*columns);
 }
 
@@ -40,7 +32,7 @@ void Table::set_columns(unsigned c)
 		for(unsigned j=0; j<min(c, columns); ++j)
 			new_data[i*c+j].swap(data[i*columns+j]);
 	data.swap(new_data);
-	columns=c;
+	columns = c;
 
 	col_w.resize(columns);
 }
@@ -48,62 +40,65 @@ void Table::set_columns(unsigned c)
 void Table::set_column_width(unsigned c, unsigned w)
 {
 	if(c>=columns)
-		throw InvalidParameterValue("Column index out of bounds");
-	col_w[c]=w;
+		throw invalid_argument("Table::set_column_width");
+	col_w[c] = w;
 }
 
 void Table::set_cell_text(unsigned r, unsigned c, const string &t)
 {
 	if(r>=rows || c>=columns)
-		throw InvalidParameterValue("Cell coordinates out of bounds");
+		throw out_of_range("Table::set_cell_text");
 
-	data[r*columns+c]=t;
+	data[r*columns+c] = t;
 }
 
-void Table::render_special(const Part &part) const
+void Table::rebuild_special(const Part &part, CachedPart &cache)
 {
 	if(part.get_name()=="cells")
 	{
-		const GL::Font *const font=style->get_font();
-		const float font_size=font->get_default_size();
+		const GL::Font &font = style->get_font();
+		float font_size = style->get_font_size();
 
-		unsigned free_width=geom.w;
+		unsigned free_width = geom.w;
 		for(unsigned i=0; i<columns; ++i)
-			free_width-=col_w[i];
+			free_width -= col_w[i];
 
 		Geometry cgeom;
-		cgeom.h=geom.h/rows;
-		cgeom.y=geom.h-cgeom.h;
+		cgeom.h = geom.h/rows;
+		cgeom.y = geom.h-cgeom.h;
+
+		cache.texture = &font.get_texture();
+		cache.clear_mesh();
 
+		GL::MeshBuilder bld(*cache.mesh);
 		for(unsigned i=0; i<rows; ++i)
 		{
-			cgeom.x=0;
+			cgeom.x = 0;
 			for(unsigned j=0; j<columns; ++j)
 			{
 				if(col_w[j])
-					cgeom.w=col_w[j];
+					cgeom.w = col_w[j];
 				else
-					cgeom.w=free_width/columns;
+					cgeom.w = free_width/columns;
 
-				const string &text=data[i*columns+j];
+				const string &text = data[i*columns+j];
 				Geometry rgeom;
-				rgeom.x=cgeom.x;
-				rgeom.y=cgeom.y;
-				rgeom.w=static_cast<unsigned>(font->get_string_width(text)*font_size);
-				rgeom.h=static_cast<unsigned>((font->get_ascent()-font->get_descent())*font_size);
+				rgeom.x = cgeom.x;
+				rgeom.y = cgeom.y;
+				rgeom.w = static_cast<unsigned>(font.get_string_width(text)*font_size);
+				rgeom.h = static_cast<unsigned>((font.get_ascent()-font.get_descent())*font_size);
 
 				part.get_alignment().apply(rgeom, cgeom, part.get_margin());
 
-				GL::push_matrix();
-				GL::translate(rgeom.x, rgeom.y, 0);
-				GL::scale_uniform(font_size);
-				font->draw_string(text);
-				GL::pop_matrix();
+				GL::MatrixStack::Push _push(bld.matrix());
+				bld.matrix() *= GL::Matrix::translation(rgeom.x, rgeom.y, 0);
+				bld.matrix() *= GL::Matrix::scaling(font_size);
+				font.draw_string(text);
 
-				cgeom.x+=cgeom.w;
+				cgeom.x += cgeom.w;
 			}
 
-			cgeom.y-=cgeom.h;
+			cgeom.y -= cgeom.h;
 		}
 	}
 }
@@ -124,22 +119,22 @@ Table::Loader::Loader(Table &t):
 
 void Table::Loader::cell_text(unsigned r, unsigned c, const string &t)
 {
-	static_cast<Table &>(wdg).set_cell_text(r, c, t);
+	static_cast<Table &>(obj).set_cell_text(r, c, t);
 }
 
 void Table::Loader::column_width(unsigned c, unsigned w)
 {
-	static_cast<Table &>(wdg).set_column_width(c, w);
+	static_cast<Table &>(obj).set_column_width(c, w);
 }
 
 void Table::Loader::columns(unsigned c)
 {
-	static_cast<Table &>(wdg).set_columns(c);
+	static_cast<Table &>(obj).set_columns(c);
 }
 
 void Table::Loader::rows(unsigned r)
 {
-	static_cast<Table &>(wdg).set_rows(r);
+	static_cast<Table &>(obj).set_rows(r);
 }
 
 } // namespace GLtk