From 810903bdb9db84997dc3d32bb8e934e320784a4d Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 28 Sep 2018 10:21:23 +0200 Subject: Import: pass a dive table to process_imported_dives() Dives were directly imported into the global dive table and then merged in process_imported_dives(). Make this interface more flexible, by passing an independent dive table. The dive table of the to-be-imported dives will be sorted and merged. Then each dive is inserted in a one-by-one manner to into the global dive table. This actually introduces (at least) two functional changes: 1) If a new dive spans two old dives, it will only be merged to the first dive. But this seems like a pathological case, which is of dubious value anyway. 2) Dives unrelated to the import will not be merged. The old code would happily merge dives that were not even close to the newly imported dives. A surprising behavior. Signed-off-by: Berthold Stoeger --- qt-models/diveimportedmodel.cpp | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) (limited to 'qt-models') diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp index 48d9a1dcd..ebe803244 100644 --- a/qt-models/diveimportedmodel.cpp +++ b/qt-models/diveimportedmodel.cpp @@ -163,21 +163,17 @@ void DiveImportedModel::recordDives() // nothing to do, just exit return; - // walk the table of imported dives and record the ones that the user picked - // clearing out the table as we go - for (int i = 0; i < rowCount(); i++) { - struct dive *d = diveTable->dives[i]; - if (d && checkStates[i]) { - record_dive(d); - } else { - // we should free the dives that weren't recorded - clear_dive(d); - free(d); - } - diveTable->dives[i] = NULL; + // delete non-selected dives + int total = diveTable->nr; + int j = 0; + for (int i = 0; i < total; i++) { + if (checkStates[i]) + j++; + else + delete_dive_from_table(&downloadTable, j); } - diveTable->nr = 0; - process_imported_dives(true); + + process_imported_dives(diveTable, true); if (autogroup) autogroup_dives(); } -- cgit v1.2.3-70-g09d2