From 3f9de8e0aae968c3c0a0dd55dd43107407a63e9b Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 3 May 2023 18:56:01 +0200 Subject: [PATCH] Small cleanup for insert_event(). --- main.cpp | 20 ++++++++++---------- mainwindow.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/main.cpp b/main.cpp index a89e478..fc44d5c 100644 --- a/main.cpp +++ b/main.cpp @@ -91,13 +91,13 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players) : events(even ui->play_pause->setShortcut(QCoreApplication::translate("MainWindow", "Space", nullptr)); }); - connect(ui->player_1, &QPushButton::clicked, [this]() { insert_event(1); }); - connect(ui->player_2, &QPushButton::clicked, [this]() { insert_event(2); }); - connect(ui->player_3, &QPushButton::clicked, [this]() { insert_event(3); }); - connect(ui->player_4, &QPushButton::clicked, [this]() { insert_event(4); }); - connect(ui->player_5, &QPushButton::clicked, [this]() { insert_event(5); }); - connect(ui->player_6, &QPushButton::clicked, [this]() { insert_event(6); }); - connect(ui->player_7, &QPushButton::clicked, [this]() { insert_event(7); }); + connect(ui->player_1, &QPushButton::clicked, [this]() { insert_player_event(0); }); + connect(ui->player_2, &QPushButton::clicked, [this]() { insert_player_event(1); }); + connect(ui->player_3, &QPushButton::clicked, [this]() { insert_player_event(2); }); + connect(ui->player_4, &QPushButton::clicked, [this]() { insert_player_event(3); }); + connect(ui->player_5, &QPushButton::clicked, [this]() { insert_player_event(4); }); + connect(ui->player_6, &QPushButton::clicked, [this]() { insert_player_event(5); }); + connect(ui->player_7, &QPushButton::clicked, [this]() { insert_player_event(6); }); // Offensive events connect(ui->offense_label, &ClickableLabel::clicked, [this]() { insert_noplayer_event("set_offense"); }); @@ -182,14 +182,14 @@ void MainWindow::seek(int64_t delta_ms) } } -void MainWindow::insert_event(int button_id) +void MainWindow::insert_player_event(int button_id) { uint64_t t = video->position(); vector team = events->sort_team(events->get_team_at(t)); - if (button_id > team.size()) { + if (button_id >= team.size()) { return; } - int player_id = team[button_id - 1]; + int player_id = team[button_id]; EventsModel::Status s = events->get_status_at(t); diff --git a/mainwindow.h b/mainwindow.h index 805fb12..2d702c7 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -18,7 +18,7 @@ public: private: void position_changed(uint64_t pos); void seek(int64_t delta_ms); - void insert_event(int button_id); + void insert_player_event(int button_id); void insert_noplayer_event(const std::string &type); void set_current_event_type(const std::string &type); void delete_current_event(); -- 2.39.2