From ff9506b21bbb9910256841dcb577bcb2e19047e8 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 13 Jan 2019 10:58:04 +0200 Subject: Import: don't add to new trip while downloading Since process_imported_dives() can add dives to a newly generated trip, this need not be done in the downloading code. This makes data flow distinctly simpler, as no trip table and no add-new-trip flag has to be passed down to the libdivecomputer glue code. Moreover, since now the trip creation is done at the import step rather than the download step, the latest status of the "add to new trip" checkbox will be considered. Signed-off-by: Berthold Stoeger --- qt-models/diveimportedmodel.cpp | 5 ++--- qt-models/diveimportedmodel.h | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index ff93e1792..59fe9b12b 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -127,12 +127,11 @@ void DiveImportedModel::clearTable() endRemoveRows(); } -void DiveImportedModel::repopulate(dive_table_t *table, trip_table_t *trips) +void DiveImportedModel::repopulate(dive_table_t *table) { beginResetModel(); diveTable = table; - tripTable = trips; firstIndex = 0; lastIndex = diveTable->nr - 1; checkStates.resize(diveTable->nr); @@ -159,7 +158,7 @@ void DiveImportedModel::recordDives() } // TODO: Might want to let the user select "add_to_new_trip" - add_imported_dives(diveTable, tripTable, true, true, false, false); + add_imported_dives(diveTable, nullptr, true, true, false, false); } QHash DiveImportedModel::roleNames() const { diff --git a/qt-models/diveimportedmodel.h b/qt-models/diveimportedmodel.h index ede40431b..0c5ba34cd 100644 --- a/qt-models/diveimportedmodel.h +++ b/qt-models/diveimportedmodel.h @@ -20,7 +20,7 @@ public: Qt::ItemFlags flags(const QModelIndex &index) const; Q_INVOKABLE void clearTable(); QHash roleNames() const; - Q_INVOKABLE void repopulate(dive_table_t *table, trip_table_t *trips); + Q_INVOKABLE void repopulate(dive_table_t *table); Q_INVOKABLE void recordDives(); public slots: @@ -34,7 +34,6 @@ private: int lastIndex; std::vector checkStates; // char instead of bool to avoid silly pessimization of std::vector. struct dive_table *diveTable; - struct trip_table *tripTable; }; #endif -- cgit v1.2.3-70-g09d2