X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=560a9a658676b09723edab126b6230a5ac8c3190;hb=1dabb8bdf81cbdb19fc84278f7b9bb40d469ad0a;hp=01b158373c1bc9cf620744055134dbe8a5a3ddf9;hpb=96a511ed5406bf94743854aa8fa99b4137935574;p=pkanalytics diff --git a/main.cpp b/main.cpp index 01b1583..560a9a6 100644 --- a/main.cpp +++ b/main.cpp @@ -2,9 +2,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -17,6 +17,7 @@ #include "players.h" #include "formations.h" #include "json.h" +#include "video_widget.h" using namespace std; @@ -38,22 +39,20 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, FormationsModel *offensive_formations, FormationsModel *defensive_formations) : events(events), players(players), offensive_formations(offensive_formations), defensive_formations(defensive_formations) { - video = new QMediaPlayer; - //video->setSource(QUrl::fromLocalFile("/home/sesse/dev/stats/ultimate.mkv")); - video->setSource(QUrl::fromLocalFile("/home/sesse/dev/stats/ultimate-prores.mkv")); - video->play(); - ui = new Ui::MainWindow; ui->setupUi(this); + ui->video->open("/home/sesse/dev/stats/ultimate-prores.mkv"); + ui->video->play(); + ui->event_view->setModel(events); ui->event_view->setColumnWidth(1, 150); ui->event_view->setColumnWidth(2, 150); connect(ui->event_view->selectionModel(), &QItemSelectionModel::currentRowChanged, [this, events](const QModelIndex ¤t, const QModelIndex &previous) { uint64_t t = events->get_time(current.row()); - if (t != video->position()) { - video->setPosition(events->get_time(current.row())); + if (t != ui->video->get_position()) { + ui->video->seek_absolute(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 @@ -68,7 +67,9 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, ui->player_view->horizontalHeader()->setStretchLastSection(true); auto formation_changed = [this](const QModelIndex ¤t, const QModelIndex &previous) { - update_action_buttons(video->position()); + QTimer::singleShot(1, [=]{ // The selection is wrong until the callback actually returns. + update_action_buttons(ui->video->get_position()); + }); }; ui->offensive_formation_view->setModel(offensive_formations); ui->defensive_formation_view->setModel(defensive_formations); @@ -81,47 +82,33 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, formation_double_clicked(false, index.row()); }); - connect(video, &QMediaPlayer::positionChanged, [this](uint64_t pos) { + connect(ui->video, &VideoWidget::position_changed, [this](uint64_t pos) { position_changed(pos); }); - video->setVideoOutput(ui->video); // It's not really clear whether PgUp should be forwards or backwards, // but mpv does at least up = forwards, so that's probably standard. QShortcut *pgdown = new QShortcut(QKeySequence(Qt::Key_PageDown), this); - connect(pgdown, &QShortcut::activated, [this]() { seek(-120000); }); + connect(pgdown, &QShortcut::activated, [this]() { ui->video->seek(-120000); }); QShortcut *pgup = new QShortcut(QKeySequence(Qt::Key_PageUp), this); - connect(pgup, &QShortcut::activated, [this]() { seek(120000); }); - - // Ugh. Used when Qt messes up and hangs the video. - QShortcut *f5 = new QShortcut(QKeySequence(Qt::Key_F5), this); - connect(f5, &QShortcut::activated, [this]() { - QVideoWidget *nvw = new QVideoWidget(ui->video->parentWidget()); - nvw->setObjectName("video"); - nvw->setMinimumSize(QSize(320, 240)); - video->setVideoOutput(nvw); - ui->main_grid->replaceWidget(ui->video, nvw); - ui->video = nvw; - }); + connect(pgup, &QShortcut::activated, [this]() { ui->video->seek(120000); }); - connect(ui->minus10s, &QPushButton::clicked, [this]() { seek(-10000); }); - connect(ui->plus10s, &QPushButton::clicked, [this]() { seek(10000); }); + connect(ui->minus10s, &QPushButton::clicked, [this]() { ui->video->seek(-10000); }); + connect(ui->plus10s, &QPushButton::clicked, [this]() { ui->video->seek(10000); }); - connect(ui->minus2s, &QPushButton::clicked, [this]() { seek(-2000); }); - connect(ui->plus2s, &QPushButton::clicked, [this]() { seek(2000); }); + connect(ui->minus2s, &QPushButton::clicked, [this]() { ui->video->seek(-2000); }); + connect(ui->plus2s, &QPushButton::clicked, [this]() { ui->video->seek(2000); }); - // TODO: Would be nice to actually have a frame... - connect(ui->minus1f, &QPushButton::clicked, [this]() { seek(-20); }); - connect(ui->plus1f, &QPushButton::clicked, [this]() { seek(20); }); + connect(ui->minus1f, &QPushButton::clicked, [this]() { ui->video->seek_frames(-1); }); + connect(ui->plus1f, &QPushButton::clicked, [this]() { ui->video->seek_frames(1); }); connect(ui->play_pause, &QPushButton::clicked, [this]() { if (playing) { - video->pause(); + ui->video->pause(); ui->play_pause->setText("Play (space)"); } else { - video->setPlaybackRate(1.0); - video->play(); + ui->video->play(); ui->play_pause->setText("Pause (space)"); } playing = !playing; @@ -142,7 +129,7 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, 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, events]() { - EventsModel::Status s = events->get_status_at(video->position()); + EventsModel::Status s = events->get_status_at(ui->video->get_position()); if (s.attack_state == EventsModel::Status::DEFENSE && s.pull_state == EventsModel::Status::PULL_IN_AIR) { insert_noplayer_event("pull_oob"); } else { @@ -154,10 +141,10 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, 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, events]() { - EventsModel::Status s = events->get_status_at(video->position()); + EventsModel::Status s = events->get_status_at(ui->video->get_position()); if (s.pull_state == EventsModel::Status::SHOULD_PULL) { set_current_event_type("pull"); - } else if (EventsModel::Status::PULL_IN_AIR) { + } else if (s.pull_state == EventsModel::Status::PULL_IN_AIR) { insert_noplayer_event("pull_landed"); } }); @@ -168,7 +155,7 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, 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, events]() { - EventsModel::Status s = events->get_status_at(video->position()); + EventsModel::Status s = events->get_status_at(ui->video->get_position()); if (s.pull_state == EventsModel::Status::SHOULD_PULL) { insert_noplayer_event("their_pull"); } @@ -177,10 +164,13 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, 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"); }); + connect(ui->offensive_formation, &QPushButton::clicked, [this]() { insert_or_change_formation(/*offense=*/true); }); + connect(ui->defensive_formation, &QPushButton::clicked, [this]() { insert_or_change_formation(/*offense=*/false); }); + // 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()); + EventsModel::Status s = events->get_status_at(ui->video->get_position()); if (s.stoppage) { insert_noplayer_event("restart"); } else { @@ -197,36 +187,21 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players, void MainWindow::position_changed(uint64_t pos) { ui->timestamp->setText(QString::fromUtf8(format_timestamp(pos))); - if (buffered_seek) { - video->setPosition(*buffered_seek); - buffered_seek.reset(); - } if (!playing) { - video->pause(); // We only played to get a picture. + ui->video->pause(); // We only played to get a picture. } if (playing) { - QModelIndex row = events->get_last_event_qt(video->position()); + QModelIndex row = events->get_last_event_qt(ui->video->get_position()); ui->event_view->scrollTo(row, QAbstractItemView::PositionAtCenter); } update_ui_from_time(pos); } -void MainWindow::seek(int64_t delta_ms) -{ - int64_t current_pos = buffered_seek ? *buffered_seek : video->position(); - uint64_t pos = max(current_pos + delta_ms, 0); - buffered_seek = pos; - if (!playing) { - video->setPlaybackRate(0.01); - video->play(); // Or Qt won't show the seek. - } -} - void MainWindow::insert_player_event(int button_id) { - uint64_t t = video->position(); + uint64_t t = ui->video->get_position(); vector team = events->sort_team(events->get_team_at(t)); - if (button_id >= team.size()) { + if (unsigned(button_id) >= team.size()) { return; } int player_id = team[button_id]; @@ -247,7 +222,7 @@ void MainWindow::insert_player_event(int button_id) void MainWindow::insert_noplayer_event(const string &type) { - uint64_t t = video->position(); + uint64_t t = ui->video->get_position(); ui->event_view->selectionModel()->blockSignals(true); ui->event_view->selectRow(events->insert_event(t, nullopt, nullopt, type)); @@ -264,7 +239,40 @@ 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_ui_from_time(video->position()); + update_ui_from_time(ui->video->get_position()); +} + +// Formation buttons either modify the existing formation (if we've selected +// a formation change event), or insert a new one (if not). +void MainWindow::insert_or_change_formation(bool offense) +{ + FormationsModel *formations = offense ? offensive_formations : defensive_formations; + QListView *formation_view = offense ? ui->offensive_formation_view : ui->defensive_formation_view; + if (!formation_view->selectionModel()->hasSelection()) { + // This shouldn't happen; the button should not have been enabled. + return; + } + int formation_row = formation_view->selectionModel()->selectedRows().front().row(); // Should only be one, due to our selection behavior. + int formation_id = formations->get_formation_id(formation_row); + if (formation_id == -1) { + // This also shouldn't happen (“Add new…” selected). + return; + } + + QItemSelectionModel *select = ui->event_view->selectionModel(); + if (select->hasSelection()) { + int row = select->selectedRows().front().row(); // Should only be one, due to our selection behavior. + string expected_type = offense ? "formation_offense" : "formation_defense"; + if (events->get_event_type(row) == expected_type) { + events->set_event_formation(row, formation_id); + update_ui_from_time(ui->video->get_position()); + return; + } + } + + // Insert a new formation event instead (same as double-click on the selected one). + events->set_formation_at(ui->video->get_position(), offense, formation_id); + update_ui_from_time(ui->video->get_position()); } void MainWindow::delete_current_event() @@ -277,7 +285,7 @@ void MainWindow::delete_current_event() ui->event_view->selectionModel()->blockSignals(true); events->delete_event(row); ui->event_view->selectionModel()->blockSignals(false); - update_ui_from_time(video->position()); + update_ui_from_time(ui->video->get_position()); } void MainWindow::make_substitution() @@ -287,7 +295,7 @@ void MainWindow::make_substitution() for (QModelIndex row : select->selectedRows()) { new_team.insert(players->get_player_id(row.row())); } - events->set_team_at(video->position(), new_team); + events->set_team_at(ui->video->get_position(), new_team); } void MainWindow::update_ui_from_time(uint64_t t) @@ -504,8 +512,9 @@ void MainWindow::formation_double_clicked(bool offense, unsigned row) view->selectionModel()->select(formations->index(formations->get_row_from_id(id), 0), QItemSelectionModel::ClearAndSelect); events->inserted_new_formation(id, new_formation_str.toStdString()); } else { - events->set_formation_at(video->position(), offense, id); + events->set_formation_at(ui->video->get_position(), offense, id); } + update_ui_from_time(ui->video->get_position()); } sqlite3 *open_db(const char *filename)