Don't show column headings for chosen songs, as they are not the same everywhere...

[ccbs] / bigscreen / groupscreen.cpp

diff --git a/bigscreen/groupscreen.cpp b/bigscreen/groupscreen.cpp
index e410de9b15019b5331e18e4d43fbd056d29db0f5..86ff4672e97d58518156d9838dde9b5c73e83020 100644 (file)
--- a/bigscreen/groupscreen.cpp
+++ b/bigscreen/groupscreen.cpp
@@ -1,8 +1,11 @@
+#include <algorithm>
+
 #include "groupscreen.h"
 #include "fetch_group.h"
+#include "fonts.h"
 
 GroupScreen::GroupScreen(pqxx::connection &conn, unsigned tournament, unsigned round, unsigned parallel)
-       : tournament(tournament), round(tournament), parallel(parallel), scores_changed(conn, "scores"), conn(conn), valid(false)
+       : tournament(tournament), round(round), parallel(parallel), scores_changed(conn, "scores"), conn(conn), valid(false)
 {
 }
 
@@ -23,6 +26,57 @@ void GroupScreen::draw(unsigned char *buf)
        Group group;
        conn.perform(FetchGroup(tournament, round, parallel, &group));
 
+       memset(buf, 0, 800 * 600 * 4);
+       
+       // find out how wide each column has to be
+       unsigned width[16];
+       for (unsigned i = 0; i < 16; ++i)
+               width[i] = 0;
+
+       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+               width[0] = std::max(width[0], my_draw_text(i->nick, NULL, 0, 0, false, 0, 0, 0));
+
+               unsigned col = 1;
+               for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
+                       if (j->chosen) {
+                               width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 0, 0, false, 0, 0, 0) + 
+                                                                 my_draw_text("8888", NULL, 0, 0, false, 0, 0, 0) + 10);
+                       } else {                
+                               width[col] = std::max(width[col], my_draw_text(j->song.title, NULL, 0, 0, false, 0, 0, 0));
+                               width[col] = std::max(width[col], my_draw_text("8888", NULL, 0, 0, false, 0, 0, 0));
+                       }
+               }
+       }       
+
+       // make column headings from the first player's songs
+       unsigned col = 1, x = 40 + width[0];
+       for (std::vector<Score>::const_iterator i = group.players[0].scores.begin(); i != group.players[0].scores.end(); ++i, ++col) {
+               if (!i->chosen)
+                       my_draw_text(i->song.title, buf, x, 30, true, 255, 255, 255);
+               x += width[col] + 20;
+       }
+       
+       // show all the players and the scores
+       unsigned y = 50;
+       for (std::vector<Player>::const_iterator i = group.players.begin(); i != group.players.end(); ++i) {
+               my_draw_text(i->nick, buf, 20, y, true, 255, 255, 255);
+
+               unsigned x = 40 + width[0];
+
+               unsigned col = 1;
+               for (std::vector<Score>::const_iterator j = i->scores.begin(); j != i->scores.end(); ++j, ++col) {
+                       char text[16];
+                       sprintf(text, "%u", j->score);
+                       
+                       if (j->score != -1) {
+                               my_draw_text(text, buf, x, y, true, 255, 255, 255);
+                       }
+                       x += width[col] + 20;
+               }
+
+               y += 20;
+       }
+       
        valid = true;
 }