X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=8432bbf321e66fbea4bc846b941856207a349594;hp=008379bd9e7bec6953361f3aa33eff9136e2fe92;hb=07f65e88e6fd4ebbe8c055f3acd0385f9b64f238;hpb=b99a635489016a50867699ffb587c66b3c39e939

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 008379b..8432bbf 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -27,41 +27,65 @@ void GroupScreen::draw(unsigned char *buf)
 	conn.perform(FetchGroup(tournament, round, parallel, &group));
 
 	memset(buf, 0, 800 * 600 * 4);
+
+	// main heading
+	char heading[64];
+	if (parallel == 0) {
+		sprintf(heading, "Round %u", round);
+	} else {
+		sprintf(heading, "Round %u, Group %u", round, parallel);
+	}
+
+	{
+		unsigned width = my_draw_text(heading, NULL, 48.0);
+		my_draw_text(heading, buf, 48.0, 800/2 - width/2, 60);
+	}
 	
 	// find out how wide each column has to be
 	unsigned width[16];
 	for (unsigned i = 0; i < 16; ++i)
 		width[i] = 0;
 
-	unsigned max_num_width = my_draw_text("88888", NULL, 12.0);
-
+	unsigned max_num_width = my_draw_text("8888", NULL, 22.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, 12.0));
-
 		unsigned col = 1;
+		width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 18.0));
+
 		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, 12.0) + 
 						 		  max_num_width + 10);
 			} else {		
-				width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 12.0));
+				width[col] = std::max(width[col], my_draw_text(j->song.short_title, NULL, 12.0));
 				width[col] = std::max(width[col], max_num_width);
 			}
 		}
-	}	
+	}
+
+	unsigned num_scores = group.players[0].scores.size();
+	
+	width[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width);
+	width[num_scores + 2] = my_draw_text("Rank", NULL, 12.0);
 
 	// make column headings from the first player's songs
-	unsigned col = 1, x = 40 + width[0];
+	unsigned col = 1;
+	unsigned 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, 12.0, x, 30);
+		if (!i->chosen) {
+			unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0);
+			my_draw_text(i->song.short_title, buf, 12.0, x + width[col] / 2 - this_width / 2, 100);
+		}
 		x += width[col] + 20;
 	}
+
+	my_draw_text("Total", buf, 12.0, x + width[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100);
+	x += width[num_scores + 1] + 20;
+	my_draw_text("Rank", buf, 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100);
 	
 	// show all the players and the scores
-	unsigned y = 50;
+	unsigned y = 140;
 	for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
-		my_draw_text(i->nick, buf, 12.0, 20, y);
+		my_draw_text(i->nick, buf, 18.0, 20, y);
 
 		unsigned x = 40 + width[0];
 
@@ -70,21 +94,21 @@ void GroupScreen::draw(unsigned char *buf)
 			char text[16];
 			sprintf(text, "%u", j->score);
 	
-			unsigned this_width = my_draw_text(text, NULL, 12.0);
+			unsigned this_width = my_draw_text(text, NULL, 22.0);
 			if (j->chosen) {
 				if (j->score != -1) {
-					my_draw_text(text, buf, 12.0, x + max_num_width - this_width, y);
+					my_draw_text(text, buf, 22.0, x + max_num_width - this_width, y);
 				}
 				my_draw_text(j->song.title, buf, 12.0, x + max_num_width + 10, y);
 			} else {
 				if (j->score != -1) {
-					my_draw_text(text, buf, 12.0, x + width[col] / 2 - this_width / 2, y);
+					my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);
 				}
 			}
 			x += width[col] + 20;
 		}
 
-		y += 20;
+		y += 40;
 	}
 	
 	valid = true;