mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

When merging planned dives keep all cylinders

Browse source 
When merging a real dive with a planned dive (for comparison),
we should not try to be clever in merging similar cylinders,
rather keep the union of both cylinder sets as the two versions
of the dive might differ in exctly which gas and how much of it
was used.

Increase MAX_CYLINDERS to 20 to make room for this.

Signed-off-by: Robert C. Helling <helling@atdotde.de>
This commit is contained in:
Robert C. Helling 2017-02-02 15:31:52 +01:00 committed by Dirk Hohndel
parent 99595542ec
commit a031dbbbd8
2 changed files with 40 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
core/dive.c
View file

@ -2028,23 +2028,43 @@ static void merge_cylinders(struct dive *res, struct dive *a, struct dive *b)
memcpy(res->cylinder, a->cylinder, sizeof(res->cylinder)); memcpy(res->cylinder, a->cylinder, sizeof(res->cylinder));
memset(a->cylinder, 0, sizeof(a->cylinder)); memset(a->cylinder, 0, sizeof(a->cylinder));
for (i = 0; i < MAX_CYLINDERS; i++) { if (strcmp(b->dc.model, "planned dive")) {
int j; // We merge two actual dive
cylinder_t *cyl = b->cylinder + i; for (i = 0; i < MAX_CYLINDERS; i++) {
int j;
cylinder_t *cyl = b->cylinder + i;
j = find_cylinder_match(cyl, res->cylinder, used); j = find_cylinder_match(cyl, res->cylinder, used);
mapping[i] = j; mapping[i] = j;
if (j < 0) if (j < 0)
continue; continue;
used |= 1 << j; used |= 1 << j;
merge_cylinder_info(cyl, res->cylinder + j); merge_cylinder_info(cyl, res->cylinder + j);
/* If that renumbered the cylinders, fix it up! */ /* If that renumbered the cylinders, fix it up! */
if (i != j) if (i != j)
renumber = 1; renumber = 1;
} }
if (renumber) if (renumber)
cylinder_renumber(b, mapping);
} else {
int j=0;
for (i = 0; i < MAX_CYLINDERS && j < MAX_CYLINDERS; i++) {
if (is_cylinder_used(res, i))
continue;
while (!is_cylinder_used(b, j) && j < MAX_CYLINDERS - 1) {
mapping[j] = 0;
++j;
}
memcpy(&res->cylinder[i], &b->cylinder[j], sizeof (b->cylinder[j]));
mapping[j] = i;
++j;
}
while (j < MAX_CYLINDERS)
mapping[j++] = 0;
cylinder_renumber(b, mapping); cylinder_renumber(b, mapping);
}
} }
static void merge_equipment(struct dive *res, struct dive *a, struct dive *b) static void merge_equipment(struct dive *res, struct dive *a, struct dive *b)
@ -3000,6 +3020,11 @@ struct dive *merge_dives(struct dive *a, struct dive *b, int offset, bool prefer
dl = b; dl = b;
} }
if (!strcmp(a->dc.model, "planneed dive")) {
struct dive *tmp = a;
a = b;
b = tmp;
}
res->when = dl ? dl->when : a->when; res->when = dl ? dl->when : a->when;
res->selected = a->selected || b->selected; res->selected = a->selected || b->selected;
merge_trip(res, a, b); merge_trip(res, a, b);

2
core/dive.h
View file

@ -290,7 +290,7 @@ struct divecomputer {
struct divecomputer *next; struct divecomputer *next;
}; };
#define MAX_CYLINDERS (8) #define MAX_CYLINDERS (20)
#define MAX_WEIGHTSYSTEMS (6) #define MAX_WEIGHTSYSTEMS (6)
#define W_IDX_PRIMARY 0 #define W_IDX_PRIMARY 0
#define W_IDX_SECONDARY 1 #define W_IDX_SECONDARY 1