});
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);
// Offensive events
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]() { set_current_event_type("throwaway"); });
+ connect(ui->throwaway, &QPushButton::clicked, [this, events]() {
+ EventsModel::Status s = events->get_status_at(video->position());
+ if (s.attack_state == EventsModel::Status::DEFENSE && s.pull_state == EventsModel::Status::PULL_IN_AIR) {
+ insert_noplayer_event("pull_oob");
+ } else {
+ set_current_event_type("throwaway");
+ }
+ });
connect(ui->drop, &QPushButton::clicked, [this]() { set_current_event_type("drop"); });
connect(ui->goal, &QPushButton::clicked, [this]() { set_current_event_type("goal"); });
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]() { set_current_event_type("pull"); });
- connect(ui->pull_landed, &QPushButton::clicked, [this]() { insert_noplayer_event("pull_landed"); });
+ connect(ui->pull, &QPushButton::clicked, [this, events]() {
+ EventsModel::Status s = events->get_status_at(video->position());
+ if (s.pull_state == EventsModel::Status::SHOULD_PULL) {
+ set_current_event_type("pull");
+ } else if (EventsModel::Status::PULL_IN_AIR) {
+ insert_noplayer_event("pull_landed");
+ }
+ });
// Defensive events (TODO add more)
connect(ui->defense_label, &ClickableLabel::clicked, [this]() { insert_noplayer_event("set_defense"); });
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]() { insert_noplayer_event("their_pull"); });
+ connect(ui->their_pull, &QPushButton::clicked, [this, events]() {
+ EventsModel::Status s = events->get_status_at(video->position());
+ if (s.pull_state == EventsModel::Status::SHOULD_PULL) {
+ insert_noplayer_event("their_pull");
+ }
+ });
connect(ui->our_defense, &QPushButton::clicked, [this]() { set_current_event_type("defense"); });
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"); });
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);
}
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);
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,
};
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] = "";
ui->offensive_soft_plus->setEnabled(false);
ui->offensive_soft_minus->setEnabled(false);
ui->pull->setEnabled(false);
- ui->pull_landed->setEnabled(false);
ui->interception->setEnabled(false);
ui->their_throwaway->setEnabled(false);
ui->our_defense->setEnabled(false);
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)");
ui->stoppage->setShortcut(QCoreApplication::translate("MainWindow", "V", nullptr));
}
+ // Defaults for pull-related buttons.
+ ui->pull->setText("Pull (&p)");
+ ui->their_pull->setText("Their pull (&p)");
+ ui->pull->setShortcut(QCoreApplication::translate("MainWindow", "P", nullptr));
+ ui->their_pull->setShortcut(QCoreApplication::translate("MainWindow", "P", nullptr));
+ ui->throwaway->setText("Throwaway (&t)");
+ ui->throwaway->setShortcut(QCoreApplication::translate("MainWindow", "T", nullptr));
+
+ if (s.pull_state == EventsModel::Status::SHOULD_PULL) {
+ ui->pull->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && has_selection_with_player);
+ ui->their_pull->setEnabled(s.attack_state == EventsModel::Status::OFFENSE);
+
+ ui->catch_->setEnabled(false);
+ ui->throwaway->setEnabled(false);
+ ui->drop->setEnabled(false);
+ ui->goal->setEnabled(false);
+ ui->offensive_soft_plus->setEnabled(false);
+ ui->offensive_soft_minus->setEnabled(false);
+ ui->interception->setEnabled(false);
+ ui->their_throwaway->setEnabled(false);
+ ui->our_defense->setEnabled(false);
+ ui->their_goal->setEnabled(false);
+ ui->defensive_soft_plus->setEnabled(false);
+ ui->defensive_soft_minus->setEnabled(false);
+ return;
+ }
+ if (s.pull_state == EventsModel::Status::PULL_IN_AIR) {
+ if (s.attack_state == EventsModel::Status::DEFENSE) {
+ ui->pull->setText("Pull landed (&p)");
+ ui->pull->setShortcut(QCoreApplication::translate("MainWindow", "P", nullptr));
+ ui->pull->setEnabled(true);
+
+ ui->throwaway->setText("Pull OOB (&t)");
+ ui->throwaway->setShortcut(QCoreApplication::translate("MainWindow", "T", nullptr));
+ ui->throwaway->setEnabled(true);
+ } else {
+ ui->pull->setEnabled(false);
+ ui->throwaway->setEnabled(false);
+ }
+ ui->their_pull->setEnabled(false); // We don't track their pull landings; only by means of catch etc.
+
+ ui->catch_->setEnabled(false);
+ ui->drop->setEnabled(false);
+ ui->goal->setEnabled(false);
+ ui->offensive_soft_plus->setEnabled(false);
+ ui->offensive_soft_minus->setEnabled(false);
+ ui->interception->setEnabled(false);
+ ui->their_throwaway->setEnabled(false);
+ ui->our_defense->setEnabled(false);
+ ui->their_goal->setEnabled(false);
+ ui->defensive_soft_plus->setEnabled(false);
+ ui->defensive_soft_minus->setEnabled(false);
+ return;
+ }
+
ui->catch_->setEnabled(s.attack_state == EventsModel::Status::OFFENSE && has_selection_with_player);
ui->throwaway->setEnabled(s.attack_state == EventsModel::Status::OFFENSE && has_selection_with_player);
ui->drop->setEnabled(s.attack_state == EventsModel::Status::OFFENSE && has_selection_with_player);
ui->goal->setEnabled(s.attack_state == EventsModel::Status::OFFENSE && has_selection_with_player);
ui->offensive_soft_plus->setEnabled(s.attack_state == EventsModel::Status::OFFENSE && has_selection_with_player);
ui->offensive_soft_minus->setEnabled(s.attack_state == EventsModel::Status::OFFENSE && has_selection_with_player);
-
- // TODO: be stricter
- ui->pull->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && s.should_pull && has_selection_with_player);
- ui->pull_landed->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && has_selection_with_player);
+ ui->pull->setEnabled(false);
ui->interception->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && has_selection_with_player);
ui->their_throwaway->setEnabled(s.attack_state == EventsModel::Status::DEFENSE);
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->their_pull->setEnabled(s.attack_state == EventsModel::Status::OFFENSE && s.should_pull);
- ui->our_foul->setEnabled(s.attack_state == EventsModel::Status::DEFENSE && has_selection_with_player);
+ ui->their_pull->setEnabled(false);
}
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"(