From 8e632531fde7c8197a7cdba1842838fa50a44626 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 5 Mar 2005 00:19:15 +0000 Subject: [PATCH] Refactoring, always refactoring... --- bigscreen/groupscreen.cpp | 265 ++++++++++++++++++++------------------ bigscreen/groupscreen.h | 5 +- 2 files changed, 141 insertions(+), 129 deletions(-) diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 3d75040..219660a 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -257,7 +257,7 @@ const Player *GroupScreen::get_next_player(const Group &group) * Needs to secure qualification: * Needs to win group: */ -void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group, const std::vector &colwidth, +void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group, std::map &song_scores, std::map &player_scores, const std::vector &max_score, const std::vector &min_score) { @@ -302,153 +302,162 @@ void GroupScreen::draw_next_up_single(unsigned char *buf, const Group &group, co } 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, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); + bool last_song = (num_played == num_scores - 1); + + draw_next_up_player(buf, group, *next_player, *next_song, last_song, song_scores, player_scores, max_score, min_score); + } +} - 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, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); +void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, const Player &player, const Score &song, bool last_song, + std::map &song_scores, std::map &player_scores, + const std::vector &max_score, const std::vector &min_score) +{ + widestring text = widestring("Next player: ") + player.nick; + unsigned this_width = my_draw_text(text, NULL, 24.0); + my_draw_text(text, buf, 24.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); + + if (song.song.id != -1) { + this_width = my_draw_text(song.song.title, NULL, 20.0); + my_draw_text(song.song.title, buf, 20.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); + + Highscore hs; + conn.perform(FetchHighscore(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, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); + } + } - 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, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); - } + // only show lead/win/qualify for the last song + if (last_song) { + /* + * 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. + */ + + // find the best score we can get + unsigned max_score_this_song; + if (song.song.id != -1) { + // random song, or we know what song the player picked + max_score_this_song = song_scores[song.song.id]; + } else { + max_score_this_song = player_scores[player.id]; } - // only show lead/win/qualify for the last song - 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. - */ - - // find the best score we can get - unsigned max_score_this_song; - if (next_song->song.id != -1) { - // random song, or we know what song the player picked - max_score_this_song = song_scores[next_song->song.id]; - } else { - max_score_this_song = player_scores[next_player->id]; - } + unsigned y = 520; + + // see what score this player must beat to lead + unsigned lead_beat = 0, win_beat = 0; + for (unsigned i = 0; i < group.players.size(); ++i) { + if (group.players[i].id == player.id) + continue; + + lead_beat = std::max(lead_beat, group.players[i].total); + } + + // find the best max score among the others + for (unsigned i = 0; i < group.players.size(); ++i) { + if (group.players[i].id == player.id) + continue; + + win_beat = std::max(win_beat, max_score[i]); + } + + /* + * There's a somewhat subtle point here. Normally, what a player would be interested in + * with regard to qualification would be a set of three values: + * + * 1. How much is the absolute minimum required to qualify, given that all others + * fail? + * 2. How much will give a reasonable chance of qualifying, given the expected performance + * of all the others? + * 3. How much will be enough to secure qualification, no matter what? + * + * Given perfect guessing, #2 would be "how much is needed to qualify"; however, it is + * completely impossible to give an exact value for that, and we're not into the guessing + * games. :-) #1 is often so low it's completely unrealistic (ie. far enough from #2 that + * it's not interesting), but #3, the most conservative estimate, is often a good measure. + * #3 is "how much is needed to _secure_ qualification", and that is usually what we + * print out when it's possible. + * + * However, in a few situations, #1 and #3 will be the exact same value, from which it + * follows (from the squeeze law, or just common sense :-) ) that #2 will be the same + * value as #1 and #3. (This usually happens near or at the end of a group.) In that + * case, we know the value we seek (ie. "how much is needed to qualify"), so we drop + * the word "secure" and just print it as-is. + * + * To find #1 and #3, we sort and pick out the values we need to beat in the best and + * the worst case. + */ + int qualify_beat_worst_case = -1, qualify_beat_best_case = -1; + + if (group.num_qualifying > 0) { + std::vector tmp; - unsigned y = 520; - - // see what score this player must beat to lead - unsigned lead_beat = 0, win_beat = 0; for (unsigned i = 0; i < group.players.size(); ++i) { - if (group.players[i].id == next_player->id) + if (group.players[i].id == player.id) continue; - - lead_beat = std::max(lead_beat, group.players[i].total); + tmp.push_back(max_score[i]); } + std::sort(tmp.begin(), tmp.end()); + qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying]; - // find the best max score among the others + std::vector tmp2; for (unsigned i = 0; i < group.players.size(); ++i) { - if (group.players[i].id == next_player->id) + if (group.players[i].id == player.id) continue; - - win_beat = std::max(win_beat, max_score[i]); + tmp2.push_back(min_score[i]); } - /* - * There's a somewhat subtle point here. Normally, what a player would be interested in - * with regard to qualification would be a set of three values: - * - * 1. How much is the absolute minimum required to qualify, given that all others - * fail? - * 2. How much will give a reasonable chance of qualifying, given the expected performance - * of all the others? - * 3. How much will be enough to secure qualification, no matter what? - * - * Given perfect guessing, #2 would be "how much is needed to qualify"; however, it is - * completely impossible to give an exact value for that, and we're not into the guessing - * games. :-) #1 is often so low it's completely unrealistic (ie. far enough from #2 that - * it's not interesting), but #3, the most conservative estimate, is often a good measure. - * #3 is "how much is needed to _secure_ qualification", and that is usually what we - * print out when it's possible. - * - * However, in a few situations, #1 and #3 will be the exact same value, from which it - * follows (from the squeeze law, or just common sense :-) ) that #2 will be the same - * value as #1 and #3. (This usually happens near or at the end of a group.) In that - * case, we know the value we seek (ie. "how much is needed to qualify"), so we drop - * the word "secure" and just print it as-is. - * - * To find #1 and #3, we sort and pick out the values we need to beat in the best and - * the worst case. - */ - int qualify_beat_worst_case = -1, qualify_beat_best_case = -1; - - if (group.num_qualifying > 0) { - std::vector tmp; - - for (unsigned i = 0; i < group.players.size(); ++i) { - if (group.players[i].id == next_player->id) - continue; - tmp.push_back(max_score[i]); - } - std::sort(tmp.begin(), tmp.end()); - qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying]; - - std::vector tmp2; - for (unsigned i = 0; i < group.players.size(); ++i) { - if (group.players[i].id == next_player->id) - continue; - tmp2.push_back(min_score[i]); - } + std::sort(tmp2.begin(), tmp2.end()); + qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying]; + } - std::sort(tmp2.begin(), tmp2.end()); - qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying]; - } - - // print out the lines we can attain - if (next_player->total + max_score_this_song > lead_beat && (lead_beat != win_beat)) { - int lead_need = std::max(lead_beat - next_player->total + 1, 0U); - - if (lead_need > 0) { - text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need)); - this_width = my_draw_text(text, NULL, 18.0); - my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); + // print out the lines we can attain + if (player.total + max_score_this_song > lead_beat && (lead_beat != win_beat)) { + int lead_need = std::max(lead_beat - player.total + 1, 0U); - y += 30; - } + if (lead_need > 0) { + text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need)); + this_width = my_draw_text(text, NULL, 18.0); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); + + y += 30; } - - if (next_player->total + max_score_this_song > win_beat) { - int win_need = std::max(win_beat - next_player->total + 1, 0U); - - if (win_need > 0) { - text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need)); + } - this_width = my_draw_text(text, NULL, 18.0); - my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); + if (player.total + max_score_this_song > win_beat) { + int win_need = std::max(win_beat - player.total + 1, 0U); - y += 30; - } + if (win_need > 0) { + text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need)); + + this_width = my_draw_text(text, NULL, 18.0); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); + + y += 30; } + } - 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 (qual_need > 0) { - if (qualify_beat_worst_case == qualify_beat_best_case) { - text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need)); - } else { - text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need)); - } - - this_width = my_draw_text(text, NULL, 18.0); - my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); - - y += 30; + if (group.num_qualifying > 0 && + 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 - player.total + 1, 0U); + + if (qual_need > 0) { + if (qualify_beat_worst_case == qualify_beat_best_case) { + text = widestring("Needs to qualify: ") + widestring(pqxx::to_string(qual_need)); + } else { + text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need)); } + + this_width = my_draw_text(text, NULL, 18.0); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); + + y += 30; } } } @@ -567,7 +576,7 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) y += 40; } - draw_next_up_single(buf, group, colwidth, song_scores, player_scores, max_score, min_score); + draw_next_up_single(buf, group, song_scores, player_scores, max_score, min_score); valid = true; draw_all_deferred_text(buf, td, last_text); diff --git a/bigscreen/groupscreen.h b/bigscreen/groupscreen.h index 09d8d97..a2b0db1 100644 --- a/bigscreen/groupscreen.h +++ b/bigscreen/groupscreen.h @@ -26,7 +26,10 @@ private: void draw_column_headings(std::vector &td, const Group &group, const std::vector &colwidth); void draw_scores(std::vector &td, const Group &group, const std::vector &colwidth); const Player *get_next_player(const Group &group); - void draw_next_up_single(unsigned char *buf, const Group &group, const std::vector &colwidth, + void draw_next_up_player(unsigned char *buf, const Group &group, const Player &player, const Score &song, bool last_song, + std::map &song_scores, std::map &player_scores, + const std::vector &max_score, const std::vector &min_score); + void draw_next_up_single(unsigned char *buf, const Group &group, std::map &song_scores, std::map &player_scores, const std::vector &max_score, const std::vector &min_score); void find_column_widths(const Group &group, std::vector &colwidth); -- 2.39.2