diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-12-23 12:46:45 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-01-09 20:58:04 -0800 |
| commit | 1593f2ebad25244fefabe606b32ee505d4d6087d (patch) | |
| tree | a47251b4247cbe0c2b5b2fa568179f8abc4c25f9 /core/divelist.h | |
| parent | f542dc4030dda5dac1da1cc928f7a40a50919c4d (diff) | |
| download | subsurface-1593f2ebad25244fefabe606b32ee505d4d6087d.tar.gz | |
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>
Diffstat (limited to 'core/divelist.h')
| -rw-r--r-- | core/divelist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/divelist.h b/core/divelist.h index 4cb76ef1c..5676b33b6 100644 --- a/core/divelist.h +++ b/core/divelist.h @@ -18,7 +18,7 @@ extern int init_decompression(struct deco_state *ds, struct dive *dive); /* divelist core logic functions */ extern void process_loaded_dives(); -extern void process_imported_dives(struct dive_table *import_table, bool prefer_imported, bool downloaded); +extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, bool prefer_imported, bool downloaded); extern char *get_dive_gas_string(const struct dive *dive); extern struct dive **grow_dive_table(struct dive_table *table); |