X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=9f3b17c521eac7ff9c42b406a7511cfd0839ba0c;hp=536fbe62d260ff3dd628f03052e83f28088ed46c;hb=7b8b747f037d2244ffd080e97d9d5e5c0e9114a7;hpb=64356b45b3a6c41bc4d9c651fc4d02a6bd2d9c7b diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 536fbe6..9f3b17c 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -13,6 +13,15 @@ #include "fonts.h" #include "theme.h" +std::string theme_suffix_from_row(unsigned row) +{ + if (row % 2 == 0) { + return ".odd"; // :-) + } else { + return ".even"; + } +} + 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) { @@ -72,11 +81,11 @@ void GroupScreen::draw_column_headings(std::vector &td, const Group & 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) { - if (!i->chosen) { - unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0, "columnheading"); - my_draw_text_deferred(td, i->song.short_title, 12.0, "columnheading", "columnheading", x + colwidth[col] / 2 - this_width / 2, 100); - } - x += colwidth[col] + 20; + if (!i->chosen) { + unsigned this_width = my_draw_text(i->song.short_title, NULL, 12.0, "columnheading"); + my_draw_text_deferred(td, i->song.short_title, 12.0, "columnheading", "columnheading", x + colwidth[col] / 2 - this_width / 2, 100); + } + x += colwidth[col] + 20; } if (num_scores > 1) { @@ -103,7 +112,9 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, un if (m-1 < min_player) continue; - my_draw_text_deferred(td, i->nick, 18.0, "rowheading", "rowheading", 20, y); + std::string suffix = theme_suffix_from_row(row); + + my_draw_text_deferred(td, i->nick, 18.0, "rowheading" + suffix, "rowheading" + suffix, 20, y); x = 40 + colwidth[0]; @@ -114,18 +125,18 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, un std::sprintf(text, "%u", j->score); } - unsigned this_width = my_draw_text(text, NULL, 22.0, "chosensongname"); + unsigned this_width = my_draw_text(text, NULL, 22.0, "score" + suffix); if (j->chosen) { - my_draw_text_deferred(td, text, 22.0, "chosensongname", "freshchosensongname", x + max_num_width - this_width, y); + my_draw_text_deferred(td, text, 22.0, "score" + suffix, "freshscore" + suffix, 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, "chosensongname") > (colwidth[col] - 10 - max_num_width)) { - my_draw_text_deferred(td, j->song.short_title, 12.0, "chosensongname", "freshchosensongname", x + max_num_width + 10, y); + my_draw_text_deferred(td, j->song.short_title, 12.0, "chosensongname" + suffix, "freshchosensongname" + suffix, x + max_num_width + 10, y); } else { - my_draw_text_deferred(td, j->song.title, 12.0, "chosensongname", "freshchosensongname", x + max_num_width + 10, y); + my_draw_text_deferred(td, j->song.title, 12.0, "chosensongname" + suffix, "freshchosensongname" + suffix, x + max_num_width + 10, y); } } else { - my_draw_text_deferred(td, text, 22.0, "chosensongname", "freshchosensongname", x + colwidth[col] / 2 - this_width / 2, y); + my_draw_text_deferred(td, text, 22.0, "score" + suffix, "freshscore" + suffix, x + colwidth[col] / 2 - this_width / 2, y); } x += colwidth[col] + 20; } @@ -135,8 +146,8 @@ void GroupScreen::draw_scores(std::vector &td, const Group &group, un char text[16]; std::sprintf(text, "%u", i->total); - unsigned this_width = my_draw_text(text, NULL, 22.0, "totalscore"); - my_draw_text_deferred(td, text, 22.0, "totalscore", "freshtotalscore", x + colwidth[num_scores + 1] / 2 - this_width / 2, y); + unsigned this_width = my_draw_text(text, NULL, 22.0, "totalscore" + suffix); + my_draw_text_deferred(td, text, 22.0, "totalscore" + suffix, "freshtotalscore" + suffix, x + colwidth[num_scores + 1] / 2 - this_width / 2, y); x += colwidth[num_scores + 1] + 20; } @@ -166,7 +177,7 @@ void GroupScreen::find_column_widths(const Group &group, std::vector & if (colwidth.size() == 0) colwidth.push_back(0); - colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0, "nick")); + colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0, "rowheading")); for (std::vector::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) { if (colwidth.size() < col+1) @@ -409,12 +420,12 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group, // OK, we have two players. Draw their nicks and the scores widestring text = widestring("Next players: ") + next_player->nick + widestring(" and ") + other_player->nick; - unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo"); - my_draw_text(text, buf, 24.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); + unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo.player"); + my_draw_text(text, buf, 24.0, "nextsonginfo.player", (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, "nextsongtitle"); - my_draw_text(next_song->song.title, buf, 20.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); + this_width = my_draw_text(next_song->song.title, NULL, 20.0, "nextsonginfo.title"); + my_draw_text(next_song->song.title, buf, 20.0, "nextsonginfo.title", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); Highscore hs; conn.perform(FetchHighscore(next_song->song.id, &hs)); @@ -422,8 +433,8 @@ void GroupScreen::draw_next_up_versus(unsigned char *buf, const Group &group, 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, "nextsonginfo"); - my_draw_text(text, buf, 16.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); + this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo.highscore"); + my_draw_text(text, buf, 16.0, "nextsonginfo.highscore", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); } } } @@ -433,12 +444,12 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co 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, "nextsonginfo"); - my_draw_text(text, buf, 24.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); + unsigned this_width = my_draw_text(text, NULL, 24.0, "nextsonginfo.player"); + my_draw_text(text, buf, 24.0, "nextsonginfo.player", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420); if (song.song.id != -1) { - this_width = my_draw_text(song.song.title, NULL, 20.0, "nextsonginfo"); - my_draw_text(song.song.title, buf, 20.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); + this_width = my_draw_text(song.song.title, NULL, 20.0, "nextsonginfo.title"); + my_draw_text(song.song.title, buf, 20.0, "nextsonginfo.title", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457); Highscore hs; conn.perform(FetchHighscore(song.song.id, &hs)); @@ -446,8 +457,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co 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, "nextsonginfo"); - my_draw_text(text, buf, 16.0, "nextsonginfo", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); + this_width = my_draw_text(text, NULL, 16.0, "nextsonginfo.highscore"); + my_draw_text(text, buf, 16.0, "nextsonginfo.highscore", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487); } } @@ -523,7 +534,11 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co tmp.push_back(max_score[i]); } std::sort(tmp.begin(), tmp.end()); - qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying]; + if (tmp.size() > group.num_qualifying) { + qualify_beat_worst_case = tmp[tmp.size() - group.num_qualifying]; + } else { + qualify_beat_worst_case = 0; + } std::vector tmp2; for (unsigned i = 0; i < group.players.size(); ++i) { @@ -533,7 +548,11 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co } std::sort(tmp2.begin(), tmp2.end()); - qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying]; + if (tmp2.size() > group.num_qualifying) { + qualify_beat_best_case = tmp2[tmp2.size() - group.num_qualifying]; + } else { + qualify_beat_best_case = 0; + } } // print out the lines we can attain @@ -604,7 +623,7 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) conn.perform(FetchGroup(tournament, round, parallel, &group)); gettimeofday(&last_updated, NULL); - fill_background(buf, width, height); + fill_background(buf, "groupscreen", width, height); std::vector colwidth; @@ -684,6 +703,7 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) // now finally find min and max rank, and draw it all unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5); + unsigned row = 0; for (unsigned i = 0; i < group.players.size() && (i/num_machines) < show_players+min_player; ++i) { unsigned best_rank = 1, worst_rank = 1; for (unsigned j = 0; j < group.players.size(); ++j) { @@ -707,6 +727,8 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) if (signed(i) < min_player) continue; + std::string suffix = theme_suffix_from_row(row); + // find out where to place this unsigned x = 40 + colwidth[0]; for (unsigned j = 1; j <= num_scores + 1; ++j) @@ -716,13 +738,15 @@ void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height) if (num_scores <= 1) x -= 20; - unsigned this_width = my_draw_text(text, NULL, 22.0, "rank"); - my_draw_text_deferred(td, text, 22.0, "rank", "freshrank", x + colwidth[num_scores + 2] / 2 - this_width / 2, y); + unsigned this_width = my_draw_text(text, NULL, 22.0, "rank" + suffix); + my_draw_text_deferred(td, text, 22.0, "rank" + suffix, "freshrank" + suffix, x + colwidth[num_scores + 2] / 2 - this_width / 2, y); if (show_players > 7) y += 40 - (show_players - 7) * 4; else y += 40; + + ++row; } if (players_per_machine == 2)