X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Ftop10scorescreen.cpp;h=c298dbb3a4359a86a7371808cb616514c6e8ad3f;hp=58db32989eedd0c7b682caab38f5fe9d1e2aeee0;hb=09ae4d8636130d4c86ab3f8df8f823482f948f97;hpb=5a591d5e5db52bb78fd794342f090c7db66211dd;ds=sidebyside

diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp
index 58db329..c298dbb 100644
--- a/bigscreen/top10scorescreen.cpp
+++ b/bigscreen/top10scorescreen.cpp
@@ -1,6 +1,9 @@
 #include <cstdio>
+#include <algorithm>
 
+#include "resolution.h"
 #include "top10scorescreen.h"
+#include "fonts.h"
 
 Top10ScoreScreen::Top10ScoreScreen(pqxx::connection &conn, unsigned tournament)
 	: conn(conn), tournament(tournament), scores_changed(conn, "scores"), valid(false)
@@ -18,19 +21,75 @@ bool Top10ScoreScreen::check_invalidated()
 	if (!scores_changed.get_flag())
 		return false;
 
-	return true;
+	// check that there are indeed changes, otherwise don't bother
+	std::vector<TopScore> scores;
+	conn.perform(FetchTopScoresForTournament(tournament, 10, &scores));
+	
+	for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
+		if (seen_topscore.count(*i) == 0) {
+			return true;
+		}
+	}
+	
+	return false;
 }
 
-void Top10ScoreScreen::draw(unsigned char *buf)
+void Top10ScoreScreen::draw(unsigned char *buf, unsigned width, unsigned height)
 {
-	std::vector<TextDefer> td;
 	scores_changed.reset_flag();
-	memset(buf, 0, 800 * 600 * 4);
+	memset(buf, 0, width * height * 4);
+	set_screen_size(width, height);
+
+	// fetch the top 10 scores
+	std::vector<TopScore> scores;
+	conn.perform(FetchTopScoresForTournament(tournament, 10, &scores));
+
+	{
+		unsigned width = my_draw_text("Today's top 10 scores", NULL, 40.0);
+		my_draw_text("Today's top 10 scores", buf, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+	}
 
-	std::fprintf(stderr, "foo bar\n");
+	// simple headings
+	my_draw_text("Player", buf, 12.0, 70, 100);
+	my_draw_text("Song", buf, 12.0, 250, 100);
+	my_draw_text("Score", buf, 12.0, 710, 100);
+	
+	unsigned row = 1, y = 140;
+	for (std::vector<TopScore>::const_iterator i = scores.begin(); i != scores.end(); ++i) {
+		char str[16];
+		unsigned r = 255, g = 255, b = 255;
+
+		// print new entries in red
+		if (seen_topscore.count(*i) == 0 && seen_topscore.size() > 0) {
+			g = b = 0;
+		}
+
+		std::sprintf(str, "%u", row++);
+		unsigned width = my_draw_text(str, NULL, 24.0);
+		my_draw_text(str, buf, 24.0, 30 - width/2, y);
+
+		my_draw_text(i->nick, buf, 24.0, 70, y, r, g, b);
+
+		if (my_draw_text(i->title, NULL, 24.0) > 430) {
+			my_draw_text(i->shorttitle, buf, 24.0, 250, y, r, g, b);
+		} else {
+			my_draw_text(i->title, buf, 24.0, 250, y, r, g, b);
+		}
+		
+		std::sprintf(str, "%u", i->score);
+		width = my_draw_text(str, NULL, 24.0);
+		my_draw_text(str, buf, 24.0, 728 - width/2, y, r, g, b);
+
+		y += 40;
+	}
 	
 	valid = true;
-	draw_all_deferred_text(buf, td, last_text);
-	last_text = td;
+	
+	seen_topscore.erase(seen_topscore.begin(), seen_topscore.end());
+	std::copy(scores.begin(), scores.end(), std::inserter(seen_topscore, seen_topscore.end()));
 }
 
+int Top10ScoreScreen::get_priority()
+{
+	return 5;
+}