X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=03b61db2f32e38cbf65e99808fee0646d96c943b;hp=713c3b944d4d39c05c48a099ed631179a1517186;hb=11b5968454610745e6cd47fb71edea1218f835dd;hpb=09ae4d8636130d4c86ab3f8df8f823482f948f97 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 713c3b9..03b61db 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -11,8 +11,8 @@ #include "fetch_highscore.h" #include "fonts.h" -GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines) - : tournament(tournament), round(round), parallel(parallel), machine(machine), num_machines(num_machines), scores_changed(conn, "scores"), conn(conn), valid(false) +GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel, unsigned machine, unsigned num_machines, unsigned players_per_machine) + : tournament(tournament), round(round), parallel(parallel), machine(machine), num_machines(num_machines), players_per_machine(players_per_machine), scores_changed(conn, "scores"), conn(conn), valid(false) { } @@ -36,28 +36,14 @@ bool GroupScreen::check_invalidated() return needs_update; } -void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) +unsigned GroupScreen::get_show_players(const Group &group) { - std::vector td; - - scores_changed.reset_flag(); - set_screen_size(width, height); - - /* - * 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); - - memset(buf, 0, width * height * 4); + unsigned num_players_this_machine = (group.players.size() + num_machines - machine - 1) / num_machines; + return std::min(num_players_this_machine, 9U); +} - // main heading +void GroupScreen::draw_main_heading(std::vector &td) +{ char heading[64]; if (num_machines == 1) { if (parallel == 0) { @@ -73,72 +59,15 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) } } - { - unsigned width = my_draw_text(heading, NULL, 40.0); - my_draw_text_deferred(td, heading, 40.0, LOGICAL_SCREEN_WIDTH/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 colwidth[16], num_scores; - unsigned max_num_width = my_draw_text("8888", NULL, 22.0); - unsigned sumcolwidth; - for (unsigned mode = 0; mode < 2; ++mode) { - for (unsigned i = 0; i < 16; ++i) - colwidth[i] = 0; - - for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { - unsigned col = 1; - colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0)); - - for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { - if (j->chosen) { - colwidth[col] = std::max(colwidth[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + - max_num_width + 10); - } else { - colwidth[col] = std::max(colwidth[col], my_draw_text(j->song.short_title, NULL, 12.0)); - colwidth[col] = std::max(colwidth[col], max_num_width); - } - } - } - - num_scores = group.players[0].scores.size(); - - colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width); - colwidth[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 - sumcolwidth = 0; - - for (unsigned i = 0; i <= num_scores + 2; ++i) - sumcolwidth += colwidth[i] + 20; - - if (sumcolwidth < 780) - break; - } - - /* - * If we have space to go, distribute as much as we can to the chosen song column, so we won't have - * total and rank jumping around. - */ - if (sumcolwidth < 780) { - int first_chosen_col = -1; - unsigned col = 1; - - for (std::vector::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) { - if (i->chosen) { - first_chosen_col = col; - break; - } - } + unsigned width = my_draw_text(heading, NULL, 40.0); + my_draw_text_deferred(td, heading, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60); +} - if (first_chosen_col != -1) { - colwidth[first_chosen_col] += 780 - sumcolwidth; - } - } +// make column headings from the first player's songs +void GroupScreen::draw_column_headings(std::vector &td, const Group &group, const std::vector &colwidth) +{ + unsigned num_scores = group.players[0].scores.size(); - // make column headings from the first player's songs unsigned col = 1; unsigned x = 40 + colwidth[0]; for (std::vector::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) { @@ -152,20 +81,24 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) my_draw_text_deferred(td, "Total", 12.0, x + colwidth[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100); x += colwidth[num_scores + 1] + 20; my_draw_text_deferred(td, "Rank", 12.0, x + colwidth[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100); +} - // show all the players and the scores - unsigned num_players_this_machine = (group.players.size() + num_machines - machine - 1) / num_machines; - unsigned show_players = std::min(num_players_this_machine, 9U); +// show all the players and the scores +void GroupScreen::draw_scores(std::vector &td, const Group &group, const std::vector &colwidth) +{ + unsigned max_num_width = my_draw_text("8888", NULL, 22.0); + unsigned num_scores = group.players[0].scores.size(); + unsigned show_players = get_show_players(group); unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); - unsigned row = 0, m = 0; + unsigned row = 0, m = 0, x; for (std::vector::const_iterator i = group.players.begin(); i != group.players.end() && row < 9; ++i) { if (m++ % num_machines != machine) continue; my_draw_text_deferred(td, i->nick, 18.0, 20, y); - unsigned x = 40 + colwidth[0]; + x = 40 + colwidth[0]; unsigned col = 1; for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { @@ -205,132 +138,153 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) else y += 40; ++row; - } +} + +/* + * 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. + */ +void GroupScreen::find_column_widths(const Group &group, std::vector &colwidth) +{ + unsigned num_scores; + unsigned max_num_width = my_draw_text("8888", NULL, 22.0); + unsigned sumcolwidth; - /* - * Approximate (but probably working quite well in practice) heuristic - * for finding the min and max rank of a player works as follows: - * - * First of all, find out, for each player in the group, what the - * maximum remaining score possibly can be (the minimum score is of - * course identical to the player's current total). For a random song, - * this is of course 1000 * (maximum feet rating) (but of course, that - * depends on whether we can play single or double! for now, assume - * double is okay, but this logic will be deferred to FetchMaxScore - * anyhow); for a random song, we simply pick the highest-ranking song - * we can find, EXCEPT those the player has chosen earlier AND the - * random songs this round, AND all random songs from elimination rounds - * (ie. rounds with only one group). (Phew!) This doesn't solve problems - * we'd face with more than one chosen song, but it should be good enough. - * - * After we've found the max and min scores for all players, it's a simple - * 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. - */ - std::vector max_score, min_score; - for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { - unsigned min_score_tp = 0, max_score_tp = 0; - for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { - if (j->score != -1) { - // already given - min_score_tp += j->score; - max_score_tp += j->score; - } else { - unsigned max_score_this_song; - if (j->song.id != -1) { - // random song, or we know what song the player picked - max_score_this_song = song_scores[j->song.id]; - } else { - max_score_this_song = player_scores[i->id]; + for (unsigned mode = 0; mode < 2; ++mode) { + for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { + unsigned col = 1; + + if (colwidth.size() == 0) + colwidth.push_back(0); + + colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0)); + + for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { + if (colwidth.size() < col+1) + colwidth.push_back(0); + + if (j->chosen) { + colwidth[col] = std::max(colwidth[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + + max_num_width + 10); + } else { + colwidth[col] = std::max(colwidth[col], my_draw_text(j->song.short_title, NULL, 12.0)); + colwidth[col] = std::max(colwidth[col], max_num_width); } - max_score_tp += max_score_this_song; } } - max_score.push_back(max_score_tp); - min_score.push_back(min_score_tp); - } - // now finally find min and max rank, and draw it all - y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); - for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players; ++i) { - unsigned best_rank = 1, worst_rank = 1; - for (unsigned j = 0; j < group.players.size(); ++j) { - if (i == j) - continue; + num_scores = group.players[0].scores.size(); - if (max_score[i] < min_score[j]) - ++best_rank; - if (min_score[i] <= max_score[j]) - ++worst_rank; + if (colwidth.size() < num_scores + 2) { + colwidth.push_back(0); + colwidth.push_back(0); } - - char text[16]; - if (best_rank == worst_rank) - std::sprintf(text, "%u", best_rank); - else - std::sprintf(text, "%u-%u", best_rank, worst_rank); - if (i % num_machines != machine) - continue; - - unsigned this_width = my_draw_text(text, NULL, 22.0); - my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 2] / 2 - this_width / 2, y); + colwidth[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width); + colwidth[num_scores + 2] = my_draw_text("Rank", NULL, 12.0); - if (show_players > 7) - y += 40 - (show_players - 7) * 4; - else - y += 40; + // if we're at long titles and that works, don't try the short ones + sumcolwidth = 0; + + for (unsigned i = 0; i <= num_scores + 2; ++i) + sumcolwidth += colwidth[i] + 20; + + if (sumcolwidth < 780) + break; } - - /* - * Next up (at the bottom) is "who's playing, what will he/she be playing, and - * optionally, how much to lead/win and how much to secure qualification" (the - * last one only in the final round). We assume playing is done in a modified - * zigzag; all the random songs are played first in zigzag/wrapping order (player - * 1 song 1, player 2 song 2, player 3 song 3, player 1 song 2, player 2 song 3, - * player 3 song 1, etc... assuming three songs and three players) and then all - * the chosen songs are played (we assume only one chosen song). - * - * The lines are as follows: - * - * - * - * High score: by at - * Needs to lead: - * Needs to secure qualification: - * Needs to win group: + + /* + * If we have space to go, distribute as much as we can to the chosen song column, so we won't have + * total and rank jumping around. */ - - /* Find the first player with the fewest songs played and part of this machine. */ - unsigned min_played_songs = 9999, num_random_songs = 0; - Player *next_player = NULL; - m = 0; - for (std::vector::iterator i = group.players.begin(); i != group.players.end(); ++i) { - unsigned this_played = 0, this_random_songs = 0; - for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { + if (sumcolwidth < 780) { + int first_chosen_col = -1; + unsigned col = 1; + + for (std::vector::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) { + if (i->chosen) { + first_chosen_col = col; + break; + } + } + + if (first_chosen_col != -1) { + colwidth[first_chosen_col] += 780 - sumcolwidth; + } + } +} + +/* Find the first player with the fewest songs played and part of this machine. */ +const Player *GroupScreen::get_next_player(const Group &group) +{ + unsigned min_played_songs = 9999; + const Player *next_player = NULL; + unsigned m = 0; + for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { + unsigned this_played = 0; + for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) { if (j->score != -1) ++this_played; - if (!j->chosen) - ++this_random_songs; } if ((m++ % num_machines == machine) && this_played < min_played_songs) { min_played_songs = this_played; next_player = &(*i); - num_random_songs = this_random_songs; // should be equal for all } } - /* Find out what song this player is supposed to play next; try random songs first */ - Score *next_song = NULL; + return next_player; +} + +/* + * At the bottom, for a single player, is "who's playing, what will he/she be + * playing, and optionally, how much to lead/win and how much to secure + * qualification" (the last one only in the final round). We assume playing is + * done in a modified zigzag; all the random songs are played first in + * zigzag/wrapping order (player 1 song 1, player 2 song 2, player 3 song 3, + * player 1 song 2, player 2 song 3, player 3 song 1, etc... assuming three + * songs and three players) and then all the chosen songs are played (we assume + * only one chosen song). + * + * The lines are as follows: + * + * + * + * High score: by at + * Needs to lead: + * Needs to secure qualification: + * Needs to win group: + */ +void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group, const std::vector &colwidth, + std::map &song_scores, std::map &player_scores, + const std::vector &max_score, const std::vector &min_score) +{ + unsigned num_scores = group.players[0].scores.size(); + + // Find out how many random songs there are (equal for all players). + unsigned num_random_songs = 0; + for (std::vector::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i) { + if (!i->chosen) + ++num_random_songs; + } + + /* + * Find out which player is next, and what song he she is supposed to play. First + * try random songs. + */ + const Player *next_player = get_next_player(group); + const Score *next_song = NULL; + unsigned num_played = 0; // will not always be completely accurate, but always as accurate as we need it :-) for (unsigned i = 0; i < num_random_songs; ++i) { unsigned j = (i + next_player->position - 1) % num_random_songs; if (next_player->scores[j].score == -1) { next_song = &(next_player->scores[j]); break; + } else { + ++num_played; } } @@ -341,6 +295,8 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) if (next_player->scores[j].score == -1) { next_song = &(next_player->scores[j]); break; + } else { + ++num_played; } } } @@ -366,7 +322,7 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) } // only show lead/win/qualify for the last song - if (min_played_songs == num_scores - 1) { + if (num_played == num_scores - 1) { /* * Find out how much we need to lead, how much we need to be guaranteed * to win the group, and how much we need to secure qualification. (FIXME: @@ -497,6 +453,122 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) } } } +} + +// some refactoring done, more should be +void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) +{ + std::vector td; + + scores_changed.reset_flag(); + set_screen_size(width, height); + + /* + * 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); + + memset(buf, 0, width * height * 4); + + std::vector colwidth; + + draw_main_heading(td); + find_column_widths(group, colwidth); + draw_column_headings(td, group, colwidth); + draw_scores(td, group, colwidth); + + unsigned num_scores = group.players[0].scores.size(); + + /* + * Approximate (but probably working quite well in practice) heuristic + * for finding the min and max rank of a player works as follows: + * + * First of all, find out, for each player in the group, what the + * maximum remaining score possibly can be (the minimum score is of + * course identical to the player's current total). For a random song, + * this is of course 1000 * (maximum feet rating) (but of course, that + * depends on whether we can play single or double! for now, assume + * double is okay, but this logic will be deferred to FetchMaxScore + * anyhow); for a random song, we simply pick the highest-ranking song + * we can find, EXCEPT those the player has chosen earlier AND the + * random songs this round, AND all random songs from elimination rounds + * (ie. rounds with only one group). (Phew!) This doesn't solve problems + * we'd face with more than one chosen song, but it should be good enough. + * + * After we've found the max and min scores for all players, it's a simple + * 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. + */ + std::vector max_score, min_score; + for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { + unsigned min_score_tp = 0, max_score_tp = 0; + for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) { + if (j->score != -1) { + // already given + min_score_tp += j->score; + max_score_tp += j->score; + } else { + unsigned max_score_this_song; + if (j->song.id != -1) { + // random song, or we know what song the player picked + max_score_this_song = song_scores[j->song.id]; + } else { + max_score_this_song = player_scores[i->id]; + } + max_score_tp += max_score_this_song; + } + } + max_score.push_back(max_score_tp); + min_score.push_back(min_score_tp); + } + + // now finally find min and max rank, and draw it all + unsigned show_players = get_show_players(group); + unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); + for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players; ++i) { + unsigned best_rank = 1, worst_rank = 1; + for (unsigned j = 0; j < group.players.size(); ++j) { + if (i == j) + continue; + + if (max_score[i] < min_score[j]) + ++best_rank; + if (min_score[i] <= max_score[j]) + ++worst_rank; + } + + char text[16]; + if (best_rank == worst_rank) + std::sprintf(text, "%u", best_rank); + else + std::sprintf(text, "%u-%u", best_rank, worst_rank); + + if (i % num_machines != machine) + continue; + + // find out where to place this + unsigned x = 40 + colwidth[0]; + for (unsigned j = 1; j <= num_scores + 1; ++j) + x += colwidth[j] + 20; + + unsigned this_width = my_draw_text(text, NULL, 22.0); + my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 2] / 2 - this_width / 2, y); + + if (show_players > 7) + y += 40 - (show_players - 7) * 4; + else + y += 40; + } + + draw_next_up_single(buf, group, colwidth, song_scores, player_scores, max_score, min_score); valid = true; draw_all_deferred_text(buf, td, last_text);