X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=c5c902099f4ed36806c172d87f26dbbea5550748;hb=233b56b4ea7820602ee5cba8a717930348400bf6;hp=e811369c9233daae73d9f2f1ce82ce8df32d560c;hpb=876c65c3f4f828a54fa8041f5d68e3c4cae1d463;p=ccbs diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index e811369..c5c9020 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -2,6 +2,7 @@ #include #include +#include "resolution.h" #include "groupscreen.h" #include "fetch_group.h" #include "fetch_max_score_for_songs.h" @@ -10,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) { } @@ -35,76 +36,78 @@ bool GroupScreen::check_invalidated() return needs_update; } -void GroupScreen::draw(unsigned char *buf) +void GroupScreen::draw_main_heading(std::vector &td) { - 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, 800 * 600 * 4); - - // main heading char heading[64]; - if (parallel == 0) { - std::sprintf(heading, "Round %u", round); + if (num_machines == 1) { + if (parallel == 0) { + std::sprintf(heading, "Round %u", round); + } else { + std::sprintf(heading, "Round %u, Group %u", round, parallel); + } } else { - std::sprintf(heading, "Round %u, Group %u", round, parallel); + if (parallel == 0) { + std::sprintf(heading, "Round %u, Machine %u", round, machine + 1); + } else { + std::sprintf(heading, "Round %u, Group %u, Machine %u", round, parallel, machine + 1); + } } - { - unsigned width = my_draw_text(heading, NULL, 48.0); - my_draw_text_deferred(td, heading, 48.0, 800/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 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. + */ +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 sumwidth; + unsigned sumcolwidth; + 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)); + + 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) { - width[col] = std::max(width[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0) + + 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 { - 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); + 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(); - 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 (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 - sumwidth = 0; + sumcolwidth = 0; for (unsigned i = 0; i <= num_scores + 2; ++i) - sumwidth += width[i] + 20; + sumcolwidth += colwidth[i] + 20; - if (sumwidth < 780) + if (sumcolwidth < 780) break; } @@ -112,7 +115,7 @@ void GroupScreen::draw(unsigned char *buf) * 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) { + if (sumcolwidth < 780) { int first_chosen_col = -1; unsigned col = 1; @@ -124,24 +127,54 @@ void GroupScreen::draw(unsigned char *buf) } if (first_chosen_col != -1) { - width[first_chosen_col] += 780 - sumwidth; + colwidth[first_chosen_col] += 780 - sumcolwidth; } } +} + +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); + + unsigned max_num_width = my_draw_text("8888", NULL, 22.0); + 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; @@ -155,7 +188,7 @@ void GroupScreen::draw(unsigned char *buf) my_draw_text_deferred(td, i->nick, 18.0, 20, y); - unsigned x = 40 + width[0]; + unsigned x = 40 + colwidth[0]; unsigned col = 1; for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { @@ -169,15 +202,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 @@ -186,8 +219,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) @@ -266,7 +299,7 @@ void GroupScreen::draw(unsigned char *buf) continue; 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; @@ -338,11 +371,11 @@ 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, 420); + my_draw_text(text, buf, 24.0, (LOGICAL_SCREEN_WIDTH/2) - 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, 457); + my_draw_text(next_song->song.title, buf, 20.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); Highscore hs; conn.perform(FetchHighscore(next_song->song.id, &hs)); @@ -351,7 +384,7 @@ void GroupScreen::draw(unsigned char *buf) 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); + my_draw_text(text, buf, 16.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); } } @@ -448,7 +481,7 @@ void GroupScreen::draw(unsigned char *buf) 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, 400 - this_width/2, y); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); y += 30; } @@ -461,7 +494,7 @@ void GroupScreen::draw(unsigned char *buf) 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, 400 - this_width/2, y); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); y += 30; } @@ -480,7 +513,7 @@ void GroupScreen::draw(unsigned char *buf) } this_width = my_draw_text(text, NULL, 18.0); - my_draw_text(text, buf, 18.0, 400 - this_width/2, y); + my_draw_text(text, buf, 18.0, (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y); y += 30; } @@ -493,3 +526,7 @@ void GroupScreen::draw(unsigned char *buf) last_text = td; } +int GroupScreen::get_priority() +{ + return 10; +}