X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2Fgroupscreen.cpp;h=83a70820ce176b4c1f2ba2383d50e0a7b446b8d3;hp=e811369c9233daae73d9f2f1ce82ce8df32d560c;hb=b5afc9f0cd63d187feb2266322d27589ad4d9b60;hpb=876c65c3f4f828a54fa8041f5d68e3c4cae1d463 diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp index e811369..83a7082 100644 --- a/bigscreen/groupscreen.cpp +++ b/bigscreen/groupscreen.cpp @@ -57,15 +57,23 @@ void GroupScreen::draw(unsigned char *buf) // 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); + unsigned width = my_draw_text(heading, NULL, 40.0); + my_draw_text_deferred(td, heading, 40.0, 800/2 - width/2, 60); } // Find out how wide each column has to be. First try unlimited width (ie.