X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=main.cpp;h=2edd111c346de1dd356a5cee6f5b149a6ab66c58;hb=1f701edba5013eedf60558b568b3c72ab81a2c08;hp=01b158373c1bc9cf620744055134dbe8a5a3ddf9;hpb=812ca0c734b4b297a5d6be8c171863491568e787;p=pkanalytics

diff --git a/main.cpp b/main.cpp
index 01b1583..2edd111 100644
--- a/main.cpp
+++ b/main.cpp
@@ -5,6 +5,7 @@
 #include <QVideoWidget>
 #include <QShortcut>
 #include <QInputDialog>
+#include <QTimer>
 #include <algorithm>
 #include <string>
 #include <map>
@@ -68,7 +69,9 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players,
 	ui->player_view->horizontalHeader()->setStretchLastSection(true);
 
 	auto formation_changed = [this](const QModelIndex &current, const QModelIndex &previous) {
-		update_action_buttons(video->position());
+		QTimer::singleShot(1, [=]{  // The selection is wrong until the callback actually returns.
+			update_action_buttons(video->position());
+		});
 	};
 	ui->offensive_formation_view->setModel(offensive_formations);
 	ui->defensive_formation_view->setModel(defensive_formations);
@@ -177,6 +180,9 @@ 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]() {
@@ -267,6 +273,39 @@ void MainWindow::set_current_event_type(const string &type)
 	update_ui_from_time(video->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(video->position());
+			return;
+		}
+	}
+
+	// Insert a new formation event instead (same as double-click on the selected one).
+	events->set_formation_at(video->position(), offense, formation_id);
+	update_ui_from_time(video->position());
+}
+
 void MainWindow::delete_current_event()
 {
 	QItemSelectionModel *select = ui->event_view->selectionModel();
@@ -506,6 +545,7 @@ void MainWindow::formation_double_clicked(bool offense, unsigned row)
 	} else {
 		events->set_formation_at(video->position(), offense, id);
 	}
+	update_ui_from_time(video->position());
 }
 
 sqlite3 *open_db(const char *filename)