Berthold Stoeger 1593f2ebad Import: merge dives trip-wise ... The old way of merging log-files was not well defined: Trips were recognized as the same if and only if the first dives started at the same instant. Later dives did not matter. Change this to merge dives if they are overlapping. Moreover, on parsing and download generate trips in a separate trip-table. This will be fundamental for undo of dive-import: Firstly, we don't want to mix trips of imported and not-yet imported dives. Secondly, by merging trip-wise, we can autogroup the dives in the import-data to trips and merge these at once. This will simplify the code to decide to which trip dives should be autogrouped. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>		2019-01-09 20:58:04 -08:00
..
qml	Import: add trip_table argument to DiveImportedModel::repopulate()	2019-01-09 20:58:04 -08:00
qmlmanager.cpp	Import: merge dives trip-wise	2019-01-09 20:58:04 -08:00
qmlmanager.h	Mobile: add helper function to fill in the BT name	2018-12-21 14:52:02 -08:00
qmlprefs.cpp	Mobile: set units system in "No cloud mode"	2018-09-19 14:41:11 -07:00
qmlprefs.h	mobile-widgets: replace qmlprefs::theme with qPrefDisplay::theme	2018-09-12 20:18:32 -07:00