From: Steinar H. Gunderson Date: Mon, 28 Feb 2005 22:17:55 +0000 (+0000) Subject: Actually fetch and display the top 10 scores. X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0e17c7dcfd783acd4792c392c347e5e523757de3;hp=5a591d5e5db52bb78fd794342f090c7db66211dd;p=ccbs Actually fetch and display the top 10 scores. --- diff --git a/bigscreen/Makefile b/bigscreen/Makefile index 6258a6b..cab9cee 100644 --- a/bigscreen/Makefile +++ b/bigscreen/Makefile @@ -4,7 +4,7 @@ CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) -Itinyptc/ CXXFLAGS=-g -Wall LDFLAGS=-L/usr/X11R6/lib LIBS=$(shell freetype-config --libs) $(shell libpq3-config) -lpqxx tinyptc/libtinyptc.a -lX11 -lXext -CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fetch_current_tournament.o fetch_list_of_active_groups.o fetch_max_score_for_songs.o fetch_max_score_for_players.o fetch_group.o fetch_needs_update.o fetch_highscore.o fetch_auxilliary_screens.o fonts.o groupscreen.o top10scorescreen.o splitscreen.o rotatescreen.o screen.o +CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fetch_current_tournament.o fetch_list_of_active_groups.o fetch_max_score_for_songs.o fetch_max_score_for_players.o fetch_group.o fetch_needs_update.o fetch_highscore.o fetch_top_scores_for_tournament.o fetch_auxilliary_screens.o fonts.o groupscreen.o top10scorescreen.o splitscreen.o rotatescreen.o screen.o all: ccbs-bigscreen diff --git a/bigscreen/fetch_top_scores_for_tournament.cpp b/bigscreen/fetch_top_scores_for_tournament.cpp new file mode 100644 index 0000000..9c38f51 --- /dev/null +++ b/bigscreen/fetch_top_scores_for_tournament.cpp @@ -0,0 +1,36 @@ +#include "fetch_top_scores_for_tournament.h" + +// small utility function so we can stick TopScores in a std::set +bool TopScore::operator< (const TopScore &other) const +{ + if (nick != other.nick) + return (nick < other.nick); + if (title != other.title) + return (title < other.title); + return (score < other.score); +} + +FetchTopScoresForTournament::FetchTopScoresForTournament(unsigned tournament, unsigned num, std::vector *scores) + : tournament(tournament), num(num), scores(scores) {} + +void FetchTopScoresForTournament::operator() (pqxx::transaction<> &t) +{ + scores->erase(scores->begin(), scores->end()); + + // Again, this will break if a song has more than one short title + pqxx::result res( t.exec( + "SELECT nick, title, shorttitle, score FROM scores NATURAL JOIN tournaments NATURAL JOIN players NATURAL JOIN songs NATURAL LEFT JOIN songshorttitles WHERE tournament=" + + pqxx::to_string(tournament) + " AND score IS NOT NULL ORDER BY score DESC LIMIT " + + pqxx::to_string(num)) ); + + for (pqxx::result::const_iterator i = res.begin(); i != res.end(); ++i) { + TopScore ts; + + ts.nick = i["nick"].as(ts.nick); + ts.title = i["title"].as(ts.title); + ts.shorttitle = i["shorttitle"].as(ts.shorttitle); + ts.score = i["score"].as(ts.score); + + scores->push_back(ts); + } +} diff --git a/bigscreen/fetch_top_scores_for_tournament.h b/bigscreen/fetch_top_scores_for_tournament.h new file mode 100644 index 0000000..78492ed --- /dev/null +++ b/bigscreen/fetch_top_scores_for_tournament.h @@ -0,0 +1,26 @@ +#ifndef _FETCH_TOP_SCORES_FOR_TOURNAMENT_H +#define _FETCH_TOP_SCORES_FOR_TOURNAMENT_H 1 + +#include +#include +#include "widestring.h" + +struct TopScore { + widestring nick, title, shorttitle; + unsigned score; + + bool operator< (const TopScore &other) const; +}; + +/* A transactor that fetches the best N scores for a given tournament */ +class FetchTopScoresForTournament : public pqxx::transactor<> { +private: + unsigned tournament, num; + std::vector *scores; + +public: + FetchTopScoresForTournament(unsigned tournament, unsigned num, std::vector *scores); + void operator() (pqxx::transaction<> &t); +}; + +#endif /* !defined(_FETCH_TOP_SCORES_FOR_TOURNAMENT_H) */ diff --git a/bigscreen/top10scorescreen.cpp b/bigscreen/top10scorescreen.cpp index 58db329..791c785 100644 --- a/bigscreen/top10scorescreen.cpp +++ b/bigscreen/top10scorescreen.cpp @@ -1,6 +1,8 @@ #include +#include #include "top10scorescreen.h" +#include "fonts.h" Top10ScoreScreen::Top10ScoreScreen(pqxx::connection &conn, unsigned tournament) : conn(conn), tournament(tournament), scores_changed(conn, "scores"), valid(false) @@ -23,14 +25,55 @@ bool Top10ScoreScreen::check_invalidated() void Top10ScoreScreen::draw(unsigned char *buf) { - std::vector td; scores_changed.reset_flag(); memset(buf, 0, 800 * 600 * 4); - std::fprintf(stderr, "foo bar\n"); + // fetch the top 10 scores + std::vector 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, 800/2 - width/2, 60); + } + + // 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::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())); } diff --git a/bigscreen/top10scorescreen.h b/bigscreen/top10scorescreen.h index 9e8f3c0..143c291 100644 --- a/bigscreen/top10scorescreen.h +++ b/bigscreen/top10scorescreen.h @@ -1,14 +1,12 @@ #ifndef _TOP10SCORESCREEN_H #define _TOP10SCORESCREEN_H 1 -#include +#include #include -#include -#include #include "screen.h" #include "flagtrigger.h" -#include "fonts.h" +#include "fetch_top_scores_for_tournament.h" /* A screen class showing a group in the tournament */ class Top10ScoreScreen : public GenericScreen { @@ -17,7 +15,7 @@ private: unsigned tournament; FlagTrigger scores_changed; bool valid; - std::vector last_text; + std::set seen_topscore; public: Top10ScoreScreen(pqxx::connection &conn, unsigned tournament);