mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Dive list: add table parameter to autogroup_dives()

Browse source 
Currently autogroup_dives() groups all dives in the global dive
list. Add a table parameter so that dives in any table can be
grouped. Thus it will be possible to pre-group dives on import,
which will be used for undo of import.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-11-24 07:50:13 +01:00 • committed by Dirk Hohndel
parent f8327ed51b
commit 825fcc8547
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/divelist.c
View file

@ -23,7 +23,7 @@
* struct dive_trip *unregister_dive_from_trip(struct dive *dive) * struct dive_trip *unregister_dive_from_trip(struct dive *dive)
* void add_dive_to_trip(struct dive *dive, dive_trip_t *trip) * void add_dive_to_trip(struct dive *dive, dive_trip_t *trip)
* dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive) * dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive)
* dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocated) * dive_trip_t *get_dives_to_autogroup(sruct dive_table *table, int start, int *from, int *to, bool *allocated)
* dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated) * dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated)
* void combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b) * void combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b)
* dive_trip_t *combine_trips_create(struct dive_trip *trip_a, struct dive_trip *trip_b) * dive_trip_t *combine_trips_create(struct dive_trip *trip_a, struct dive_trip *trip_b)
@ -984,15 +984,16 @@ dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated)
* manually injects the new trips. If there are no dives to be autogrouped, * manually injects the new trips. If there are no dives to be autogrouped,
* return NULL. * return NULL.
*/ */
dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocated) dive_trip_t *get_dives_to_autogroup(struct dive_table *table, int start, int *from, int *to, bool *allocated)
{ {
int i; int i;
struct dive *dive, *lastdive = NULL; struct dive *lastdive = NULL;
/* Find first dive that should be merged and remember any previous /* Find first dive that should be merged and remember any previous
* dive that could be merged into. * dive that could be merged into.
*/ */
for (i = start; (dive = get_dive(i)) != NULL; i++) { for (i = start; i < table->nr; i++) {
struct dive *dive = table->dives[i];
dive_trip_t *trip; dive_trip_t *trip;
if (dive->divetrip) { if (dive->divetrip) {
@ -1022,7 +1023,8 @@ dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocat
// Now, find all dives that will be added to this trip // Now, find all dives that will be added to this trip
lastdive = dive; lastdive = dive;
*from = i; *from = i;
for (*to = *from + 1; (dive = get_dive(*to)) != NULL; (*to)++) { for (*to = *from + 1; *to < table->nr; (*to)++) {
dive = table->dives[*to];
if (dive->divetrip || dive->notrip || if (dive->divetrip || dive->notrip ||
dive->when >= lastdive->when + TRIP_THRESHOLD) dive->when >= lastdive->when + TRIP_THRESHOLD)
break; break;
@ -1038,10 +1040,10 @@ dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocat
} }
/* /*
* Walk the dives from the oldest dive, and see if we can autogroup them. * Walk the dives from the oldest dive in the given tabe, and see if we
* But only do this when the user selected autogrouping. * can autogroup them. But only do this when the user selected autogrouping.
*/ */
static void autogroup_dives(void) static void autogroup_dives(struct dive_table *table)
{ {
int from, to; int from, to;
dive_trip_t *trip; dive_trip_t *trip;
@ -1051,7 +1053,7 @@ static void autogroup_dives(void)
if (!autogroup) if (!autogroup)
return; return;
for (i = 0; (trip = get_dives_to_autogroup(i, &from, &to, &alloc)) != NULL; i = to) { for (i = 0; (trip = get_dives_to_autogroup(&dive_table, i, &from, &to, &alloc)) != NULL; i = to) {
/* If this was newly allocated, add trip to list */ /* If this was newly allocated, add trip to list */
if (alloc) if (alloc)
insert_trip(trip); insert_trip(trip);
@ -1355,7 +1357,7 @@ void process_loaded_dives()
sort_table(&dive_table); sort_table(&dive_table);
/* Autogroup dives if desired by user. */ /* Autogroup dives if desired by user. */
autogroup_dives(); autogroup_dives(&dive_table);
} }
/* /*
@ -1505,7 +1507,7 @@ void process_imported_dives(struct dive_table *import_table, bool prefer_importe
try_to_renumber(preexisting); try_to_renumber(preexisting);
/* Autogroup dives if desired by user. */ /* Autogroup dives if desired by user. */
autogroup_dives(); autogroup_dives(&dive_table);
/* We might have deleted the old selected dive. /* We might have deleted the old selected dive.
* Choose the newest dive as selected (if any) */ * Choose the newest dive as selected (if any) */

2
core/divelist.h
View file

@ -33,7 +33,7 @@ extern void remove_dive_from_trip(struct dive *dive);
extern dive_trip_t *alloc_trip(void); extern dive_trip_t *alloc_trip(void);
extern dive_trip_t *create_trip_from_dive(struct dive *dive); extern dive_trip_t *create_trip_from_dive(struct dive *dive);
extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive); extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive);
extern dive_trip_t *get_dives_to_autogroup(int start, int *from, int *to, bool *allocated); extern dive_trip_t *get_dives_to_autogroup(struct dive_table *table, int start, int *from, int *to, bool *allocated);
extern dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated); extern dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated);
extern bool consecutive_selected(); extern bool consecutive_selected();
extern void select_dive(struct dive *dive); extern void select_dive(struct dive *dive);

2
desktop-widgets/command_divelist.cpp
View file

@ -724,7 +724,7 @@ AutogroupDives::AutogroupDives()
dive_trip *trip; dive_trip *trip;
bool alloc; bool alloc;
int from, to; int from, to;
for(int i = 0; (trip = get_dives_to_autogroup(i, &from, &to, &alloc)) != NULL; i = to) { for(int i = 0; (trip = get_dives_to_autogroup(&dive_table, i, &from, &to, &alloc)) != NULL; i = to) {
// If this is an allocated trip, take ownership // If this is an allocated trip, take ownership
if (alloc) if (alloc)
divesToMove.tripsToAdd.emplace_back(trip); divesToMove.tripsToAdd.emplace_back(trip);