Support having a second scorebug for a second BT6000-controlled match.

[ultimatescore] / client / mainwindow.cpp

diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp
index 032591e03f215c4b2e6a0b5da533d2926743a981..3ea51a013db70c18cdbb2fe783d3af7020c7806d 100644 (file)
--- a/client/mainwindow.cpp
+++ b/client/mainwindow.cpp
@@ -97,10 +97,12 @@ MainWindow::MainWindow(QWidget *parent) :
                });
        });
 
-       udp_thread = std::thread(&MainWindow::udp_thread_func, this);
+       udp_thread = std::thread(&MainWindow::udp_thread_func, this, 6000);
+       udp_thread2 = std::thread(&MainWindow::udp_thread_func, this, 6001);
 
        connect(ui->ws_disconnect_btn, &QPushButton::clicked, this, &MainWindow::ws_disconnect_clicked);
        connect(ui->set_initials_btn, &QPushButton::clicked, this, &MainWindow::set_initials_clicked);
+       connect(ui->set_match_2_initials_btn, &QPushButton::clicked, this, &MainWindow::set_match_2_initials_clicked);
        connect(ui->set_color_btn, &QPushButton::clicked, this, &MainWindow::set_color_clicked);
        connect(ui->set_score_btn, &QPushButton::clicked, this, &MainWindow::set_score_clicked);
        connect(ui->set_all_scorebug_btn, &QPushButton::clicked, this, &MainWindow::set_all_scorebug_clicked);
@@ -115,6 +117,8 @@ MainWindow::MainWindow(QWidget *parent) :
        connect(ui->stop_clock_btn, &QPushButton::clicked, this, &MainWindow::stop_clock_clicked);
        connect(ui->show_clock_btn, &QPushButton::clicked, this, &MainWindow::show_clock_clicked);
        connect(ui->hide_clock_btn, &QPushButton::clicked, this, &MainWindow::hide_clock_clicked);
+       connect(ui->show_match_2_btn, &QPushButton::clicked, this, &MainWindow::show_match_2_clicked);
+       connect(ui->hide_match_2_btn, &QPushButton::clicked, this, &MainWindow::hide_match_2_clicked);
 
        connect(ui->set_comment_btn, &QPushButton::clicked, this, &MainWindow::set_comment_clicked);
        connect(ui->set_and_show_comment_btn, &QPushButton::clicked, this, &MainWindow::set_and_show_comment_clicked);
@@ -163,6 +167,15 @@ void MainWindow::set_initials_clicked()
        ws->send_command("eval setteams()");
 }
 
+void MainWindow::set_match_2_initials_clicked()
+{
+       map<string, string> param;
+       param["team1"] = escape_html(ui->match_2_initials_1_edit->text().toStdString());
+       param["team2"] = escape_html(ui->match_2_initials_2_edit->text().toStdString());
+       ws->send_command("update " + serialize_as_json(param));
+       ws->send_command("eval setteams2()");
+}
+
 void MainWindow::set_color_clicked()
 {
        map<string, string> param;
@@ -233,6 +246,16 @@ void MainWindow::hide_clock_clicked()
        ws->send_command("eval hideclock()");
 }
 
+void MainWindow::show_match_2_clicked()
+{
+       ws->send_command("eval showmatch2()");
+}
+
+void MainWindow::hide_match_2_clicked()
+{
+       ws->send_command("eval hidematch2()");
+}
+
 void MainWindow::set_comment_clicked()
 {
        map<string, string> param;
@@ -366,7 +389,7 @@ void MainWindow::show_nothing_clicked()
        ws->send_command("eval hidetable()");
 }
 
-void MainWindow::udp_thread_func()
+void MainWindow::udp_thread_func(int port)
 {
        int sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP);
        if (sock == -1) {
@@ -384,7 +407,7 @@ void MainWindow::udp_thread_func()
        memset(&saddr6, 0, sizeof(saddr6));
        saddr6.sin6_family = AF_INET6;
        inet_pton(AF_INET6, "::", &saddr6.sin6_addr);
-       saddr6.sin6_port = htons(6000);
+       saddr6.sin6_port = htons(port);
        if (bind(sock, (sockaddr *)&saddr6, sizeof(saddr6)) == -1) {
                perror("bind");
                exit(1);
@@ -398,8 +421,8 @@ void MainWindow::udp_thread_func()
                        exit(1);
                }
 
-               post_to_main_thread([buf, err, this] {
-                       bt6000_message_received(string(buf, err));
+               post_to_main_thread([buf, err, port, this] {
+                       bt6000_message_received(string(buf, err), port);
                });
        }
 }
@@ -427,11 +450,17 @@ int parse_score(char ch1, char ch2, char ch3)
        return s1 * 100 + s2 * 10 + s3;
 }
 
-void MainWindow::bt6000_message_received(const string &msg)
+void MainWindow::bt6000_message_received(const string &msg, int port)
 {
-       fprintf(stderr, "BT6000 message: '%s'\n", msg.c_str());
-       if (!ui->bt6000_enable->isChecked()) {
-               return;
+       fprintf(stderr, "BT6000 message: '%s' (port %d)\n", msg.c_str(), port);
+       if (port == 6001) {
+               if (!ui->bt6000_2_enable->isChecked()) {
+                       return;
+               }
+       } else {
+               if (!ui->bt6000_enable->isChecked()) {
+                       return;
+               }
        }
 
        if (msg.size() >= 9 && msg[0] == 'G' && msg[1] == '0' && msg[2] == '1') {
@@ -445,20 +474,37 @@ void MainWindow::bt6000_message_received(const string &msg)
                param["clock_min"] = to_string(minutes);
                param["clock_sec"] = to_string(seconds);
                ws->send_command("update " + serialize_as_json(param));
-               ws->send_command("eval adjustclockfromstate()");
 
-               if (clock_running) {
-                       ws->send_command("eval startclock()");
+               if (port == 6001) {
+                       ws->send_command("eval adjustclock2fromstate()");
+                       if (clock_running) {
+                               ws->send_command("eval startclock2()");
+                       } else {
+                               ws->send_command("eval stopclock2()");
+                       }
                } else {
-                       ws->send_command("eval stopclock()");
+                       ws->send_command("eval adjustclockfromstate()");
+                       if (clock_running) {
+                               ws->send_command("eval startclock()");
+                       } else {
+                               ws->send_command("eval stopclock()");
+                       }
                }
        }
        if (msg.size() >= 10 && msg[0] == 'G' && msg[1] == '0' && msg[2] == '2') {
                int score1 = parse_score(msg[4], msg[5], msg[6]);
                int score2 = parse_score(msg[7], msg[8], msg[9]);
-               ui->score_1_box->setValue(score1);
-               ui->score_2_box->setValue(score2);
-               set_score_clicked();
+               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 {
+                       ui->score_1_box->setValue(score1);
+                       ui->score_2_box->setValue(score2);
+                       set_score_clicked();
+               }
        }
 
        // Ignore type 3 (penalties) and type 4 (timeouts).