X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=a1141f077188567cba56d8371cb700923f8423c3;hp=9d3b9e7f3b81bda4a59dcfeed652c444ce8fa13d;hb=3b95a7def95904aafe84cd36f14f6ddbf9633a7e;hpb=1f0419e8b9ad6225c901fdc9b272727547c08165 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 9d3b9e7..a1141f0 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,27 +36,14 @@ bool GroupScreen::check_invalidated() return needs_update; } -void GroupScreen::draw(unsigned char *buf) +unsigned GroupScreen::get_show_players(const Group &group) { - std::vector td; - - 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); - - memset(buf, 0, SCREEN_WIDTH * SCREEN_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) { @@ -72,99 +59,46 @@ void GroupScreen::draw(unsigned char *buf) } } - { - 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 width[16], num_scores; - unsigned max_num_width = my_draw_text("8888", NULL, 22.0); - unsigned sumwidth; - for (unsigned mode = 0; mode < 2; ++mode) { - for (unsigned i = 0; i < 16; ++i) - width[i] = 0; - - for (std::vector::const_iterator i = group.players.begin(); i != group.players.end(); ++i) { - unsigned col = 1; - width[0] = std::max(width[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) { - width[col] = std::max(width[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + - max_num_width + 10); - } else { - width[col] = std::max(width[col], my_draw_text(j->song.short_title, NULL, 12.0)); - width[col] = std::max(width[col], max_num_width); - } - } - } - - num_scores = group.players[0].scores.size(); - - width[num_scores + 1] = std::max(my_draw_text("Total", NULL, 12.0), max_num_width); - width[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 - sumwidth = 0; - - for (unsigned i = 0; i <= num_scores + 2; ++i) - sumwidth += width[i] + 20; - - if (sumwidth < 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 (sumwidth < 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) { - width[first_chosen_col] += 780 - sumwidth; - } - } +// 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 + width[0]; + unsigned x = 40 + colwidth[0]; for (std::vector::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) { if (!i->chosen) { unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0); - my_draw_text_deferred(td, i->song.short_title, 12.0, x + width[col] / 2 - this_width / 2, 100); + my_draw_text_deferred(td, i->song.short_title, 12.0, x + colwidth[col] / 2 - this_width / 2, 100); } - x += width[col] + 20; + x += colwidth[col] + 20; } - my_draw_text_deferred(td, "Total", 12.0, x + width[num_scores + 1] / 2 - my_draw_text("Total", NULL, 12.0) / 2, 100); - x += width[num_scores + 1] + 20; - my_draw_text_deferred(td, "Rank", 12.0, x + width[num_scores + 2] / 2 - my_draw_text("Rank", NULL, 12.0) / 2, 100); + 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 + width[0]; + x = 40 + colwidth[0]; unsigned col = 1; for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { @@ -178,15 +112,15 @@ void GroupScreen::draw(unsigned char *buf) my_draw_text_deferred(td, text, 22.0, x + max_num_width - this_width, 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] - 10 - max_num_width)) { + if (my_draw_text(j->song.title, NULL, 12.0) > (colwidth[col] - 10 - max_num_width)) { 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); + my_draw_text_deferred(td, text, 22.0, x + colwidth[col] / 2 - this_width / 2, y); } - x += width[col] + 20; + x += colwidth[col] + 20; } // draw total @@ -195,8 +129,8 @@ void GroupScreen::draw(unsigned char *buf) 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; + my_draw_text_deferred(td, text, 22.0, x + colwidth[num_scores + 1] / 2 - this_width / 2, y); + x += colwidth[num_scores + 1] + 20; } if (show_players > 7) @@ -204,9 +138,115 @@ void GroupScreen::draw(unsigned char *buf) 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; + + 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); + } + } + } + + num_scores = group.players[0].scores.size(); + + if (colwidth.size() < num_scores + 2) { + colwidth.push_back(0); + colwidth.push_back(0); + } + 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; + } + } + + if (first_chosen_col != -1) { + colwidth[first_chosen_col] += 780 - sumcolwidth; + } + } +} + +// 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: @@ -231,7 +271,7 @@ void GroupScreen::draw(unsigned char *buf) 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) { + 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; @@ -252,7 +292,8 @@ void GroupScreen::draw(unsigned char *buf) } // now finally find min and max rank, and draw it all - y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); + 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) { @@ -274,8 +315,13 @@ void GroupScreen::draw(unsigned char *buf) 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 + width[num_scores + 2] / 2 - this_width / 2, y); + 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; @@ -305,10 +351,10 @@ void GroupScreen::draw(unsigned char *buf) /* 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; + unsigned 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) { + for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) { if (j->score != -1) ++this_played; if (!j->chosen)