Make a more sensible ordering of the player buttons.

[pkanalytics] / events.cpp

diff --git a/events.cpp b/events.cpp
index 24fd649e7f3adfeaea19f41a27e393858ba1df99..cb552c571bcd7cba8bf42b8540ff404c1568802b 100644 (file)
--- a/events.cpp
+++ b/events.cpp
@@ -60,13 +60,14 @@ void EventsModel::load_data()
        players.clear();
        events.clear();
 
-       // Read the players.
+       // Read the players. (The ordering is used to build the order map.)
        sqlite3_stmt *stmt;
-       int ret = sqlite3_prepare_v2(db, "SELECT player, number, name FROM player", -1, &stmt, 0);
+       int ret = sqlite3_prepare_v2(db, "SELECT player, number, name FROM player ORDER BY gender, (number+0), number", -1, &stmt, 0);
        if (ret != SQLITE_OK) {
                fprintf(stderr, "SELECT prepare: %s\n", sqlite3_errmsg(db));
                abort();
        }
+       int order = 0;
        for ( ;; ) {
                ret = sqlite3_step(stmt);
                if (ret == SQLITE_ROW) {
@@ -75,6 +76,7 @@ void EventsModel::load_data()
                        p.number = (const char *)sqlite3_column_text(stmt, 1);
                        p.name = (const char *) sqlite3_column_text(stmt, 2);
                        players[p.player_id] = std::move(p);
+                       player_ordering[p.player_id] = order++;
                } else if (ret == SQLITE_DONE) {
                        break;
                } else {
@@ -390,3 +392,12 @@ void EventsModel::set_team_at(uint64_t t, const set<int> &new_team)
                }
        }
 }
+
+vector<int> EventsModel::sort_team(const set<int> &team) const
+{
+       vector<int> ret(team.begin(), team.end());
+       std::sort(ret.begin(), ret.end(), [this](int a, int b) {
+               return player_ordering.find(a)->second < player_ordering.find(b)->second;
+       });
+       return ret;
+}