The auxilliary screen now also shows all finished groups.

[ccbs] / bigscreen / ccbs_bigscreen.cpp

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 829f84d0a1d9a49a9761e0fe1e514edab25a5e21..0892c16a7f66d26d4a619f36fd78e63edf12647a 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -8,54 +8,90 @@
 #include "widestring.h"
 #include "fetch_current_tournament.h"
 #include "fetch_list_of_active_groups.h"
+#include "fetch_list_of_finished_groups.h"
 #include "fetch_group.h"
+#include "fetch_auxilliary_screens.h"
 #include "fonts.h"
 #include "groupscreen.h"
+#include "top10scorescreen.h"
+#include "top5chosenscreen.h"
 #include "splitscreen.h"
 #include "rotatescreen.h"
 
 Tournament active_tournament;
 std::vector<SkeletonGroup> active_groups;
 std::vector<GenericScreen *> screens;
-//SplitScreen *mainscreen = NULL;
-RotateScreen *mainscreen = NULL;
+GenericScreen *mainscreen = NULL;
 unsigned char framebuf[800 * 600 * 4], screenbuf[800 * 600 * 4];
 
 void init(pqxx::connection &conn)
 {
+       std::vector<widestring> aux_screens;
+               
+       if (screens.size() == 0 || mainscreen != screens[0])
+               delete mainscreen;
+       
        for (std::vector<GenericScreen *>::const_iterator i = screens.begin(); i != screens.end(); ++i) {
                delete *i;
        }
        screens.erase(screens.begin(), screens.end());
-       
-       delete mainscreen;
-       
+
        conn.perform(FetchCurrentTournament(&active_tournament));
        conn.perform(FetchListOfActiveGroups(&active_groups));
 
-       mainscreen = new RotateScreen();
-       
        if (active_tournament.id == -1) {
                std::fprintf(stderr, "No active tournament\n");
        } else {
                std::fprintf(stderr, "Current tournament is %d\n", active_tournament.id);
 
                for (std::vector<SkeletonGroup>::const_iterator i = active_groups.begin(); i != active_groups.end(); ++i) {
-                       std::fprintf(stderr, "tourn: %u  round: %u   parallel: %u\n",
-                               i->tournament, i->round, i->parallel);
+                       std::fprintf(stderr, "tourn: %u  round: %u  parallel: %u  num_machines: %u\n",
+                               i->tournament, i->round, i->parallel, i->num_machines);
+
+                       // memory leaks here?
+                       for (unsigned j = 0; j < i->num_machines; ++j) {
+                               RotateScreen *rs = new RotateScreen();
+                               screens.push_back(rs);
+                               rs->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, j, i->num_machines));
+                       }
+               }
+       }
 
-                       screens.push_back(new GroupScreen(conn, i->tournament, i->round, i->parallel));
-                       mainscreen->add_screen(screens[screens.size() - 1]);
+       RotateScreen *aux_screen = new RotateScreen();
+       screens.push_back(aux_screen);
+       
+       conn.perform(FetchAuxilliaryScreens(&aux_screens));
+       for (std::vector<widestring>::const_iterator i = aux_screens.begin(); i != aux_screens.end(); ++i) {
+               if (*i == widestring("top10scores")) {
+                       aux_screen->add_screen(new Top10ScoreScreen(conn, active_tournament.id));
+                       continue;
+               }
+               if (*i == widestring("top5chosen")) {
+                       aux_screen->add_screen(new Top5ChosenScreen(conn, active_tournament.id));
+                       continue;
                }
+               std::fprintf(stderr, "Foobarbaz?\n");
        }
 
+       // add all finished screens to the auxilliary screens
+       std::vector<SkeletonGroup> finished_groups;
+       conn.perform(FetchListOfFinishedGroups(active_tournament.id, &finished_groups));
+               
+       for (std::vector<SkeletonGroup>::const_iterator i = finished_groups.begin(); i != finished_groups.end(); ++i) {
+               aux_screen->add_screen(new GroupScreen(conn, i->tournament, i->round, i->parallel, 0, 1));
+       }
+       
        // hack
        screens.push_back(NULL);
        screens.push_back(NULL);
        screens.push_back(NULL);
        screens.push_back(NULL);
 
-       //mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
+       if (screens[1] == NULL) {
+               mainscreen = screens[0];
+       } else {
+               mainscreen = new SplitScreen(screens[0], screens[1], screens[2], screens[3]);
+       }
 }
 
 void main_loop(pqxx::connection &conn)
@@ -66,12 +102,14 @@ void main_loop(pqxx::connection &conn)
                return;
        }
 
-       if (mainscreen->check_invalidated()) {
+       if (mainscreen && mainscreen->check_invalidated()) {
                mainscreen->draw(framebuf);
+               ptc_update(framebuf);
+               conn.await_notification(0, 10000);
+       } else {
+               ptc_update(framebuf);
+               conn.await_notification(0, 200000);
        }
-       ptc_update(framebuf);
-
-       conn.await_notification(0, 50000);
 }
 
 int main(int argc, char **argv)