Make the player buttons actually fetch out the team.

diff --git a/main.cpp b/main.cpp
index d3b4ae943fcb0617dba20fb38604301aeb1786c5..acefe9ff4baddce71413bf87fef97a0476d8f187 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -131,8 +131,15 @@ 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);
+
        ui->event_view->selectionModel()->blockSignals(true);
-       ui->event_view->selectRow(events->insert_event(video->position(), button_id));
+       ui->event_view->selectRow(events->insert_event(t, player_id));
        ui->event_view->selectionModel()->blockSignals(false);
 }
 
@@ -193,11 +200,42 @@ void MainWindow::make_substitution()
 
 void MainWindow::update_status()
 {
-       EventsModel::Status s = events->get_status_at(video->position());
+       uint64_t t = video->position();
+       EventsModel::Status s = events->get_status_at(t);
        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);
+
+       // 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);
+       }
 }
 
 sqlite3 *open_db(const char *filename)

diff --git a/players.cpp b/players.cpp
index fce3f7c30e010d2a5172becac07ad9720ab92b1e..af33df0c91be2e439721e9c15970f3604e67ad87 100644 (file)
--- a/players.cpp
+++ b/players.cpp
@@ -44,6 +44,12 @@ QVariant PlayersModel::data(const QModelIndex &index, int role) const
        return QVariant();
 }
 
+string PlayersModel::get_player_name_by_id(unsigned player_id)
+{
+       auto it = find_if(players.begin(), players.end(), [player_id](const Player &p) { return p.player_id == player_id; });
+       return it->name;
+}
+
 void PlayersModel::load_data()
 {
        players.clear();

diff --git a/players.h b/players.h
index 24c10b9843255890f604272bcf7d25cd69e9918b..bea45621faea0489e20c22055fc088ba6eb6cb5b 100644 (file)
--- a/players.h
+++ b/players.h
@@ -25,6 +25,7 @@ public:
        int get_player_id(unsigned row) const {
                return players[row].player_id;
        }
+       std::string get_player_name_by_id(unsigned player_id);
 
 private:
        struct Player {