X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=26d769af52884bdfedfd253f52d034f17e755227;hp=9150906d17f8645db7720070a8c77ccf7413249f;hb=6cf5f0348c59d9e8e4d740572b5bfbaa74b9bf56;hpb=43f74cfb6708acd8f2c3e7f1ce9e800da28bc0f9

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index 9150906..26d769a 100644
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,3 +1,5 @@
+#include <algorithm>
+
 #include "groupscreen.h"
 #include "fetch_group.h"
 #include "fonts.h"
@@ -25,22 +27,113 @@ 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. First try unlimited width (ie.
+	// long titles for everything); if that gets too long, try again with short
+	// titles for chosen songs.
+	unsigned width[16], num_scores;
+	unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
+	unsigned mode;
+	for (mode = 0; mode < 2; ++mode) {
+		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) {
+			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((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + 
+							max_num_width + 10);
+				} else {		
+					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);
+				}
+			}
+		}
+
+		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);
+
+		// if we're at long titles and that works, don't try the short ones
+		if (mode == 0) {
+			unsigned sumwidth = 0;
+			for (unsigned i = 0; i <= num_scores + 2; ++i)
+				sumwidth += width[i] + 20;
+			
+			if (sumwidth < 800)
+				break;
+		}
+	}
+
+	// make column headings from the first player's songs
+	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) {
+			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);
 	
-	// just as a test, show all the players and the scores (no headings)
-	unsigned y = 50;
+	// show all the players and the scores
+	unsigned y = 140;
 	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);
+		my_draw_text(i->nick, buf, 18.0, 20, y);
+
+		unsigned x = 40 + width[0];
 
-		unsigned x = 90;
-		for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) {
+		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);
+	
+			unsigned this_width = my_draw_text(text, NULL, 22.0);
+			if (j->chosen) {
+				if (j->score != -1) {
+					my_draw_text(text, buf, 22.0, x + max_num_width - this_width, y);
+				}
+				my_draw_text((mode == 0) ? j->song.title : j->song.short_title, buf, 12.0, x + max_num_width + 10, y);
+			} else {
+				if (j->score != -1) {
+					my_draw_text(text, buf, 22.0, x + width[col] / 2 - this_width / 2, y);
+				}
+			}
+			x += width[col] + 20;
+		}
+
+		// draw total
+		{
+			char text[16];
+			sprintf(text, "%u", i->total);
 			
-			my_draw_text(text, buf, x, y, true, 255, 255, 255);
-			x += 60;
+			unsigned this_width = my_draw_text(text, NULL, 22.0);
+			my_draw_text(text, buf, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y);
+			x += width[num_scores + 1] + 20;
 		}
 
-		y += 20;
+		y += 40;
 	}
 	
 	valid = true;