Make a more sensible ordering of the player buttons.

[pkanalytics] / main.cpp

diff --git a/main.cpp b/main.cpp
index 104e1e5875dc23e20efe217ea17b5ee5cad69d95..a89e4785acd17404f8c0825a640c50759248d5dd 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -56,6 +56,9 @@ MainWindow::MainWindow(EventsModel *events, PlayersModel *players) : events(even
                });
 
        ui->player_view->setModel(players);
+       ui->player_view->setColumnWidth(0, 30);
+       ui->player_view->setColumnWidth(1, 20);
+       ui->player_view->horizontalHeader()->setStretchLastSection(true);
 
        connect(video, &QMediaPlayer::positionChanged, [this](uint64_t pos) {
                position_changed(pos);
@@ -161,6 +164,10 @@ void MainWindow::position_changed(uint64_t pos)
        if (!playing) {
                video->pause();  // We only played to get a picture.
        }
+       if (playing) {
+               QModelIndex row = events->get_last_event_qt(video->position());
+               ui->event_view->scrollTo(row, QAbstractItemView::PositionAtCenter);
+       }
        update_ui_from_time(pos);
 }
 
@@ -178,11 +185,11 @@ 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);
+       vector<int> team = events->sort_team(events->get_team_at(t));
        if (button_id > team.size()) {
                return;
        }
-       int player_id = *next(team.begin(), button_id - 1);
+       int player_id = team[button_id - 1];
 
        EventsModel::Status s = events->get_status_at(t);
 
@@ -274,7 +281,6 @@ void MainWindow::update_status(uint64_t t)
 
 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,
@@ -286,7 +292,7 @@ void MainWindow::update_player_buttons(uint64_t t)
        };
        const char shortcuts[] = "qweasdf";
        int num_players = 0;
-       for (int player_id : events->get_team_at(t)) {
+       for (int player_id : events->sort_team(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] = "";
@@ -337,7 +343,6 @@ void MainWindow::update_action_buttons(uint64_t t)
                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)");
@@ -368,7 +373,6 @@ void MainWindow::update_action_buttons(uint64_t t)
                ui->their_goal->setEnabled(false);
                ui->defensive_soft_plus->setEnabled(false);
                ui->defensive_soft_minus->setEnabled(false);
-               ui->our_foul->setEnabled(false);
                return;
        }
        if (s.pull_state == EventsModel::Status::PULL_IN_AIR) {
@@ -397,7 +401,6 @@ void MainWindow::update_action_buttons(uint64_t t)
                ui->their_goal->setEnabled(false);
                ui->defensive_soft_plus->setEnabled(false);
                ui->defensive_soft_minus->setEnabled(false);
-               ui->our_foul->setEnabled(false);
                return;
        }
 
@@ -415,7 +418,6 @@ void MainWindow::update_action_buttons(uint64_t t)
        ui->their_goal->setEnabled(s.attack_state == EventsModel::Status::DEFENSE);
        ui->defensive_soft_plus->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && has_selection_with_player);
        ui->defensive_soft_minus->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && has_selection_with_player);
-       ui->our_foul->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && has_selection_with_player);
        ui->their_pull->setEnabled(false);
 }
 
@@ -429,7 +431,7 @@ sqlite3 *open_db(const char *filename)
        }
 
        sqlite3_exec(db, R"(
-               CREATE TABLE IF NOT EXISTS player (player INTEGER PRIMARY KEY, number VARCHAR, name VARCHAR);
+               CREATE TABLE IF NOT EXISTS player (player INTEGER PRIMARY KEY, number VARCHAR, name VARCHAR, gender VARCHAR(1));
        )", nullptr, nullptr, nullptr);  // Ignore errors.
 
        sqlite3_exec(db, R"(