]> git.sesse.net Git - pkanalytics/blobdiff - main.cpp
Fix a corner case around clicking event rows.
[pkanalytics] / main.cpp
index d3b4ae943fcb0617dba20fb38604301aeb1786c5..2caa63fbf3fdb6190dc1de55d3a47b2ac76bb868 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -44,7 +44,15 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players) : events(even
        ui->event_view->setModel(events);
        connect(ui->event_view->selectionModel(), &QItemSelectionModel::currentRowChanged,
                [this, events](const QModelIndex &current, const QModelIndex &previous) {
-                       video->setPosition(events->get_time(current.row()));
+                       uint64_t t = events->get_time(current.row());
+                       if (t != video->position()) {
+                               video->setPosition(events->get_time(current.row()));
+                       } else {
+                               // Selection could have changed, so we still need to update.
+                               // (Just calling setPosition() would not give us the signal
+                               // in this case.)
+                               update_ui_from_time(t);
+                       }
                });
 
        ui->player_view->setModel(players);
@@ -88,7 +96,8 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players) : events(even
        connect(ui->player_6, &QPushButton::clicked, [this]() { insert_event(6); });
        connect(ui->player_7, &QPushButton::clicked, [this]() { insert_event(7); });
 
-       // TODO: disable if nothing is selected
+       // Offensive events
+       connect(ui->offense_label, &ClickableLabel::clicked, [this]() { insert_noplayer_event("set_offense"); });
        connect(ui->catch_, &QPushButton::clicked, [this]() { set_current_event_type("catch"); });
        connect(ui->throwaway, &QPushButton::clicked, [this]() { set_current_event_type("throwaway"); });
        connect(ui->drop, &QPushButton::clicked, [this]() { set_current_event_type("drop"); });
@@ -96,9 +105,28 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players) : events(even
        connect(ui->offensive_soft_plus, &QPushButton::clicked, [this]() { set_current_event_type("offensive_soft_plus"); });
        connect(ui->offensive_soft_minus, &QPushButton::clicked, [this]() { set_current_event_type("offensive_soft_minus"); });
        connect(ui->pull, &QPushButton::clicked, [this]() { set_current_event_type("pull"); });
-       connect(ui->pull_landed, &QPushButton::clicked, [this]() { set_current_event_type("pull_landed"); });
-
+       connect(ui->pull_landed, &QPushButton::clicked, [this]() { insert_noplayer_event("pull_landed"); });
+
+       // Defensive events (TODO add more)
+       connect(ui->defense_label, &ClickableLabel::clicked, [this]() { insert_noplayer_event("set_defense"); });
+       connect(ui->their_throwaway, &QPushButton::clicked, [this]() { insert_noplayer_event("their_throwaway"); });
+       connect(ui->their_goal, &QPushButton::clicked, [this]() { insert_noplayer_event("their_goal"); });
+       connect(ui->their_pull, &QPushButton::clicked, [this]() { insert_noplayer_event("their_pull"); });
+       connect(ui->our_defense, &QPushButton::clicked, [this]() { set_current_event_type("defense"); });
+       connect(ui->defensive_soft_plus, &QPushButton::clicked, [this]() { set_current_event_type("defensive_soft_plus"); });
+       connect(ui->defensive_soft_minus, &QPushButton::clicked, [this]() { set_current_event_type("defensive_soft_minus"); });
+
+       // Misc. events
        connect(ui->substitution, &QPushButton::clicked, [this]() { make_substitution(); });
+       connect(ui->stoppage, &QPushButton::clicked, [this, events]() {
+               EventsModel::Status s = events->get_status_at(video->position());
+               if (s.stoppage) {
+                       insert_noplayer_event("restart");
+               } else {
+                       insert_noplayer_event("stoppage");
+               }
+       });
+       connect(ui->unknown, &QPushButton::clicked, [this]() { insert_noplayer_event("unknown"); });
 
        QShortcut *key_delete = new QShortcut(QKeySequence(Qt::Key_Delete), this);
        connect(key_delete, &QShortcut::activated, [this]() { ui->delete_->animateClick(); });
@@ -115,7 +143,7 @@ void MainWindow::position_changed(uint64_t pos)
        if (!playing) {
                video->pause();  // We only played to get a picture.
        }
-       update_status();
+       update_ui_from_time(pos);
 }
 
 void MainWindow::seek(int64_t delta_ms)
@@ -131,9 +159,36 @@ void MainWindow::seek(int64_t delta_ms)
 
 void MainWindow::insert_event(int button_id)
 {
+       uint64_t t = video->position();
+       set<int> team = events->get_team_at(t);
+       if (button_id > team.size()) {
+               return;
+       }
+       int player_id = *next(team.begin(), button_id - 1);
+
+       EventsModel::Status s = events->get_status_at(t);
+
        ui->event_view->selectionModel()->blockSignals(true);
-       ui->event_view->selectRow(events->insert_event(video->position(), button_id));
+       if (s.offense) {
+               // TODO: Perhaps not if that player already did the last catch?
+               ui->event_view->selectRow(events->insert_event(t, player_id, "catch"));
+       } else {
+               ui->event_view->selectRow(events->insert_event(t, player_id));
+       }
        ui->event_view->selectionModel()->blockSignals(false);
+
+       update_ui_from_time(t);
+}
+
+void MainWindow::insert_noplayer_event(const string &type)
+{
+       uint64_t t = video->position();
+
+       ui->event_view->selectionModel()->blockSignals(true);
+       ui->event_view->selectRow(events->insert_event(t, nullopt, type));
+       ui->event_view->selectionModel()->blockSignals(false);
+
+       update_ui_from_time(t);
 }
 
 void MainWindow::set_current_event_type(const string &type)
@@ -144,7 +199,7 @@ void MainWindow::set_current_event_type(const string &type)
        }
        int row = select->selectedRows().front().row();  // Should only be one, due to our selection behavior.
        events->set_event_type(row, type);
-       update_status();
+       update_ui_from_time(video->position());
 }
 
 void MainWindow::delete_current_event()
@@ -157,47 +212,141 @@ void MainWindow::delete_current_event()
        ui->event_view->selectionModel()->blockSignals(true);
        events->delete_event(row);
        ui->event_view->selectionModel()->blockSignals(false);
-       update_status();
+       update_ui_from_time(video->position());
 }
 
 void MainWindow::make_substitution()
 {
        QItemSelectionModel *select = ui->player_view->selectionModel();
-
-       // FIXME: we should backdate t to start of point (last goal, or 0) if:
-       // - no players we're removing have had actions yet
-       // - there have been no other in/out events
-       //
-       // ...but if so, we might need to modify in/out events that are already there
-       // (perhaps just overwrite them all?)
-       uint64_t t = video->position();
-
-       set<int> old_team = events->get_team_at(t);
        set<int> new_team;
-
        for (QModelIndex row : select->selectedRows()) {
                new_team.insert(players->get_player_id(row.row()));
        }
+       events->set_team_at(video->position(), new_team);
+}
 
-       for (int player_id : old_team) {
-               if (!new_team.count(player_id)) {
-                       events->insert_event(t, player_id, "out");
-               }
+void MainWindow::update_ui_from_time(uint64_t t)
+{
+       update_status(t);
+       update_player_buttons(t);
+       update_action_buttons(t);
+}
+
+void MainWindow::update_status(uint64_t t)
+{
+       EventsModel::Status s = events->get_status_at(t);
+       char buf[256];
+       const char *offense = "not started";
+       if (s.offense) {
+               assert(!s.defense);
+               offense = "offense";
+       } else if (s.defense) {
+               offense = "defense";
+       }
+
+       snprintf(buf, sizeof(buf), "%d–%d | %s | %d passes, %d sec possession",
+               s.our_score, s.their_score, offense, s.num_passes, s.possession_sec);
+       if (s.stoppage_sec > 0) {
+               char buf2[256];
+               snprintf(buf2, sizeof(buf2), "%s (plus %d sec stoppage)", buf, s.stoppage_sec);
+               ui->status->setText(buf2);
+       } else {
+               ui->status->setText(buf);
        }
-       for (int player_id : new_team) {
-               if (!old_team.count(player_id)) {
-                       events->insert_event(t, player_id, "in");
+}
+
+void MainWindow::update_player_buttons(uint64_t t)
+{
+       // FIXME: sort by number, instead of by internal ID
+       QPushButton *buttons[] = {
+               ui->player_1,
+               ui->player_2,
+               ui->player_3,
+               ui->player_4,
+               ui->player_5,
+               ui->player_6,
+               ui->player_7
+       };
+       const char shortcuts[] = "qweasdf";
+       int num_players = 0;
+       for (int player_id : events->get_team_at(t)) {
+               QPushButton *btn = buttons[num_players];
+               string label = players->get_player_name_by_id(player_id) + " (&" + shortcuts[num_players] + ")";
+               char shortcut[2] = "";
+               shortcut[0] = toupper(shortcuts[num_players]);
+               btn->setText(QString::fromUtf8(label));
+               btn->setShortcut(QCoreApplication::translate("MainWindow", shortcut, nullptr));
+               btn->setEnabled(true);
+               if (++num_players == 7) {
+                       break;
                }
        }
+       for (int i = num_players; i < 7; ++i) {
+               QPushButton *btn = buttons[i];
+               btn->setText("No player");
+               btn->setEnabled(false);
+       }
 }
 
-void MainWindow::update_status()
+void MainWindow::update_action_buttons(uint64_t t)
 {
-       EventsModel::Status s = events->get_status_at(video->position());
-       char buf[256];
-       snprintf(buf, sizeof(buf), "%d–%d | %s | %d passes, %d sec possession",
-               s.our_score, s.their_score, s.offense ? "offense" : "defense", s.num_passes, s.possession_sec);
-       ui->status->setText(buf);
+       EventsModel::Status s = events->get_status_at(t);
+
+       bool has_selection = false;
+       bool has_selection_with_player = false;
+
+       QItemSelectionModel *select = ui->event_view->selectionModel();
+       if (select->hasSelection()) {
+               has_selection = true;
+               int row = select->selectedRows().front().row();  // Should only be one, due to our selection behavior.
+               has_selection_with_player = events->get_player_id(row).has_value();
+       }
+       ui->delete_->setEnabled(has_selection);
+
+       if (s.stoppage) {
+               ui->stoppage->setText("Restart (&v)");
+               ui->stoppage->setShortcut(QCoreApplication::translate("MainWindow", "V", nullptr));
+               ui->catch_->setEnabled(false);
+               ui->throwaway->setEnabled(false);
+               ui->drop->setEnabled(false);
+               ui->goal->setEnabled(false);
+               ui->offensive_soft_plus->setEnabled(false);
+               ui->offensive_soft_minus->setEnabled(false);
+               ui->pull->setEnabled(false);
+               ui->pull_landed->setEnabled(false);
+               ui->interception->setEnabled(false);
+               ui->their_throwaway->setEnabled(false);
+               ui->our_defense->setEnabled(false);
+               ui->their_goal->setEnabled(false);
+               ui->defensive_soft_plus->setEnabled(false);
+               ui->defensive_soft_minus->setEnabled(false);
+               ui->their_pull->setEnabled(false);
+               ui->our_foul->setEnabled(false);
+               return;
+       } else {
+               ui->stoppage->setText("Stoppage (&v)");
+               ui->stoppage->setShortcut(QCoreApplication::translate("MainWindow", "V", nullptr));
+       }
+
+       ui->catch_->setEnabled(s.offense && has_selection_with_player);
+       ui->throwaway->setEnabled(s.offense && has_selection_with_player);
+       ui->drop->setEnabled(s.offense && has_selection_with_player);
+       ui->goal->setEnabled(s.offense && has_selection_with_player);
+       ui->offensive_soft_plus->setEnabled(s.offense && has_selection_with_player);
+       ui->offensive_soft_minus->setEnabled(s.offense && has_selection_with_player);
+
+       // TODO: be stricter
+       ui->pull->setEnabled(s.defense && s.should_pull && has_selection_with_player);
+       ui->pull_landed->setEnabled(s.defense && has_selection_with_player);
+
+       ui->interception->setEnabled(s.defense && has_selection_with_player);
+       ui->their_throwaway->setEnabled(s.defense);
+       ui->our_defense->setEnabled(s.defense && has_selection_with_player);
+       ui->their_goal->setEnabled(s.defense);
+       ui->defensive_soft_plus->setEnabled(s.defense && has_selection_with_player);
+       ui->defensive_soft_minus->setEnabled(s.defense && has_selection_with_player);
+       ui->their_pull->setEnabled(s.offense && s.should_pull);
+       ui->our_foul->setEnabled(s.defense && has_selection_with_player);
 }
 
 sqlite3 *open_db(const char *filename)