X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=1a0723408211f6f983a8ca93fb6123d7328e7949;hp=d169bdbd1b2209c8714378b7699ec488a6d94f5a;hb=b2230c3bda253bf91d775447a2d1bd3d51e25d79;hpb=3a708ad09d26d955393edfedbffdf668c58ccd48 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index d169bdb..1a07234 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -1,11 +1,13 @@ #include #include +#include #include "groupscreen.h" #include "fetch_group.h" -#include "fetch_max_score_for_song.h" -#include "fetch_max_score_for_player.h" +#include "fetch_max_score_for_songs.h" +#include "fetch_max_score_for_players.h" #include "fetch_needs_update.h" +#include "fetch_highscore.h" #include "fonts.h" GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel) @@ -39,6 +41,14 @@ void GroupScreen::draw(unsigned char *buf) scores_changed.reset_flag(); + /* + * We'll probably need some values from here later on (although not all), just fetch them + * all while we're at it. + */ + std::map song_scores, player_scores; + conn.perform(FetchMaxScoreForSongs(tournament, &song_scores)); + conn.perform(FetchMaxScoreForPlayers(tournament, round, &player_scores)); + Group group; conn.perform(FetchGroup(tournament, round, parallel, &group)); gettimeofday(&last_updated, NULL); @@ -48,9 +58,9 @@ void GroupScreen::draw(unsigned char *buf) // main heading char heading[64]; if (parallel == 0) { - sprintf(heading, "Round %u", round); + std::sprintf(heading, "Round %u", round); } else { - sprintf(heading, "Round %u, Group %u", round, parallel); + std::sprintf(heading, "Round %u, Group %u", round, parallel); } { @@ -63,8 +73,8 @@ void GroupScreen::draw(unsigned char *buf) // titles for chosen songs. unsigned width[16], num_scores; unsigned max_num_width = my_draw_text("8888", NULL, 22.0); - unsigned mode, sumwidth; - for (mode = 0; mode < 2; ++mode) { + unsigned sumwidth; + for (unsigned mode = 0; mode < 2; ++mode) { for (unsigned i = 0; i < 16; ++i) width[i] = 0; @@ -114,7 +124,6 @@ void GroupScreen::draw(unsigned char *buf) } if (first_chosen_col != -1) { - printf("first_chosen_col=%u\n", first_chosen_col); width[first_chosen_col] += 780 - sumwidth; } } @@ -135,8 +144,11 @@ void GroupScreen::draw(unsigned char *buf) my_draw_text_deferred(td, "Rank", 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 = 140; - for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { + unsigned show_players = std::min(group.players.size(), 9U); + unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); + + unsigned row = 0; + for (std::vector::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i, ++row) { my_draw_text_deferred(td, i->nick, 18.0, 20, y); unsigned x = 40 + width[0]; @@ -145,13 +157,19 @@ void GroupScreen::draw(unsigned char *buf) for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { char text[16] = ""; if (j->score != -1) { - sprintf(text, "%u", j->score); + std::sprintf(text, "%u", j->score); } unsigned this_width = my_draw_text(text, NULL, 22.0); if (j->chosen) { my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, y); - my_draw_text_deferred(td, (mode == 0) ? j->song.title : j->song.short_title, 12.0, x + max_num_width + 10, y); + + // draw the long name if we can, otherwise use the short one + if (my_draw_text(j->song.title, NULL, 12.0) > width[col]) { + my_draw_text_deferred(td, j->song.short_title, 12.0, x + max_num_width + 10, y); + } else { + my_draw_text_deferred(td, j->song.title, 12.0, x + max_num_width + 10, y); + } } else { my_draw_text_deferred(td, text, 22.0, x + width[col] / 2 - this_width / 2, y); } @@ -161,14 +179,17 @@ void GroupScreen::draw(unsigned char *buf) // draw total { char text[16]; - sprintf(text, "%u", i->total); + std::sprintf(text, "%u", i->total); unsigned this_width = my_draw_text(text, NULL, 22.0); my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 1] / 2 - this_width / 2, y); x += width[num_scores + 1] + 20; } - y += 40; + if (show_players > 7) + y += 40 - (show_players - 7) * 4; + else + y += 40; } /* @@ -191,8 +212,6 @@ void GroupScreen::draw(unsigned char *buf) * matter of sorting; the best attainable rank for player X is obtained if * X gets max score and all others get min score, the worst attainable rank * is obtained if X gets min score and all others get max score. - * - * This is a bit SQL-heavy, but heck... */ std::vector max_score, min_score; for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { @@ -206,9 +225,9 @@ void GroupScreen::draw(unsigned char *buf) unsigned max_score_this_song; if (j->song.id != -1) { // random song, or we know what song the player picked - conn.perform(FetchMaxScoreForSong(tournament, j->song.id, &max_score_this_song)); + max_score_this_song = song_scores[j->song.id]; } else { - conn.perform(FetchMaxScoreForPlayer(tournament, i->id, round, &max_score_this_song)); + max_score_this_song = player_scores[i->id]; } max_score_tp += max_score_this_song; } @@ -218,8 +237,8 @@ void GroupScreen::draw(unsigned char *buf) } // now finally find min and max rank, and draw it all - y = 140; - for (unsigned i = 0; i < group.players.size(); ++i) { + y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); + for (unsigned i = 0; i < show_players; ++i) { unsigned best_rank = 1, worst_rank = 1; for (unsigned j = 0; j < group.players.size(); ++j) { if (i == j) @@ -240,7 +259,10 @@ void GroupScreen::draw(unsigned char *buf) unsigned this_width = my_draw_text(text, NULL, 22.0); my_draw_text_deferred(td, text, 22.0, x + width[num_scores + 2] / 2 - this_width / 2, y); - y += 40; + if (show_players > 7) + y += 40 - (show_players - 7) * 4; + else + y += 40; } /* @@ -288,7 +310,6 @@ void GroupScreen::draw(unsigned char *buf) unsigned j = (i + next_player->position - 1) % num_random_songs; if (next_player->scores[j].score == -1) { next_song = &(next_player->scores[j]); - printf("Selecting score %u\n", j); break; } } @@ -299,7 +320,6 @@ void GroupScreen::draw(unsigned char *buf) unsigned j = (i + next_player->position) % num_scores; if (next_player->scores[j].score == -1) { next_song = &(next_player->scores[j]); - printf("Selecting score %u\n", j); break; } } @@ -308,17 +328,21 @@ void GroupScreen::draw(unsigned char *buf) if (next_song != NULL) { widestring text = widestring("Next player: ") + next_player->nick; unsigned this_width = my_draw_text(text, NULL, 24.0); - my_draw_text(text, buf, 24.0, 400 - this_width/2, 450); + my_draw_text(text, buf, 24.0, 400 - this_width/2, 420); if (next_song->song.id != -1) { this_width = my_draw_text(next_song->song.title, NULL, 20.0); - my_draw_text(next_song->song.title, buf, 20.0, 400 - this_width/2, 487); + my_draw_text(next_song->song.title, buf, 20.0, 400 - this_width/2, 457); - // fetch the high score later - text = widestring("High score: ") + widestring(pqxx::to_string(1234)) + - widestring(", by dufF in Challenge Cup 1, 2004"); - this_width = my_draw_text(text, NULL, 16.0); - my_draw_text(text, buf, 16.0, 400 - this_width/2, 517); + Highscore hs; + conn.perform(FetchHighscore(next_song->song.id, &hs)); + + if (hs.score != -1) { + text = widestring("High score: ") + widestring(pqxx::to_string(hs.score)) + + widestring(", by ") + hs.nick + widestring(" in ") + hs.tournament_name; + this_width = my_draw_text(text, NULL, 16.0); + my_draw_text(text, buf, 16.0, 400 - this_width/2, 487); + } } // only show lead/win/qualify for the last song @@ -333,12 +357,12 @@ void GroupScreen::draw(unsigned char *buf) unsigned max_score_this_song; if (next_song->song.id != -1) { // random song, or we know what song the player picked - conn.perform(FetchMaxScoreForSong(tournament, next_song->song.id, &max_score_this_song)); + max_score_this_song = song_scores[next_song->song.id]; } else { - conn.perform(FetchMaxScoreForPlayer(tournament, next_player->id, round, &max_score_this_song)); + max_score_this_song = player_scores[next_player->id]; } - unsigned y = 540; + unsigned y = 520; // see what score this player must beat to lead unsigned lead_beat = 0, win_beat = 0; @@ -429,7 +453,9 @@ void GroupScreen::draw(unsigned char *buf) y += 30; } - if (next_player->total + max_score_this_song > qualify_beat_worst_case) { + if (group.num_qualifying > 0 && + next_player->total + max_score_this_song > unsigned(qualify_beat_worst_case) && + (unsigned(qualify_beat_worst_case) != win_beat)) { int qual_need = std::max(qualify_beat_worst_case - next_player->total + 1, 0U); if (qualify_beat_worst_case == qualify_beat_best_case) {