mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Import: pass "downloaded" parameter to process_imported_dives()
process_imported_dives() is more efficient for downloaded than for imported (from a file) dives, because it checks only the divecomputer of the first dive. This condition is checked via the "downloaded" flag of the first dive. Instead, pass an argument to process_imported_dives(). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
parent
e5dca8228e
commit
6dc1dcaea5
10 changed files with 20 additions and 16 deletions
|
|
@ -1007,7 +1007,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
|
|||
}
|
||||
}
|
||||
|
||||
process_imported_dives(&table, false);
|
||||
process_imported_dives(&table, false, false);
|
||||
MainWindow::instance()->refreshDisplay();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -506,7 +506,7 @@ void DownloadFromDCWidget::on_ok_clicked()
|
|||
// remember the last downloaded dive (on most dive computers this will be the chronologically
|
||||
// first new dive) and select it again after processing all the dives
|
||||
int uniqId = downloadTable.dives[downloadTable.nr - 1]->id;
|
||||
process_imported_dives(&downloadTable, preferDownloaded());
|
||||
process_imported_dives(&downloadTable, preferDownloaded(), true);
|
||||
// after process_imported_dives does any merging or resorting needed, we need
|
||||
// to recreate the model for the dive list so we can select the newest dive
|
||||
MainWindow::instance()->recreateDiveList();
|
||||
|
|
|
|||
|
|
@ -1739,7 +1739,7 @@ void MainWindow::importFiles(const QStringList fileNames)
|
|||
fileNamePtr = QFile::encodeName(fileNames.at(i));
|
||||
parse_file(fileNamePtr.data(), &table);
|
||||
}
|
||||
process_imported_dives(&table, false);
|
||||
process_imported_dives(&table, false, false);
|
||||
refreshDisplay();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -769,7 +769,7 @@ void DivelogsDeWebServices::buttonClicked(QAbstractButton *button)
|
|||
/* parse file and import dives */
|
||||
struct dive_table table = { 0 };
|
||||
parse_file(QFile::encodeName(zipFile.fileName()), &table);
|
||||
process_imported_dives(&table, false);
|
||||
process_imported_dives(&table, false, false);
|
||||
MainWindow::instance()->refreshDisplay();
|
||||
|
||||
/* store last entered user/pass in config */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue