X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;fp=bigscreen%2Fgroupscreen.cpp;h=92618f5cf395760cf28ff230e667441d907e22ec;hp=536fbe62d260ff3dd628f03052e83f28088ed46c;hb=cad5aff5a3a21bb8c95d8a265e93687234f46a43;hpb=64356b45b3a6c41bc4d9c651fc4d02a6bd2d9c7b diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index 536fbe6..92618f5 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,14 +81,6 @@ 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 (num_scores > 1) { unsigned this_width = my_draw_text("Total", NULL, 12.0, "columnheading"); my_draw_text_deferred(td, "Total", 12.0, "columnheading", "columnheading", x + colwidth[num_scores + 1] / 2 - this_width / 2, 100); x += colwidth[num_scores + 1] + 20; @@ -103,7 +104,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 +117,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, "chosensongname" + suffix, "freshchosensongname" + 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 +138,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 +169,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) @@ -684,6 +687,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 +711,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 +722,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)