Make the roster scripts executable.

[ultimatescore] / client / mainwindow.cpp

diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index a654acf53273a9c6bbe71cbfd5bb6a8d9bbd4eac..24cdc8b564b66280f4095d90da1a49bebd5a14fd 100644 (file)
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -91,19 +91,21 @@ MainWindow::MainWindow(QWidget *parent) :
 {
        ui->setupUi(this);
        for (QComboBox *team_combo : { ui->initials_1_edit, ui->initials_2_edit, ui->match_2_initials_1_edit, ui->match_2_initials_2_edit, ui->match_3_initials_1_edit, ui->match_3_initials_2_edit }) {
-               team_combo->addItem("BFK");
-               team_combo->addItem("BRI");
-               team_combo->addItem("BSI");
-               team_combo->addItem("ESK");
-               team_combo->addItem("GRI");
-               team_combo->addItem("NMBUI");
-               team_combo->addItem("OBSI");
-               team_combo->addItem("OSI");
-               team_combo->addItem("PCL1");
-               team_combo->addItem("PCL2");
-               team_combo->addItem("TFK");
-               team_combo->addItem("TSI");
-               team_combo->addItem("UUJJ");
+       //      team_combo->addItem("BFK", "navy");
+               team_combo->addItem("BRI", "navy");
+               team_combo->addItem("BSI1", "white");
+               team_combo->addItem("BSI2", "black");
+               team_combo->addItem("ESK", "white");
+               team_combo->addItem("FRA", "navy");
+               team_combo->addItem("NHHI", "navy");
+               team_combo->addItem("NMBUI", "cyan");
+               team_combo->addItem("OSI", "black");
+               team_combo->addItem("PCL", "red");
+               team_combo->addItem("STO", "");
+               team_combo->addItem("TFK1", "yellow");
+               team_combo->addItem("TFK2", "yellow");
+               team_combo->addItem("TFK3", "yellow");
+               team_combo->addItem("TSI", "orange");
        }
 
        ws = new WSServer("127.0.0.1", 5250);
@@ -164,6 +166,13 @@ MainWindow::MainWindow(QWidget *parent) :
        connect(ui->show_roster_2_btn, &QPushButton::clicked, this, [this]() { show_roster_clicked(ui->initials_2_edit->currentText().toStdString()); });
        connect(ui->show_roster_carousel_btn, &QPushButton::clicked, this, &MainWindow::show_roster_carousel_clicked);
 
+       connect(ui->initials_1_edit, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index) {
+               ui->color_1_edit->setText(ui->initials_1_edit->itemData(index).toString());
+       });
+       connect(ui->initials_2_edit, QOverload<int>::of(&QComboBox::currentIndexChanged), [=](int index) {
+               ui->color_2_edit->setText(ui->initials_2_edit->itemData(index).toString());
+       });
+
        autocomment_update();
 
        const set<pair<unsigned, unsigned>> usb{{ 0x0e8f, 0x0041 }};
@@ -506,6 +515,13 @@ int parse_clock(char ch1, char ch2)
        return s1 * 10 + s2;
 }
 
+int parse_score(char ch2, char ch3)
+{
+       int s2 = parse_digit(ch2);
+       int s3 = parse_digit(ch3);
+       return s2 * 10 + s3;
+}
+
 int parse_score(char ch1, char ch2, char ch3)
 {
        int s1 = parse_digit(ch1);
@@ -514,6 +530,19 @@ int parse_score(char ch1, char ch2, char ch3)
        return s1 * 100 + s2 * 10 + s3;
 }
 
+int parse_score_weird(char ch1, char ch2, char ch3)
+{
+       char str[4];
+       char *ptr = str;
+       if (ch1 != ' ') *ptr++ = ch1;
+       if (ch2 != ' ') *ptr++ = ch2;
+       if (ch3 != ' ') *ptr++ = ch3;
+       *ptr++ = 0;
+
+       return atoi(str);       
+}
+
+
 void MainWindow::bt6000_message_received(const string &msg, int port)
 {
        fprintf(stderr, "BT6000 message: '%s' (port %d)\n", msg.c_str(), port);
@@ -587,6 +616,62 @@ void MainWindow::bt6000_message_received(const string &msg, int port)
                        set_score_clicked();
                }
        }
+       if (msg.size() >= 9 && msg[0] == 'G' && msg[1] == '1' && msg[2] == '0') {
+               // G10: Game clock, score, period?
+               bool clock_running = !(msg[3] & 0x02);
+//             bool klaxon = (msg[3] & 0x04);
+               int minutes = parse_clock(msg[4], msg[5]);
+               int seconds = parse_clock(msg[6], msg[7]);
+               int score1 = parse_score_weird(msg[8], msg[9], msg[10]);
+               int score2 = parse_score_weird(msg[11], msg[12], msg[13]);
+
+               map<string, string> param;
+               ws->send_command("update " + serialize_as_json(param));
+
+               if (port == 6002) {
+                       map<string, string> param;
+                       param["score1"] = to_string(score1);
+                       param["score2"] = to_string(score2);
+                       ws->send_command("update " + serialize_as_json(param));
+                       ws->send_command("eval setscore3()");
+               } else if (port == 6001) {
+                       map<string, string> param;
+                       param["score1"] = to_string(score1);
+                       param["score2"] = to_string(score2);
+                       ws->send_command("update " + serialize_as_json(param));
+                       ws->send_command("eval setscore2()");
+               } else {
+                       map<string, string> param;
+                       param["clock_min"] = to_string(minutes);
+                       param["clock_sec"] = to_string(seconds);
+                       ws->send_command("update " + serialize_as_json(param));
+                       ui->score_1_box->setValue(score1);
+                       ui->score_2_box->setValue(score2);
+                       set_score_clicked();
+               }
+               if (port == 6002) {
+                       ws->send_command("eval adjustclockfromstate(2)");
+                       if (clock_running) {
+                               ws->send_command("eval startclock(2)");
+                       } else {
+                               ws->send_command("eval stopclock(2)");
+                       }
+               } else if (port == 6001) {
+                       ws->send_command("eval adjustclockfromstate(1)");
+                       if (clock_running) {
+                               ws->send_command("eval startclock(1)");
+                       } else {
+                               ws->send_command("eval stopclock(1)");
+                       }
+               } else {
+                       ws->send_command("eval adjustclockfromstate(0)");
+                       if (clock_running) {
+                               ws->send_command("eval startclock(0)");
+                       } else {
+                               ws->send_command("eval stopclock(0)");
+                       }
+               }
+       }
 
        // Ignore type 3 (penalties) and type 4 (timeouts).
 }