Split up the “data” class into more specific members.

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index ee646840601c6119f08fa0b8738cdc83bc3f0ba1..536fbe62d260ff3dd628f03052e83f28088ed46c 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -91,7 +91,7 @@ void GroupScreen::draw_column_headings(std::vector<TextDefer> &td, const Group &
 // show all the players and the scores
 void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, unsigned min_player, const std::vector<unsigned> &colwidth)
 {
-       unsigned max_num_width = my_draw_text("8888", NULL, 22.0, "data");
+       unsigned max_num_width = my_draw_text("8888", NULL, 22.0, "score");
        unsigned num_scores = group.players[0].scores.size();
        unsigned show_players = get_show_players(group);
        unsigned y = (show_players <= 7) ? 140 : (140 - (show_players - 7) * 5);
@@ -114,18 +114,18 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, un
                                std::sprintf(text, "%u", j->score);
                        }
        
-                       unsigned this_width = my_draw_text(text, NULL, 22.0, "data");
+                       unsigned this_width = my_draw_text(text, NULL, 22.0, "chosensongname");
                        if (j->chosen) {
-                               my_draw_text_deferred(td, text, 22.0, "data", "freshdata", x + max_num_width - this_width, y);
+                               my_draw_text_deferred(td, text, 22.0, "chosensongname", "freshchosensongname", 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, "data") > (colwidth[col] - 10 - max_num_width)) {
-                                       my_draw_text_deferred(td, j->song.short_title, 12.0, "data", "freshdata", x + max_num_width + 10, y);
+                               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);
                                } else {
-                                       my_draw_text_deferred(td, j->song.title, 12.0, "data", "freshdata", x + max_num_width + 10, y);
+                                       my_draw_text_deferred(td, j->song.title, 12.0, "chosensongname", "freshchosensongname", x + max_num_width + 10, y);
                                }
                        } else {
-                               my_draw_text_deferred(td, text, 22.0, "data", "freshdata", x + colwidth[col] / 2 - this_width / 2, y);
+                               my_draw_text_deferred(td, text, 22.0, "chosensongname", "freshchosensongname", x + colwidth[col] / 2 - this_width / 2, y);
                        }
                        x += colwidth[col] + 20;
                }
@@ -135,8 +135,8 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, un
                        char text[16];
                        std::sprintf(text, "%u", i->total);
                        
-                       unsigned this_width = my_draw_text(text, NULL, 22.0, "data");
-                       my_draw_text_deferred(td, text, 22.0, "data", "freshdata", x + colwidth[num_scores + 1] / 2 - this_width / 2, y);
+                       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);
                        x += colwidth[num_scores + 1] + 20;
                }
 
@@ -156,7 +156,7 @@ void GroupScreen::draw_scores(std::vector<TextDefer> &td, const Group &group, un
 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, "data");
+       unsigned max_num_width = my_draw_text("8888", NULL, 22.0, "score");
        unsigned sumcolwidth;
        
        for (unsigned mode = 0; mode < 2; ++mode) {
@@ -166,17 +166,17 @@ void GroupScreen::find_column_widths(const Group &group, std::vector<unsigned> &
                        if (colwidth.size() == 0)
                                colwidth.push_back(0);
                        
-                       colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0, "data"));
+                       colwidth[0] = std::max(colwidth[0], my_draw_text(i->nick, NULL, 18.0, "nick"));
 
                        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, "data") + 
+                                       colwidth[col] = std::max(colwidth[col], my_draw_text((mode == 0) ? j->song.title : j->song.short_title, NULL, 12.0, "chosensongname") + 
                                                        max_num_width + 10);
                                } else {                
-                                       colwidth[col] = std::max(colwidth[col], my_draw_text(j->song.short_title, NULL, 12.0, "data"));
+                                       colwidth[col] = std::max(colwidth[col], my_draw_text(j->song.short_title, NULL, 12.0, "randomsongname"));
                                        colwidth[col] = std::max(colwidth[col], max_num_width);
                                }
                        }
@@ -409,12 +409,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, "data");
-       my_draw_text(text, buf, 24.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
+       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);
 
        if (next_song->song.id != -1) {
-               this_width = my_draw_text(next_song->song.title, NULL, 20.0, "data");
-               my_draw_text(next_song->song.title, buf, 20.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
+               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);
 
                Highscore hs;
                conn.perform(FetchHighscore(next_song->song.id, &hs));
@@ -422,8 +422,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, "data");
-                       my_draw_text(text, buf, 16.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
+                       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);
                }
        }
 }
@@ -433,12 +433,12 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
        const std::vector<unsigned> &max_score, const std::vector<unsigned> &min_score)
 {
        widestring text = widestring("Next player: ") + player.nick;
-       unsigned this_width = my_draw_text(text, NULL, 24.0, "data");
-       my_draw_text(text, buf, 24.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 420);
+       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);
 
        if (song.song.id != -1) {
-               this_width = my_draw_text(song.song.title, NULL, 20.0, "data");
-               my_draw_text(song.song.title, buf, 20.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 457);
+               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);
 
                Highscore hs;
                conn.perform(FetchHighscore(song.song.id, &hs));
@@ -446,8 +446,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, "data");
-                       my_draw_text(text, buf, 16.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, 487);
+                       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);
                }
        }
 
@@ -542,8 +542,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
 
                        if (lead_need > 1) {
                                text = widestring("Needs to lead: ") + widestring(pqxx::to_string(lead_need));
-                               this_width = my_draw_text(text, NULL, 18.0, "data");
-                               my_draw_text(text, buf, 18.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
+                               this_width = my_draw_text(text, NULL, 18.0, "need");
+                               my_draw_text(text, buf, 18.0, "need", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
 
                                y += 30;
                        }
@@ -555,8 +555,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
                        if (win_need > 0) {
                                text = widestring("Needs to win: ") + widestring(pqxx::to_string(win_need));
 
-                               this_width = my_draw_text(text, NULL, 18.0, "data");
-                               my_draw_text(text, buf, 18.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
+                               this_width = my_draw_text(text, NULL, 18.0, "need");
+                               my_draw_text(text, buf, 18.0, "need", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
 
                                y += 30;
                        }
@@ -575,8 +575,8 @@ void GroupScreen::draw_next_up_player(unsigned char *buf, const Group &group, co
                                        text = widestring("Needs to secure qualification: ") + widestring(pqxx::to_string(qual_need));
                                }
 
-                               this_width = my_draw_text(text, NULL, 18.0, "data");
-                               my_draw_text(text, buf, 18.0, "data", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
+                               this_width = my_draw_text(text, NULL, 18.0, "need");
+                               my_draw_text(text, buf, 18.0, "need", (LOGICAL_SCREEN_WIDTH/2) - this_width/2, y);
 
                                y += 30;
                        }
@@ -716,8 +716,8 @@ 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, "data");
-               my_draw_text_deferred(td, text, 22.0, "data", "freshdata", x + colwidth[num_scores + 2] / 2 - this_width / 2, y);
+               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);
 
                if (show_players > 7)
                        y += 40 - (show_players - 7) * 4;