FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undo: make undo-system dive site-aware

Browse Source 
As opposed to dive trips, dive sites were always directly added
to the global table, even on import. Instead, parse the divesites
into a distinct table and merge them on import.

Currently, this does not do any merging of dive sites, i.e. dive
sites are considered as either equal or different. Nevertheless,
merging of data should be rather easy to implement and simply
follow the code of the dive merging.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger
2019-03-03 15:12:22 +01:00
committed by Dirk Hohndel
parent 37146c5742
commit 82af1b2377
22 changed files with 269 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile-widgets/qml/DownloadFromDiveComputer.qml
View File

@@ -28,7 +28,7 @@ Kirigami.Page {
id: downloadThread
onFinished : {
importModel.repopulate(table)
importModel.repopulate(table, sites)
progressBar.visible = false
if (dcImportModel.rowCount() > 0) {
console.log(dcImportModel.rowCount() + " dive downloaded")

5
mobile-widgets/qmlmanager.cpp
View File

@@ -341,8 +341,9 @@ void QMLManager::mergeLocalRepo()
char *filename = NOCLOUD_LOCALSTORAGE;
struct dive_table table = { 0 };
struct trip_table trips = { 0 };
parse_file(filename, &table, &trips, &dive_site_table);
add_imported_dives(&table, &trips, IMPORT_MERGE_ALL_TRIPS);
struct dive_site_table sites = { 0 };
parse_file(filename, &table, &trips, &sites);
add_imported_dives(&table, &trips, &sites, IMPORT_MERGE_ALL_TRIPS);
}
void QMLManager::copyAppLogToClipboard()