return needs_update;
}
-void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
+void GroupScreen::draw_main_heading(std::vector<TextDefer> &td)
{
- std::vector<TextDefer> 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<unsigned, unsigned> 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);
-
- // main heading
char heading[64];
if (num_machines == 1) {
if (parallel == 0) {
}
}
- {
- unsigned width = my_draw_text(heading, NULL, 40.0);
- my_draw_text_deferred(td, heading, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+ unsigned width = my_draw_text(heading, NULL, 40.0);
+ my_draw_text_deferred(td, heading, 40.0, LOGICAL_SCREEN_WIDTH/2 - width/2, 60);
+}
+
+// make column headings from the first player's songs
+void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &group, const std::vector<unsigned> &colwidth)
+{
+ unsigned num_scores = group.players[0].scores.size();
+
+ unsigned col = 1;
+ unsigned x = 40 + colwidth[0];
+ for (std::vector<Score>::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 + colwidth[col] / 2 - this_width / 2, 100);
+ }
+ x += colwidth[col] + 20;
}
-
- // 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 colwidth[16], num_scores;
+
+ 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);
+}
+
+/*
+ * 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<unsigned> &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 (unsigned i = 0; i < 16; ++i)
- colwidth[i] = 0;
-
for (std::vector<Player>::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<Score>::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);
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);
colwidth[first_chosen_col] += 780 - sumcolwidth;
}
}
+}
- // make column headings from the first player's songs
- unsigned col = 1;
- unsigned x = 40 + colwidth[0];
- for (std::vector<Score>::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 + colwidth[col] / 2 - this_width / 2, 100);
- }
- x += colwidth[col] + 20;
- }
+void GroupScreen::draw(unsigned char *buf, unsigned width, unsigned height)
+{
+ std::vector<TextDefer> td;
+
+ scores_changed.reset_flag();
+ set_screen_size(width, height);
- 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);
+ /*
+ * We'll probably need some values from here later on (although not all), just fetch them
+ * all while we're at it.
+ */
+ std::map<unsigned, unsigned> 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<unsigned> colwidth;
+ draw_main_heading(td);
+ find_column_widths(group, colwidth);
+ draw_column_headings(td, group, colwidth);
+
+ unsigned max_num_width = my_draw_text("8888", NULL, 22.0);
+ unsigned num_scores = group.players[0].scores.size();
+
// 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);
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<Player>::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 + colwidth[0];
+ x = 40 + colwidth[0];
unsigned col = 1;
for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
std::vector<unsigned> max_score, min_score;
for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
unsigned min_score_tp = 0, max_score_tp = 0;
- for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
+ for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) {
if (j->score != -1) {
// already given
min_score_tp += j->score;
m = 0;
for (std::vector<Player>::iterator i = group.players.begin(); i != group.players.end(); ++i) {
unsigned this_played = 0, this_random_songs = 0;
- for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
+ for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j) {
if (j->score != -1)
++this_played;
if (!j->chosen)