X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=86ff4672e97d58518156d9838dde9b5c73e83020;hp=2827a6af3a111121e515b30db3ee0409820290bd;hb=e7b4a93b19eb80023d2b58d36c8255f589e36d2d;hpb=da6c03044674863de9f8a017010aa579b3b27a12

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 2827a6a..86ff467 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,9 +1,11 @@
+#include <algorithm>
+
 #include "groupscreen.h"
 #include "fetch_group.h"
 #include "fonts.h"
 
 GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel)
-	: tournament(tournament), round(tournament), parallel(parallel), scores_changed(conn, "scores"), conn(conn), valid(false)
+	: tournament(tournament), round(round), parallel(parallel), scores_changed(conn, "scores"), conn(conn), valid(false)
 {
 }
 
@@ -26,15 +28,50 @@ void GroupScreen::draw(unsigned char *buf)
 
 	memset(buf, 0, 800 * 600 * 4);
 	
-	// just as a test, show all the players and the scores (no headings)
+	// find out how wide each column has to be
+	unsigned width[16];
+	for (unsigned i = 0; i < 16; ++i)
+		width[i] = 0;
+
+	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+		width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 0, 0, false, 0, 0, 0));
+
+		unsigned col = 1;
+		for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
+			if (j->chosen) {
+				width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 0, 0, false, 0, 0, 0) + 
+						 		  my_draw_text("8888", NULL, 0, 0, false, 0, 0, 0) + 10);
+			} else {		
+				width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 0, 0, false, 0, 0, 0));
+				width[col] = std::max(width[col], my_draw_text("8888", NULL, 0, 0, false, 0, 0, 0));
+			}
+		}
+	}	
+
+	// make column headings from the first player's songs
+	unsigned col = 1, x = 40 + width[0];
+	for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
+		if (!i->chosen)
+			my_draw_text(i->song.title, buf, x, 30, true, 255, 255, 255);
+		x += width[col] + 20;
+	}
+	
+	// show all the players and the scores
 	unsigned y = 50;
 	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
 		my_draw_text(i->nick, buf, 20, y, true, 255, 255, 255);
 
-		unsigned x = 90;
-		for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) {
-			my_draw_text(widestring("1234"), buf, x, y, true, 255, 255, 255);
-			x += 60;
+		unsigned x = 40 + width[0];
+
+		unsigned col = 1;
+		for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
+			char text[16];
+			sprintf(text, "%u", j->score);
+			
+			if (j->score != -1) {
+				my_draw_text(text, buf, x, y, true, 255, 255, 255);
+			}
+			x += width[col] + 20;
 		}
 
 		y += 20;