mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Import: get tables from DiveImportedModel not DownloadThread

Browse source 
When importing dives, consume the tables from DiveImportedModel
and not the DownloadThread. This appears more logical and avoids
an inconsistent state of the DiveImportedModel: On import the
tables would be reset, but the DiveImportedModel wasn't
informed of that.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-09-22 20:23:37 +02:00 committed by Dirk Hohndel
parent 10d4ba82a2
commit 8f3c85f58d
3 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
desktop-widgets/downloadfromdivecomputer.cpp
View file

@ -525,21 +525,27 @@ void DownloadFromDCWidget::on_ok_clicked()
{
if (currentState != DONE && currentState != ERRORED)
return;
struct dive_table *table = diveImportedModel->thread.table();
struct dive_site_table *sites = diveImportedModel->thread.sites();
// delete non-selected dives
diveImportedModel->deleteDeselected();
if (table->nr > 0) {
// TODO: use structured bindings once we go C++17
std::pair<struct dive_table, struct dive_site_table> tables = diveImportedModel->consumeTables();
if (tables.first.nr > 0) {
auto data = diveImportedModel->thread.data();
int flags = IMPORT_IS_DOWNLOADED;
if (preferDownloaded())
flags |= IMPORT_PREFER_IMPORTED;
if (ui.createNewTrip->isChecked())
flags |= IMPORT_ADD_TO_NEW_TRIP;
Command::importDives(table, nullptr, sites, flags, data->devName());
Command::importDives(&tables.first, nullptr, &tables.second, flags, data->devName());
} else {
clear_dive_site_table(&tables.second);
}
// The dives and dive sites have been consumed, but the arrays of the tables
// still exist. Free them.
free(tables.first.dives);
free(tables.second.dive_sites);
if (ostcFirmwareCheck && currentState == DONE)
ostcFirmwareCheck->checkLatest(this, diveImportedModel->thread.data()->internalData());

20
qt-models/diveimportedmodel.cpp
View file

@ -155,6 +155,26 @@ void DiveImportedModel::repopulate(dive_table_t *table, struct dive_site_table *
endResetModel();
}
std::pair<struct dive_table, struct dive_site_table> DiveImportedModel::consumeTables()
{
beginResetModel();
// Move tables to result
struct dive_table dives;
struct dive_site_table sites;
move_dive_table(diveTable, &dives);
move_dive_site_table(sitesTable, &sites);
// Reset indexes
firstIndex = 0;
lastIndex = -1;
checkStates.clear();
endResetModel();
return std::make_pair(dives, sites);
}
// Delete non-selected dives
void DiveImportedModel::deleteDeselected()
{

1
qt-models/diveimportedmodel.h
View file

@ -22,6 +22,7 @@ public:
Q_INVOKABLE void clearTable();
QHash<int, QByteArray> roleNames() const;
void deleteDeselected();
std::pair<struct dive_table, struct dive_site_table> consumeTables(); // Returns dives and sites and resets model.
Q_INVOKABLE void recordDives();
Q_INVOKABLE void startDownload();