From 1593f2ebad25244fefabe606b32ee505d4d6087d Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sun, 23 Dec 2018 12:46:45 +0100 Subject: 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 --- core/downloadfromdcthread.h | 1 + 1 file changed, 1 insertion(+) (limited to 'core/downloadfromdcthread.h') diff --git a/core/downloadfromdcthread.h b/core/downloadfromdcthread.h index 426a807d9..506a75ac0 100644 --- a/core/downloadfromdcthread.h +++ b/core/downloadfromdcthread.h @@ -74,6 +74,7 @@ public: private: struct dive_table downloadTable; + struct trip_table tripTable; DCDeviceData *m_data; }; -- cgit v1.2.3-70-g09d2