2011-09-20 19:40:34 +00:00
|
|
|
|
/* dive.c */
|
|
|
|
|
/* maintains the internal dive list structure */
|
2011-09-03 20:19:26 +00:00
|
|
|
|
#include <string.h>
|
|
|
|
|
#include <stdio.h>
|
2014-04-17 14:34:21 +00:00
|
|
|
|
#include <stdlib.h>
|
2013-10-07 13:15:52 +00:00
|
|
|
|
#include <limits.h>
|
2013-10-06 15:55:58 +00:00
|
|
|
|
#include "gettext.h"
|
2011-09-03 20:19:26 +00:00
|
|
|
|
#include "dive.h"
|
2014-06-01 19:07:29 +00:00
|
|
|
|
#include "libdivecomputer.h"
|
Make gas use statistics be coherent and more complete
The gas use logic in the dive statistics page is confused.
The SAC case had a special case for "unknown", but only for
the first gas. Other gases had the normal empty case.
Also, the logic was really odd - if you had gases that weren't used (or
pressures not known) intermixed with gases you *did* have pressure for,
the statistics got really confused.
The list of gases showed all gases that we know about during the dive,
but then the gas use and SAC-rate lists wouldn't necessarily match,
because the loops that computed those stopped after the first gas that
didn't have any pressure change.
To make things worse, the first cylinder was special-cased again, so it
all lined up for the single-cylinder case.
This makes all the cylinders act the same way, leaving unknown gas use
(and thus SAC) just empty for that gas.
It also fixes the SAC calculation case where we don't have real samples,
and the profile is a fake profile - possibly with gas changes in between
the fake points. We now make the SAC calculations match what we show -
which is admittedly not at all necessarily what the dive was, but at
least we're consistent.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-30 17:08:33 +00:00
|
|
|
|
#include "device.h"
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
2014-07-02 18:50:28 +00:00
|
|
|
|
/* one could argue about the best place to have this variable -
|
|
|
|
|
* it's used in the UI, but it seems to make the most sense to have it
|
|
|
|
|
* here */
|
|
|
|
|
struct dive displayed_dive;
|
|
|
|
|
|
2013-11-02 01:12:42 +00:00
|
|
|
|
struct tag_entry *g_tag_list = NULL;
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
static const char *default_tags[] = {
|
2013-11-19 15:12:34 +00:00
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "boat"), QT_TRANSLATE_NOOP("gettextFromC", "shore"), QT_TRANSLATE_NOOP("gettextFromC", "drift"),
|
2014-02-28 04:09:57 +00:00
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "deep"), QT_TRANSLATE_NOOP("gettextFromC", "cavern"), QT_TRANSLATE_NOOP("gettextFromC", "ice"),
|
2013-11-19 15:12:34 +00:00
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "wreck"), QT_TRANSLATE_NOOP("gettextFromC", "cave"), QT_TRANSLATE_NOOP("gettextFromC", "altitude"),
|
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "pool"), QT_TRANSLATE_NOOP("gettextFromC", "lake"), QT_TRANSLATE_NOOP("gettextFromC", "river"),
|
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "night"), QT_TRANSLATE_NOOP("gettextFromC", "fresh"), QT_TRANSLATE_NOOP("gettextFromC", "student"),
|
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "instructor"), QT_TRANSLATE_NOOP("gettextFromC", "photo"), QT_TRANSLATE_NOOP("gettextFromC", "video"),
|
|
|
|
|
QT_TRANSLATE_NOOP("gettextFromC", "deco")
|
|
|
|
|
};
|
|
|
|
|
|
2014-08-17 18:26:21 +00:00
|
|
|
|
int event_is_gaschange(struct event *ev)
|
|
|
|
|
{
|
|
|
|
|
return ev->type == SAMPLE_EVENT_GASCHANGE ||
|
|
|
|
|
ev->type == SAMPLE_EVENT_GASCHANGE2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Does the gas mix data match the legacy
|
|
|
|
|
* libdivecomputer event format? If so,
|
|
|
|
|
* we can skip saving it, in order to maintain
|
|
|
|
|
* the old save formats. We'll re-generate the
|
|
|
|
|
* gas mix when loading.
|
|
|
|
|
*/
|
|
|
|
|
int event_gasmix_redundant(struct event *ev)
|
|
|
|
|
{
|
|
|
|
|
int value = ev->value;
|
|
|
|
|
int o2, he;
|
|
|
|
|
|
|
|
|
|
o2 = (value & 0xffff) * 10;
|
|
|
|
|
he = (value >> 16) * 10;
|
|
|
|
|
return o2 == ev->gas.mix.o2.permille &&
|
|
|
|
|
he == ev->gas.mix.he.permille;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct event *add_event(struct divecomputer *dc, int time, int type, int flags, int value, const char *name)
|
2011-09-23 01:02:54 +00:00
|
|
|
|
{
|
|
|
|
|
struct event *ev, **p;
|
|
|
|
|
unsigned int size, len = strlen(name);
|
|
|
|
|
|
|
|
|
|
size = sizeof(*ev) + len + 1;
|
|
|
|
|
ev = malloc(size);
|
|
|
|
|
if (!ev)
|
2014-08-17 18:26:21 +00:00
|
|
|
|
return NULL;
|
2011-09-23 01:02:54 +00:00
|
|
|
|
memset(ev, 0, size);
|
|
|
|
|
memcpy(ev->name, name, len);
|
|
|
|
|
ev->time.seconds = time;
|
|
|
|
|
ev->type = type;
|
|
|
|
|
ev->flags = flags;
|
|
|
|
|
ev->value = value;
|
|
|
|
|
|
2014-08-17 18:26:21 +00:00
|
|
|
|
/*
|
|
|
|
|
* Expand the events into a sane format. Currently
|
|
|
|
|
* just gas switches
|
|
|
|
|
*/
|
|
|
|
|
switch (type) {
|
|
|
|
|
case SAMPLE_EVENT_GASCHANGE2:
|
|
|
|
|
/* High 16 bits are He percentage */
|
|
|
|
|
ev->gas.mix.he.permille = (value >> 16) * 10;
|
|
|
|
|
/* Fallthrough */
|
|
|
|
|
case SAMPLE_EVENT_GASCHANGE:
|
|
|
|
|
/* Low 16 bits are O2 percentage */
|
|
|
|
|
ev->gas.mix.o2.permille = (value & 0xffff) * 10;
|
|
|
|
|
ev->gas.index = -1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
|
p = &dc->events;
|
2013-03-18 01:07:59 +00:00
|
|
|
|
|
|
|
|
|
/* insert in the sorted list of events */
|
2013-04-22 04:00:40 +00:00
|
|
|
|
while (*p && (*p)->time.seconds <= time)
|
2011-09-23 01:02:54 +00:00
|
|
|
|
p = &(*p)->next;
|
2013-03-18 01:07:59 +00:00
|
|
|
|
ev->next = *p;
|
2011-09-23 01:02:54 +00:00
|
|
|
|
*p = ev;
|
2011-10-25 07:29:19 +00:00
|
|
|
|
remember_event(name);
|
2014-08-17 18:26:21 +00:00
|
|
|
|
return ev;
|
2011-09-23 01:02:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-12 19:21:05 +00:00
|
|
|
|
static int same_event(struct event *a, struct event *b)
|
|
|
|
|
{
|
|
|
|
|
if (a->time.seconds != b->time.seconds)
|
|
|
|
|
return 0;
|
|
|
|
|
if (a->type != b->type)
|
|
|
|
|
return 0;
|
|
|
|
|
if (a->flags != b->flags)
|
|
|
|
|
return 0;
|
|
|
|
|
if (a->value != b->value)
|
|
|
|
|
return 0;
|
|
|
|
|
return !strcmp(a->name, b->name);
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
void remove_event(struct event *event)
|
2014-05-21 15:06:02 +00:00
|
|
|
|
{
|
|
|
|
|
struct event **ep = ¤t_dc->events;
|
2014-07-12 19:21:05 +00:00
|
|
|
|
while (ep && !same_event(*ep, event))
|
2014-05-21 15:06:02 +00:00
|
|
|
|
ep = &(*ep)->next;
|
|
|
|
|
if (ep) {
|
2014-07-29 15:50:06 +00:00
|
|
|
|
/* we can't link directly with event->next
|
|
|
|
|
* because 'event' can be a copy from another
|
|
|
|
|
* dive (for instance the displayed_dive
|
|
|
|
|
* that we use on the interface to show things). */
|
|
|
|
|
struct event *temp = (*ep)->next;
|
|
|
|
|
free(*ep);
|
|
|
|
|
*ep = temp;
|
2014-05-21 15:06:02 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-12 19:48:27 +00:00
|
|
|
|
/* since the name is an array as part of the structure (how silly is that?) we
|
|
|
|
|
* have to actually remove the existing event and replace it with a new one.
|
|
|
|
|
* WARNING, WARNING... this may end up freeing event in case that event is indeed
|
|
|
|
|
* WARNING, WARNING... part of this divecomputer on this dive! */
|
2014-10-11 11:25:52 +00:00
|
|
|
|
void update_event_name(struct dive *d, struct event *event, char *name)
|
2014-07-12 19:48:27 +00:00
|
|
|
|
{
|
|
|
|
|
if (!d || !event)
|
|
|
|
|
return;
|
|
|
|
|
struct divecomputer *dc = get_dive_dc(d, dc_number);
|
|
|
|
|
if (!dc)
|
|
|
|
|
return;
|
|
|
|
|
struct event **removep = &dc->events;
|
|
|
|
|
struct event *remove;
|
|
|
|
|
while ((*removep)->next && !same_event(*removep, event))
|
|
|
|
|
removep = &(*removep)->next;
|
|
|
|
|
if (!same_event(*removep, event))
|
|
|
|
|
return;
|
|
|
|
|
remove = *removep;
|
|
|
|
|
*removep = (*removep)->next;
|
|
|
|
|
add_event(dc, event->time.seconds, event->type, event->flags, event->value, name);
|
|
|
|
|
free(remove);
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-01 19:07:29 +00:00
|
|
|
|
/* this returns a pointer to static variable - so use it right away after calling */
|
|
|
|
|
struct gasmix *get_gasmix_from_event(struct event *ev)
|
|
|
|
|
{
|
2014-08-17 18:26:21 +00:00
|
|
|
|
static struct gasmix dummy;
|
|
|
|
|
if (ev && event_is_gaschange(ev))
|
|
|
|
|
return &ev->gas.mix;
|
|
|
|
|
|
|
|
|
|
return &dummy;
|
2014-06-01 19:07:29 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-05-29 20:13:11 +00:00
|
|
|
|
int get_pressure_units(int mb, const char **units)
|
2011-11-02 03:13:14 +00:00
|
|
|
|
{
|
|
|
|
|
int pressure;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
const char *unit;
|
2013-01-11 01:26:10 +00:00
|
|
|
|
struct units *units_p = get_units();
|
2011-11-02 03:13:14 +00:00
|
|
|
|
|
2013-01-11 01:26:10 +00:00
|
|
|
|
switch (units_p->pressure) {
|
2011-11-02 03:13:14 +00:00
|
|
|
|
case PASCAL:
|
|
|
|
|
pressure = mb * 100;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
unit = translate("gettextFromC", "pascal");
|
2011-11-02 03:13:14 +00:00
|
|
|
|
break;
|
|
|
|
|
case BAR:
|
2013-12-20 17:37:56 +00:00
|
|
|
|
default:
|
2011-11-02 03:13:14 +00:00
|
|
|
|
pressure = (mb + 500) / 1000;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
unit = translate("gettextFromC", "bar");
|
2011-11-02 03:13:14 +00:00
|
|
|
|
break;
|
|
|
|
|
case PSI:
|
|
|
|
|
pressure = mbar_to_PSI(mb);
|
2014-02-28 04:09:57 +00:00
|
|
|
|
unit = translate("gettextFromC", "psi");
|
2011-11-02 03:13:14 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (units)
|
|
|
|
|
*units = unit;
|
|
|
|
|
return pressure;
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-01 18:39:52 +00:00
|
|
|
|
double get_temp_units(unsigned int mk, const char **units)
|
|
|
|
|
{
|
|
|
|
|
double deg;
|
|
|
|
|
const char *unit;
|
2013-01-11 01:26:10 +00:00
|
|
|
|
struct units *units_p = get_units();
|
2011-11-01 18:39:52 +00:00
|
|
|
|
|
2013-01-11 01:26:10 +00:00
|
|
|
|
if (units_p->temperature == FAHRENHEIT) {
|
2011-11-01 18:39:52 +00:00
|
|
|
|
deg = mkelvin_to_F(mk);
|
|
|
|
|
unit = UTF8_DEGREE "F";
|
|
|
|
|
} else {
|
|
|
|
|
deg = mkelvin_to_C(mk);
|
|
|
|
|
unit = UTF8_DEGREE "C";
|
|
|
|
|
}
|
|
|
|
|
if (units)
|
|
|
|
|
*units = unit;
|
|
|
|
|
return deg;
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-02 02:56:14 +00:00
|
|
|
|
double get_volume_units(unsigned int ml, int *frac, const char **units)
|
|
|
|
|
{
|
|
|
|
|
int decimals;
|
|
|
|
|
double vol;
|
|
|
|
|
const char *unit;
|
2013-01-11 01:26:10 +00:00
|
|
|
|
struct units *units_p = get_units();
|
2011-11-02 02:56:14 +00:00
|
|
|
|
|
2013-01-11 01:26:10 +00:00
|
|
|
|
switch (units_p->volume) {
|
2011-11-02 02:56:14 +00:00
|
|
|
|
case LITER:
|
2013-12-20 17:37:56 +00:00
|
|
|
|
default:
|
2011-11-02 02:56:14 +00:00
|
|
|
|
vol = ml / 1000.0;
|
2014-06-06 19:13:54 +00:00
|
|
|
|
unit = translate("gettextFromC", "ℓ");
|
2011-11-02 02:56:14 +00:00
|
|
|
|
decimals = 1;
|
|
|
|
|
break;
|
|
|
|
|
case CUFT:
|
|
|
|
|
vol = ml_to_cuft(ml);
|
2014-02-28 04:09:57 +00:00
|
|
|
|
unit = translate("gettextFromC", "cuft");
|
2011-11-02 02:56:14 +00:00
|
|
|
|
decimals = 2;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (frac)
|
|
|
|
|
*frac = decimals;
|
|
|
|
|
if (units)
|
|
|
|
|
*units = unit;
|
|
|
|
|
return vol;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-19 16:13:55 +00:00
|
|
|
|
int units_to_sac(double volume)
|
2014-08-06 08:16:12 +00:00
|
|
|
|
{
|
2014-10-11 11:25:52 +00:00
|
|
|
|
if (get_units()->volume == CUFT)
|
2014-08-19 16:13:55 +00:00
|
|
|
|
return rint(cuft_to_l(volume) * 1000.0);
|
2014-08-06 08:16:12 +00:00
|
|
|
|
else
|
2014-08-19 16:13:55 +00:00
|
|
|
|
return rint(volume * 1000);
|
2014-08-06 08:16:12 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-10-11 23:39:40 +00:00
|
|
|
|
unsigned int units_to_depth(double depth)
|
|
|
|
|
{
|
|
|
|
|
if (get_units()->length == METERS)
|
|
|
|
|
return rint(depth * 1000);
|
|
|
|
|
return feet_to_mm(depth);
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-28 23:38:42 +00:00
|
|
|
|
double get_depth_units(int mm, int *frac, const char **units)
|
2011-09-21 19:12:54 +00:00
|
|
|
|
{
|
|
|
|
|
int decimals;
|
|
|
|
|
double d;
|
|
|
|
|
const char *unit;
|
2013-01-11 01:26:10 +00:00
|
|
|
|
struct units *units_p = get_units();
|
2011-09-21 19:12:54 +00:00
|
|
|
|
|
2013-01-11 01:26:10 +00:00
|
|
|
|
switch (units_p->length) {
|
2011-09-21 19:12:54 +00:00
|
|
|
|
case METERS:
|
2013-12-20 17:37:56 +00:00
|
|
|
|
default:
|
2011-09-21 19:12:54 +00:00
|
|
|
|
d = mm / 1000.0;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
unit = translate("gettextFromC", "m");
|
2011-09-21 19:12:54 +00:00
|
|
|
|
decimals = d < 20;
|
|
|
|
|
break;
|
|
|
|
|
case FEET:
|
|
|
|
|
d = mm_to_feet(mm);
|
2014-02-28 04:09:57 +00:00
|
|
|
|
unit = translate("gettextFromC", "ft");
|
2011-09-21 19:12:54 +00:00
|
|
|
|
decimals = 0;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (frac)
|
|
|
|
|
*frac = decimals;
|
|
|
|
|
if (units)
|
|
|
|
|
*units = unit;
|
|
|
|
|
return d;
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-04 05:57:48 +00:00
|
|
|
|
double get_vertical_speed_units(unsigned int mms, int *frac, const char **units)
|
|
|
|
|
{
|
|
|
|
|
double d;
|
|
|
|
|
const char *unit;
|
|
|
|
|
const struct units *units_p = get_units();
|
|
|
|
|
const double time_factor = units_p->vertical_speed_time == MINUTES ? 60.0 : 1.0;
|
|
|
|
|
|
|
|
|
|
switch (units_p->length) {
|
|
|
|
|
case METERS:
|
2013-12-20 17:37:56 +00:00
|
|
|
|
default:
|
2013-10-04 05:57:48 +00:00
|
|
|
|
d = mms / 1000.0 * time_factor;
|
2014-07-16 16:35:48 +00:00
|
|
|
|
if (units_p->vertical_speed_time == MINUTES)
|
|
|
|
|
unit = translate("gettextFromC", "m/min");
|
|
|
|
|
else
|
|
|
|
|
unit = translate("gettextFromC", "m/s");
|
2013-10-04 05:57:48 +00:00
|
|
|
|
break;
|
|
|
|
|
case FEET:
|
|
|
|
|
d = mm_to_feet(mms) * time_factor;
|
2014-07-16 16:35:48 +00:00
|
|
|
|
if (units_p->vertical_speed_time == MINUTES)
|
|
|
|
|
unit = translate("gettextFromC", "ft/min");
|
|
|
|
|
else
|
|
|
|
|
unit = translate("gettextFromC", "ft/s");
|
2013-10-04 05:57:48 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (frac)
|
|
|
|
|
*frac = d < 10;
|
|
|
|
|
if (units)
|
|
|
|
|
*units = unit;
|
|
|
|
|
return d;
|
|
|
|
|
}
|
|
|
|
|
|
2012-08-07 18:24:40 +00:00
|
|
|
|
double get_weight_units(unsigned int grams, int *frac, const char **units)
|
|
|
|
|
{
|
|
|
|
|
int decimals;
|
|
|
|
|
double value;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
const char *unit;
|
2013-01-11 01:26:10 +00:00
|
|
|
|
struct units *units_p = get_units();
|
2012-08-07 18:24:40 +00:00
|
|
|
|
|
2013-01-11 01:26:10 +00:00
|
|
|
|
if (units_p->weight == LBS) {
|
2012-08-07 18:24:40 +00:00
|
|
|
|
value = grams_to_lbs(grams);
|
2014-02-28 04:09:57 +00:00
|
|
|
|
unit = translate("gettextFromC", "lbs");
|
2012-08-07 18:24:40 +00:00
|
|
|
|
decimals = 0;
|
|
|
|
|
} else {
|
|
|
|
|
value = grams / 1000.0;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
unit = translate("gettextFromC", "kg");
|
2012-08-07 18:24:40 +00:00
|
|
|
|
decimals = 1;
|
|
|
|
|
}
|
|
|
|
|
if (frac)
|
|
|
|
|
*frac = decimals;
|
|
|
|
|
if (units)
|
|
|
|
|
*units = unit;
|
|
|
|
|
return value;
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-24 20:58:39 +00:00
|
|
|
|
bool has_hr_data(struct divecomputer *dc)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct sample *sample;
|
|
|
|
|
|
|
|
|
|
if (!dc)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
sample = dc->sample;
|
|
|
|
|
for (i = 0; i < dc->samples; i++)
|
|
|
|
|
if (sample[i].heartbeat)
|
|
|
|
|
return true;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-12 19:56:34 +00:00
|
|
|
|
struct dive *alloc_dive(void)
|
|
|
|
|
{
|
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
2012-11-24 02:05:38 +00:00
|
|
|
|
dive = malloc(sizeof(*dive));
|
2011-09-12 19:56:34 +00:00
|
|
|
|
if (!dive)
|
|
|
|
|
exit(1);
|
2012-11-24 02:05:38 +00:00
|
|
|
|
memset(dive, 0, sizeof(*dive));
|
2014-05-18 21:53:28 +00:00
|
|
|
|
dive->id = dive_getUniqID(dive);
|
2011-09-12 19:56:34 +00:00
|
|
|
|
return dive;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-02 22:29:02 +00:00
|
|
|
|
static void free_dc(struct divecomputer *dc);
|
|
|
|
|
static void free_pic(struct picture *picture);
|
|
|
|
|
|
|
|
|
|
/* this is very different from the copy_divecomputer later in this file;
|
|
|
|
|
* this function actually makes full copies of the content */
|
|
|
|
|
static void copy_dc(struct divecomputer *sdc, struct divecomputer *ddc)
|
|
|
|
|
{
|
|
|
|
|
*ddc = *sdc;
|
2014-07-03 04:05:22 +00:00
|
|
|
|
ddc->model = copy_string(sdc->model);
|
2014-07-02 22:29:02 +00:00
|
|
|
|
copy_samples(sdc, ddc);
|
|
|
|
|
copy_events(sdc, ddc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* copy an element in a list of pictures */
|
|
|
|
|
static void copy_pl(struct picture *sp, struct picture *dp)
|
|
|
|
|
{
|
|
|
|
|
*dp = *sp;
|
2014-07-03 04:05:22 +00:00
|
|
|
|
dp->filename = copy_string(sp->filename);
|
2014-07-02 22:29:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* copy an element in a list of tags */
|
|
|
|
|
static void copy_tl(struct tag_entry *st, struct tag_entry *dt)
|
|
|
|
|
{
|
|
|
|
|
dt->tag = malloc(sizeof(struct divetag));
|
2014-07-03 04:05:22 +00:00
|
|
|
|
dt->tag->name = copy_string(st->tag->name);
|
|
|
|
|
dt->tag->source = copy_string(st->tag->source);
|
2014-07-02 22:29:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Clear everything but the first element;
|
|
|
|
|
* this works for taglist, picturelist, even dive computers */
|
2014-10-11 11:25:52 +00:00
|
|
|
|
#define STRUCTURED_LIST_FREE(_type, _start, _free) \
|
|
|
|
|
{ \
|
|
|
|
|
_type *_ptr = _start; \
|
|
|
|
|
while (_ptr) { \
|
|
|
|
|
_type *_next = _ptr->next; \
|
|
|
|
|
_free(_ptr); \
|
|
|
|
|
_ptr = _next; \
|
|
|
|
|
} \
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#define STRUCTURED_LIST_COPY(_type, _first, _dest, _cpy) \
|
|
|
|
|
{ \
|
|
|
|
|
_type *_sptr = _first; \
|
|
|
|
|
_type **_dptr = &_dest; \
|
|
|
|
|
while (_sptr) { \
|
|
|
|
|
*_dptr = malloc(sizeof(_type)); \
|
|
|
|
|
_cpy(_sptr, *_dptr); \
|
|
|
|
|
_sptr = _sptr->next; \
|
|
|
|
|
_dptr = &(*_dptr)->next; \
|
|
|
|
|
} \
|
|
|
|
|
*_dptr = 0; \
|
2014-07-02 22:29:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* copy_dive makes duplicates of many components of a dive;
|
|
|
|
|
* in order not to leak memory, we need to free those .
|
|
|
|
|
* copy_dive doesn't play with the divetrip and forward/backward pointers
|
|
|
|
|
* so we can ignore those */
|
|
|
|
|
void clear_dive(struct dive *d)
|
|
|
|
|
{
|
|
|
|
|
if (!d)
|
|
|
|
|
return;
|
|
|
|
|
/* free the strings */
|
|
|
|
|
free(d->buddy);
|
|
|
|
|
free(d->divemaster);
|
|
|
|
|
free(d->location);
|
|
|
|
|
free(d->notes);
|
|
|
|
|
free(d->suit);
|
|
|
|
|
/* free tags, additional dive computers, and pictures */
|
|
|
|
|
taglist_free(d->tag_list);
|
|
|
|
|
STRUCTURED_LIST_FREE(struct divecomputer, d->dc.next, free_dc);
|
|
|
|
|
STRUCTURED_LIST_FREE(struct picture, d->picture_list, free_pic);
|
|
|
|
|
memset(d, 0, sizeof(struct dive));
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-03 20:34:27 +00:00
|
|
|
|
/* make a true copy that is independent of the source dive;
|
|
|
|
|
* all data structures are duplicated, so the copy can be modified without
|
|
|
|
|
* any impact on the source */
|
2014-07-02 22:29:02 +00:00
|
|
|
|
void copy_dive(struct dive *s, struct dive *d)
|
|
|
|
|
{
|
|
|
|
|
clear_dive(d);
|
|
|
|
|
/* simply copy things over, but then make actual copies of the
|
|
|
|
|
* relevant components that are referenced through pointers,
|
|
|
|
|
* so all the strings and the structured lists */
|
|
|
|
|
*d = *s;
|
2014-07-03 04:05:22 +00:00
|
|
|
|
d->buddy = copy_string(s->buddy);
|
|
|
|
|
d->divemaster = copy_string(s->divemaster);
|
|
|
|
|
d->location = copy_string(s->location);
|
|
|
|
|
d->notes = copy_string(s->notes);
|
|
|
|
|
d->suit = copy_string(s->suit);
|
2014-07-02 22:29:02 +00:00
|
|
|
|
STRUCTURED_LIST_COPY(struct picture, s->picture_list, d->picture_list, copy_pl);
|
|
|
|
|
STRUCTURED_LIST_COPY(struct tag_entry, s->tag_list, d->tag_list, copy_tl);
|
2014-07-06 18:02:28 +00:00
|
|
|
|
STRUCTURED_LIST_COPY(struct divecomputer, s->dc.next, d->dc.next, copy_dc);
|
|
|
|
|
/* this only copied dive computers 2 and up. The first dive computer is part
|
|
|
|
|
* of the struct dive, so let's make copies of its samples and events */
|
|
|
|
|
copy_samples(&s->dc, &d->dc);
|
|
|
|
|
copy_events(&s->dc, &d->dc);
|
2014-07-02 22:29:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-03 20:34:27 +00:00
|
|
|
|
/* make a clone of the source dive and clean out the source dive;
|
|
|
|
|
* this is specifically so we can create a dive in the displayed_dive and then
|
|
|
|
|
* add it to the divelist.
|
|
|
|
|
* Note the difference to copy_dive() / clean_dive() */
|
|
|
|
|
struct dive *clone_dive(struct dive *s)
|
|
|
|
|
{
|
|
|
|
|
struct dive *dive = alloc_dive();
|
2014-10-11 11:25:52 +00:00
|
|
|
|
*dive = *s; // so all the pointers in dive point to the things s pointed to
|
2014-07-03 20:34:27 +00:00
|
|
|
|
memset(s, 0, sizeof(struct dive)); // and now the pointers in s are gone
|
|
|
|
|
return dive;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-16 13:55:31 +00:00
|
|
|
|
#define CONDITIONAL_COPY_STRING(_component) \
|
|
|
|
|
if (what._component) \
|
|
|
|
|
d->_component = copy_string(s->_component)
|
|
|
|
|
|
|
|
|
|
// copy elements, depending on bits in what that are set
|
2014-08-17 00:33:09 +00:00
|
|
|
|
void selective_copy_dive(struct dive *s, struct dive *d, struct dive_components what, bool clear)
|
2014-08-16 13:55:31 +00:00
|
|
|
|
{
|
2014-08-17 00:33:09 +00:00
|
|
|
|
if (clear)
|
|
|
|
|
clear_dive(d);
|
2014-08-16 13:55:31 +00:00
|
|
|
|
CONDITIONAL_COPY_STRING(location);
|
|
|
|
|
CONDITIONAL_COPY_STRING(notes);
|
|
|
|
|
CONDITIONAL_COPY_STRING(divemaster);
|
|
|
|
|
CONDITIONAL_COPY_STRING(buddy);
|
|
|
|
|
CONDITIONAL_COPY_STRING(suit);
|
|
|
|
|
if (what.rating)
|
|
|
|
|
d->rating = s->rating;
|
|
|
|
|
if (what.visibility)
|
|
|
|
|
d->visibility = s->visibility;
|
|
|
|
|
if (what.gps) {
|
|
|
|
|
d->longitude = s->longitude;
|
|
|
|
|
d->latitude = s->latitude;
|
|
|
|
|
}
|
|
|
|
|
if (what.tags)
|
|
|
|
|
STRUCTURED_LIST_COPY(struct tag_entry, s->tag_list, d->tag_list, copy_tl);
|
|
|
|
|
if (what.cylinders)
|
|
|
|
|
copy_cylinders(s, d, false);
|
|
|
|
|
if (what.weights)
|
|
|
|
|
for (int i = 0; i < MAX_WEIGHTSYSTEMS; i++)
|
|
|
|
|
d->weightsystem[i] = s->weightsystem[i];
|
|
|
|
|
}
|
|
|
|
|
#undef CONDITIONAL_COPY_STRING
|
|
|
|
|
|
2014-10-12 18:49:18 +00:00
|
|
|
|
/* copies all events in this dive computer */
|
2014-07-02 22:29:02 +00:00
|
|
|
|
void copy_events(struct divecomputer *s, struct divecomputer *d)
|
2013-11-08 09:15:04 +00:00
|
|
|
|
{
|
2014-10-12 18:49:18 +00:00
|
|
|
|
struct event *ev, **pev;
|
2013-11-08 09:15:04 +00:00
|
|
|
|
if (!s || !d)
|
|
|
|
|
return;
|
2014-07-02 22:29:02 +00:00
|
|
|
|
ev = s->events;
|
2014-10-12 18:49:18 +00:00
|
|
|
|
pev = &d->events;
|
2013-11-08 09:15:04 +00:00
|
|
|
|
while (ev != NULL) {
|
2014-10-12 18:49:18 +00:00
|
|
|
|
int size = sizeof(*ev) + strlen(ev->name) + 1;
|
|
|
|
|
struct event *new_ev = malloc(size);
|
|
|
|
|
memcpy(new_ev, ev, size);
|
|
|
|
|
*pev = new_ev;
|
|
|
|
|
pev = &new_ev->next;
|
2013-11-08 09:15:04 +00:00
|
|
|
|
ev = ev->next;
|
|
|
|
|
}
|
2014-10-12 18:49:18 +00:00
|
|
|
|
*pev = NULL;
|
2013-11-08 09:15:04 +00:00
|
|
|
|
}
|
|
|
|
|
|
Initial implementation of git save format
This saves the dive data into a git object repository instead of a
single XML file.
We create a git object tree with each dive as a separate file,
hierarchically by trip and date.
NOTE 1: This largely duplicates the XML saving code, because trying to
share it seemed just too painful: the logic is very similar, but the
details of the actual strings end up differing sufficiently that there
are tons of trivial differences.
The git save format is line-based with minimal quoting, while XML quotes
everything with either "<..\>" or using single quotes around attributes.
NOTE 2: You currently need a dummy "file" to save to, which points to
the real save location: the git repository and branch to be used. We
should make this a config thing, but for testing, do something like
this:
echo git /home/torvalds/scuba:linus > git-test
to create that git information file, and when you use "Save To" and
specify "git-test" as the file to save to, subsurface will use the new
git save logic to save to the branch "linus" in the repository found at
"/home/torvalds/scuba".
NOTE 3: The git save format uses just the git object directory, it does
*not* check out the result in any git working tree or index. So after
you do a save, you can do
git log -p linus
to see what actually happened in that branch, but it will not affect any
actual checked-out state in the repository.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-06 21:28:39 +00:00
|
|
|
|
int nr_cylinders(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
int nr;
|
|
|
|
|
|
|
|
|
|
for (nr = MAX_CYLINDERS; nr; --nr) {
|
|
|
|
|
cylinder_t *cylinder = dive->cylinder + nr - 1;
|
|
|
|
|
if (!cylinder_nodata(cylinder))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return nr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int nr_weightsystems(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
int nr;
|
|
|
|
|
|
|
|
|
|
for (nr = MAX_WEIGHTSYSTEMS; nr; --nr) {
|
|
|
|
|
weightsystem_t *ws = dive->weightsystem + nr - 1;
|
|
|
|
|
if (!weightsystem_none(ws))
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return nr;
|
|
|
|
|
}
|
|
|
|
|
|
2014-08-16 13:55:31 +00:00
|
|
|
|
/* copy the equipment data part of the cylinders */
|
2014-06-04 06:09:12 +00:00
|
|
|
|
void copy_cylinders(struct dive *s, struct dive *d, bool used_only)
|
2013-11-07 08:25:42 +00:00
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
if (!s || !d)
|
|
|
|
|
return;
|
2014-08-16 13:55:31 +00:00
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
|
|
|
|
memset(&d->cylinder[i], 0, sizeof(cylinder_t));
|
|
|
|
|
if (!used_only || is_cylinder_used(s, i)) {
|
|
|
|
|
d->cylinder[i].type = s->cylinder[i].type;
|
|
|
|
|
d->cylinder[i].gasmix = s->cylinder[i].gasmix;
|
|
|
|
|
d->cylinder[i].depth = s->cylinder[i].depth;
|
2014-08-17 00:33:09 +00:00
|
|
|
|
d->cylinder[i].manually_added = true;
|
2014-08-16 13:55:31 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2013-11-07 08:25:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-02 22:29:02 +00:00
|
|
|
|
void copy_samples(struct divecomputer *s, struct divecomputer *d)
|
2013-09-19 04:33:39 +00:00
|
|
|
|
{
|
|
|
|
|
/* instead of carefully copying them one by one and calling add_sample
|
|
|
|
|
* over and over again, let's just copy the whole blob */
|
|
|
|
|
if (!s || !d)
|
|
|
|
|
return;
|
2014-07-02 22:29:02 +00:00
|
|
|
|
int nr = s->samples;
|
|
|
|
|
d->samples = nr;
|
|
|
|
|
d->sample = malloc(nr * sizeof(struct sample));
|
|
|
|
|
if (d->sample)
|
|
|
|
|
memcpy(d->sample, s->sample, nr * sizeof(struct sample));
|
2013-09-19 04:33:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
|
struct sample *prepare_sample(struct divecomputer *dc)
|
2011-09-12 19:56:34 +00:00
|
|
|
|
{
|
2012-11-24 02:51:27 +00:00
|
|
|
|
if (dc) {
|
|
|
|
|
int nr = dc->samples;
|
|
|
|
|
int alloc_samples = dc->alloc_samples;
|
2011-09-12 19:56:34 +00:00
|
|
|
|
struct sample *sample;
|
|
|
|
|
if (nr >= alloc_samples) {
|
2012-11-24 02:05:38 +00:00
|
|
|
|
struct sample *newsamples;
|
2011-09-12 19:56:34 +00:00
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
alloc_samples = (alloc_samples * 3) / 2 + 10;
|
2012-11-24 02:51:27 +00:00
|
|
|
|
newsamples = realloc(dc->sample, alloc_samples * sizeof(struct sample));
|
2012-11-24 02:05:38 +00:00
|
|
|
|
if (!newsamples)
|
2011-09-12 19:56:34 +00:00
|
|
|
|
return NULL;
|
2012-11-24 02:51:27 +00:00
|
|
|
|
dc->alloc_samples = alloc_samples;
|
|
|
|
|
dc->sample = newsamples;
|
2011-09-12 19:56:34 +00:00
|
|
|
|
}
|
2012-11-24 02:51:27 +00:00
|
|
|
|
sample = dc->sample + nr;
|
2011-09-12 19:56:34 +00:00
|
|
|
|
memset(sample, 0, sizeof(*sample));
|
|
|
|
|
return sample;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
|
void finish_sample(struct divecomputer *dc)
|
2011-09-12 19:56:34 +00:00
|
|
|
|
{
|
2012-11-24 02:51:27 +00:00
|
|
|
|
dc->samples++;
|
2011-09-12 19:56:34 +00:00
|
|
|
|
}
|
|
|
|
|
|
2011-09-03 20:36:25 +00:00
|
|
|
|
/*
|
|
|
|
|
* So when we re-calculate maxdepth and meandepth, we will
|
|
|
|
|
* not override the old numbers if they are close to the
|
|
|
|
|
* new ones.
|
|
|
|
|
*
|
|
|
|
|
* Why? Because a dive computer may well actually track the
|
|
|
|
|
* max depth and mean depth at finer granularity than the
|
|
|
|
|
* samples it stores. So it's possible that the max and mean
|
|
|
|
|
* have been reported more correctly originally.
|
|
|
|
|
*
|
2011-09-04 01:48:39 +00:00
|
|
|
|
* Only if the values calculated from the samples are clearly
|
2011-09-03 20:36:25 +00:00
|
|
|
|
* different do we override the normal depth values.
|
|
|
|
|
*
|
|
|
|
|
* This considers 1m to be "clearly different". That's
|
|
|
|
|
* a totally random number.
|
|
|
|
|
*/
|
|
|
|
|
static void update_depth(depth_t *depth, int new)
|
|
|
|
|
{
|
2011-09-04 20:06:47 +00:00
|
|
|
|
if (new) {
|
|
|
|
|
int old = depth->mm;
|
2011-09-03 20:36:25 +00:00
|
|
|
|
|
2011-09-04 20:06:47 +00:00
|
|
|
|
if (abs(old - new) > 1000)
|
|
|
|
|
depth->mm = new;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void update_temperature(temperature_t *temperature, int new)
|
|
|
|
|
{
|
|
|
|
|
if (new) {
|
|
|
|
|
int old = temperature->mkelvin;
|
|
|
|
|
|
|
|
|
|
if (abs(old - new) > 1000)
|
|
|
|
|
temperature->mkelvin = new;
|
|
|
|
|
}
|
2011-09-03 20:36:25 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-02-24 19:39:51 +00:00
|
|
|
|
/*
|
|
|
|
|
* Calculate how long we were actually under water, and the average
|
|
|
|
|
* depth while under water.
|
|
|
|
|
*
|
|
|
|
|
* This ignores any surface time in the middle of the dive.
|
|
|
|
|
*/
|
2014-08-04 14:36:07 +00:00
|
|
|
|
void fixup_dc_duration(struct divecomputer *dc)
|
2013-02-24 19:39:51 +00:00
|
|
|
|
{
|
|
|
|
|
int duration, i;
|
|
|
|
|
int lasttime, lastdepth, depthtime;
|
|
|
|
|
|
|
|
|
|
duration = 0;
|
|
|
|
|
lasttime = 0;
|
|
|
|
|
lastdepth = 0;
|
|
|
|
|
depthtime = 0;
|
|
|
|
|
for (i = 0; i < dc->samples; i++) {
|
|
|
|
|
struct sample *sample = dc->sample + i;
|
|
|
|
|
int time = sample->time.seconds;
|
|
|
|
|
int depth = sample->depth.mm;
|
|
|
|
|
|
|
|
|
|
/* We ignore segments at the surface */
|
|
|
|
|
if (depth > SURFACE_THRESHOLD || lastdepth > SURFACE_THRESHOLD) {
|
|
|
|
|
duration += time - lasttime;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
depthtime += (time - lasttime) * (depth + lastdepth) / 2;
|
2013-02-24 19:39:51 +00:00
|
|
|
|
}
|
|
|
|
|
lastdepth = depth;
|
|
|
|
|
lasttime = time;
|
|
|
|
|
}
|
|
|
|
|
if (duration) {
|
|
|
|
|
dc->duration.seconds = duration;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
dc->meandepth.mm = (depthtime + duration / 2) / duration;
|
2013-02-24 19:39:51 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-20 06:50:02 +00:00
|
|
|
|
void per_cylinder_mean_depth(struct dive *dive, struct divecomputer *dc, int *mean, int *duration)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
int depthtime[MAX_CYLINDERS] = { 0, };
|
2013-11-20 06:50:02 +00:00
|
|
|
|
int lasttime = 0, lastdepth = 0;
|
|
|
|
|
int idx = 0;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++)
|
|
|
|
|
mean[i] = duration[i] = 0;
|
|
|
|
|
struct event *ev = get_next_event(dc->events, "gaschange");
|
|
|
|
|
if (!ev) {
|
|
|
|
|
// special case - no gas changes
|
|
|
|
|
mean[0] = dc->meandepth.mm;
|
|
|
|
|
duration[0] = dc->duration.seconds;
|
|
|
|
|
return;
|
|
|
|
|
}
|
Make gas use statistics be coherent and more complete
The gas use logic in the dive statistics page is confused.
The SAC case had a special case for "unknown", but only for
the first gas. Other gases had the normal empty case.
Also, the logic was really odd - if you had gases that weren't used (or
pressures not known) intermixed with gases you *did* have pressure for,
the statistics got really confused.
The list of gases showed all gases that we know about during the dive,
but then the gas use and SAC-rate lists wouldn't necessarily match,
because the loops that computed those stopped after the first gas that
didn't have any pressure change.
To make things worse, the first cylinder was special-cased again, so it
all lined up for the single-cylinder case.
This makes all the cylinders act the same way, leaving unknown gas use
(and thus SAC) just empty for that gas.
It also fixes the SAC calculation case where we don't have real samples,
and the profile is a fake profile - possibly with gas changes in between
the fake points. We now make the SAC calculations match what we show -
which is admittedly not at all necessarily what the dive was, but at
least we're consistent.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-30 17:08:33 +00:00
|
|
|
|
if (!dc->samples)
|
|
|
|
|
dc = fake_dc(dc);
|
2013-11-20 06:50:02 +00:00
|
|
|
|
for (i = 0; i < dc->samples; i++) {
|
|
|
|
|
struct sample *sample = dc->sample + i;
|
|
|
|
|
int time = sample->time.seconds;
|
|
|
|
|
int depth = sample->depth.mm;
|
Make gas use statistics be coherent and more complete
The gas use logic in the dive statistics page is confused.
The SAC case had a special case for "unknown", but only for
the first gas. Other gases had the normal empty case.
Also, the logic was really odd - if you had gases that weren't used (or
pressures not known) intermixed with gases you *did* have pressure for,
the statistics got really confused.
The list of gases showed all gases that we know about during the dive,
but then the gas use and SAC-rate lists wouldn't necessarily match,
because the loops that computed those stopped after the first gas that
didn't have any pressure change.
To make things worse, the first cylinder was special-cased again, so it
all lined up for the single-cylinder case.
This makes all the cylinders act the same way, leaving unknown gas use
(and thus SAC) just empty for that gas.
It also fixes the SAC calculation case where we don't have real samples,
and the profile is a fake profile - possibly with gas changes in between
the fake points. We now make the SAC calculations match what we show -
which is admittedly not at all necessarily what the dive was, but at
least we're consistent.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-30 17:08:33 +00:00
|
|
|
|
|
|
|
|
|
/* Make sure to move the event past 'lasttime' */
|
|
|
|
|
while (ev && lasttime >= ev->time.seconds) {
|
2013-11-20 18:52:17 +00:00
|
|
|
|
idx = get_cylinder_index(dive, ev);
|
2013-11-20 06:50:02 +00:00
|
|
|
|
ev = get_next_event(ev->next, "gaschange");
|
|
|
|
|
}
|
Make gas use statistics be coherent and more complete
The gas use logic in the dive statistics page is confused.
The SAC case had a special case for "unknown", but only for
the first gas. Other gases had the normal empty case.
Also, the logic was really odd - if you had gases that weren't used (or
pressures not known) intermixed with gases you *did* have pressure for,
the statistics got really confused.
The list of gases showed all gases that we know about during the dive,
but then the gas use and SAC-rate lists wouldn't necessarily match,
because the loops that computed those stopped after the first gas that
didn't have any pressure change.
To make things worse, the first cylinder was special-cased again, so it
all lined up for the single-cylinder case.
This makes all the cylinders act the same way, leaving unknown gas use
(and thus SAC) just empty for that gas.
It also fixes the SAC calculation case where we don't have real samples,
and the profile is a fake profile - possibly with gas changes in between
the fake points. We now make the SAC calculations match what we show -
which is admittedly not at all necessarily what the dive was, but at
least we're consistent.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-07-30 17:08:33 +00:00
|
|
|
|
|
|
|
|
|
/* Do we need to fake a midway sample at an event? */
|
|
|
|
|
if (ev && time > ev->time.seconds) {
|
|
|
|
|
int newtime = ev->time.seconds;
|
|
|
|
|
int newdepth = interpolate(lastdepth, depth, newtime - lasttime, time - lasttime);
|
|
|
|
|
|
|
|
|
|
time = newtime;
|
|
|
|
|
depth = newdepth;
|
|
|
|
|
i--;
|
|
|
|
|
}
|
2013-11-20 06:50:02 +00:00
|
|
|
|
/* We ignore segments at the surface */
|
|
|
|
|
if (depth > SURFACE_THRESHOLD || lastdepth > SURFACE_THRESHOLD) {
|
|
|
|
|
duration[idx] += time - lasttime;
|
|
|
|
|
depthtime[idx] += (time - lasttime) * (depth + lastdepth) / 2;
|
|
|
|
|
}
|
|
|
|
|
lastdepth = depth;
|
|
|
|
|
lasttime = time;
|
|
|
|
|
}
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
|
|
|
|
if (duration[i])
|
|
|
|
|
mean[i] = (depthtime[i] + duration[i] / 2) / duration[i];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-09 15:37:25 +00:00
|
|
|
|
static void fixup_pressure(struct dive *dive, struct sample *sample)
|
2011-09-05 16:12:54 +00:00
|
|
|
|
{
|
2014-05-29 20:13:11 +00:00
|
|
|
|
int pressure, index;
|
2011-09-05 16:12:54 +00:00
|
|
|
|
cylinder_t *cyl;
|
|
|
|
|
|
|
|
|
|
pressure = sample->cylinderpressure.mbar;
|
|
|
|
|
if (!pressure)
|
2011-11-09 15:37:25 +00:00
|
|
|
|
return;
|
First step in cleaning up cylinder pressure sensor logic
This clarifies/changes the meaning of our "cylinderindex" entry in our
samples. It has been rather confused, because different dive computers
have done things differently, and the naming really hasn't helped.
There are two totally different - and independent - cylinder "indexes":
- the pressure sensor index, which indicates which cylinder the sensor
data is from.
- the "active cylinder" index, which indicates which cylinder we actually
breathe from.
These two values really are totally independent, and have nothing
what-so-ever to do with each other. The sensor index may well be fixed:
many dive computers only support a single pressure sensor (whether
wireless or wired), and the sensor index is thus always zero.
Other dive computers may support multiple pressure sensors, and the gas
switch event may - or may not - indicate that the sensor changed too. A
dive computer might give the sensor data for *all* cylinders it can read,
regardless of which one is the one we're actively breathing. In fact, some
dive computers might give sensor data for not just *your* cylinder, but
your buddies.
This patch renames "cylinderindex" in the samples as "sensor", making it
quite clear that it's about which sensor index the pressure data in the
sample is about.
The way we figure out which is the currently active gas is with an
explicit has change event. If a computer (like the Uemis Zurich) joins the
two concepts together, then a sensor change should also create a gas
switch event. This patch also changes the Uemis importer to do that.
Finally, it should be noted that the plot info works totally separately
from the sample data, and is about what we actually *display*, not about
the sample pressures etc. In the plot info, the "cylinderindex" does in
fact mean the currently active cylinder, and while it is initially set to
match the sensor information from the samples, we then walk the gas change
events and fix it up - and if the active cylinder differs from the sensor
cylinder, we clear the sensor data.
[Dirk Hohndel: this conflicted with some of my recent changes - I think
I merged things correctly...]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-31 04:00:51 +00:00
|
|
|
|
index = sample->sensor;
|
|
|
|
|
|
|
|
|
|
/* FIXME! sensor -> cylinder mapping? */
|
2011-09-05 16:12:54 +00:00
|
|
|
|
if (index >= MAX_CYLINDERS)
|
2011-11-09 15:37:25 +00:00
|
|
|
|
return;
|
2011-09-05 16:12:54 +00:00
|
|
|
|
cyl = dive->cylinder + index;
|
2011-11-09 15:37:25 +00:00
|
|
|
|
if (!cyl->sample_start.mbar)
|
|
|
|
|
cyl->sample_start.mbar = pressure;
|
|
|
|
|
cyl->sample_end.mbar = pressure;
|
2011-09-05 16:12:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-02-09 04:10:47 +00:00
|
|
|
|
static void update_min_max_temperatures(struct dive *dive, temperature_t temperature)
|
2013-01-24 18:58:59 +00:00
|
|
|
|
{
|
2013-02-09 04:10:47 +00:00
|
|
|
|
if (temperature.mkelvin) {
|
|
|
|
|
if (!dive->maxtemp.mkelvin || temperature.mkelvin > dive->maxtemp.mkelvin)
|
|
|
|
|
dive->maxtemp = temperature;
|
|
|
|
|
if (!dive->mintemp.mkelvin || temperature.mkelvin < dive->mintemp.mkelvin)
|
|
|
|
|
dive->mintemp = temperature;
|
2013-01-24 18:58:59 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-25 23:23:16 +00:00
|
|
|
|
/*
|
|
|
|
|
* At high pressures air becomes less compressible, and
|
|
|
|
|
* does not follow the ideal gas law any more.
|
|
|
|
|
*
|
|
|
|
|
* This tries to correct for that, becoming the same
|
|
|
|
|
* as to_ATM() at lower pressures.
|
|
|
|
|
*
|
|
|
|
|
* THIS IS A ROUGH APPROXIMATION! The real numbers will
|
|
|
|
|
* depend on the exact gas mix and temperature.
|
|
|
|
|
*/
|
|
|
|
|
double surface_volume_multiplier(pressure_t pressure)
|
|
|
|
|
{
|
|
|
|
|
double bar = pressure.mbar / 1000.0;
|
|
|
|
|
|
|
|
|
|
if (bar > 200)
|
2014-02-28 04:09:57 +00:00
|
|
|
|
bar = 0.00038 * bar * bar + 0.51629 * bar + 81.542;
|
2013-02-25 23:23:16 +00:00
|
|
|
|
return bar_to_atm(bar);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
int gas_volume(cylinder_t *cyl, pressure_t p)
|
|
|
|
|
{
|
|
|
|
|
return cyl->type.size.mliter * surface_volume_multiplier(p);
|
|
|
|
|
}
|
2013-01-24 18:58:59 +00:00
|
|
|
|
|
2013-05-22 20:29:17 +00:00
|
|
|
|
int wet_volume(double cuft, pressure_t p)
|
|
|
|
|
{
|
|
|
|
|
return cuft_to_l(cuft) * 1000 / surface_volume_multiplier(p);
|
|
|
|
|
}
|
|
|
|
|
|
2011-11-10 23:33:38 +00:00
|
|
|
|
/*
|
|
|
|
|
* If the cylinder tank pressures are within half a bar
|
|
|
|
|
* (about 8 PSI) of the sample pressures, we consider it
|
|
|
|
|
* to be a rounding error, and throw them away as redundant.
|
|
|
|
|
*/
|
|
|
|
|
static int same_rounded_pressure(pressure_t a, pressure_t b)
|
|
|
|
|
{
|
|
|
|
|
return abs(a.mbar - b.mbar) <= 500;
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-25 16:01:16 +00:00
|
|
|
|
void sanitize_gasmix(struct gasmix *mix)
|
2011-12-30 21:09:17 +00:00
|
|
|
|
{
|
|
|
|
|
unsigned int o2, he;
|
|
|
|
|
|
|
|
|
|
o2 = mix->o2.permille;
|
|
|
|
|
he = mix->he.permille;
|
|
|
|
|
|
|
|
|
|
/* Regular air: leave empty */
|
|
|
|
|
if (!he) {
|
|
|
|
|
if (!o2)
|
|
|
|
|
return;
|
2013-01-14 22:53:38 +00:00
|
|
|
|
/* 20.8% to 21% O2 is just air */
|
2014-06-02 03:56:29 +00:00
|
|
|
|
if (gasmix_is_air(mix)) {
|
2011-12-30 21:09:17 +00:00
|
|
|
|
mix->o2.permille = 0;
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Sane mix? */
|
2014-02-28 04:09:57 +00:00
|
|
|
|
if (o2 <= 1000 && he <= 1000 && o2 + he <= 1000)
|
2011-12-30 21:09:17 +00:00
|
|
|
|
return;
|
2012-09-18 23:51:48 +00:00
|
|
|
|
fprintf(stderr, "Odd gasmix: %u O2 %u He\n", o2, he);
|
2011-12-30 21:09:17 +00:00
|
|
|
|
memset(mix, 0, sizeof(*mix));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* See if the size/workingpressure looks like some standard cylinder
|
|
|
|
|
* size, eg "AL80".
|
|
|
|
|
*/
|
|
|
|
|
static void match_standard_cylinder(cylinder_type_t *type)
|
|
|
|
|
{
|
|
|
|
|
double cuft;
|
|
|
|
|
int psi, len;
|
|
|
|
|
const char *fmt;
|
2013-03-04 01:53:43 +00:00
|
|
|
|
char buffer[40], *p;
|
2011-12-30 21:09:17 +00:00
|
|
|
|
|
|
|
|
|
/* Do we already have a cylinder description? */
|
|
|
|
|
if (type->description)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
cuft = ml_to_cuft(type->size.mliter);
|
2013-02-25 23:23:16 +00:00
|
|
|
|
cuft *= surface_volume_multiplier(type->workingpressure);
|
2011-12-30 21:09:17 +00:00
|
|
|
|
psi = to_PSI(type->workingpressure);
|
|
|
|
|
|
|
|
|
|
switch (psi) {
|
2014-02-28 04:09:57 +00:00
|
|
|
|
case 2300 ... 2500: /* 2400 psi: LP tank */
|
2011-12-30 21:09:17 +00:00
|
|
|
|
fmt = "LP%d";
|
|
|
|
|
break;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
case 2600 ... 2700: /* 2640 psi: LP+10% */
|
2011-12-30 21:09:17 +00:00
|
|
|
|
fmt = "LP%d";
|
|
|
|
|
break;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
case 2900 ... 3100: /* 3000 psi: ALx tank */
|
2011-12-30 21:09:17 +00:00
|
|
|
|
fmt = "AL%d";
|
|
|
|
|
break;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
case 3400 ... 3500: /* 3442 psi: HP tank */
|
2011-12-30 21:09:17 +00:00
|
|
|
|
fmt = "HP%d";
|
|
|
|
|
break;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
case 3700 ... 3850: /* HP+10% */
|
2011-12-30 21:09:17 +00:00
|
|
|
|
fmt = "HP%d+";
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return;
|
|
|
|
|
}
|
2014-05-05 21:52:13 +00:00
|
|
|
|
len = snprintf(buffer, sizeof(buffer), fmt, (int)rint(cuft));
|
2014-02-28 04:09:57 +00:00
|
|
|
|
p = malloc(len + 1);
|
2011-12-30 21:09:17 +00:00
|
|
|
|
if (!p)
|
|
|
|
|
return;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
memcpy(p, buffer, len + 1);
|
2011-12-30 21:09:17 +00:00
|
|
|
|
type->description = p;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* There are two ways to give cylinder size information:
|
|
|
|
|
* - total amount of gas in cuft (depends on working pressure and physical size)
|
|
|
|
|
* - physical size
|
|
|
|
|
*
|
|
|
|
|
* where "physical size" is the one that actually matters and is sane.
|
|
|
|
|
*
|
|
|
|
|
* We internally use physical size only. But we save the workingpressure
|
|
|
|
|
* so that we can do the conversion if required.
|
|
|
|
|
*/
|
|
|
|
|
static void sanitize_cylinder_type(cylinder_type_t *type)
|
|
|
|
|
{
|
2013-02-25 23:23:16 +00:00
|
|
|
|
double volume_of_air, volume;
|
2011-12-30 21:09:17 +00:00
|
|
|
|
|
|
|
|
|
/* If we have no working pressure, it had *better* be just a physical size! */
|
|
|
|
|
if (!type->workingpressure.mbar)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* No size either? Nothing to go on */
|
|
|
|
|
if (!type->size.mliter)
|
|
|
|
|
return;
|
|
|
|
|
|
2013-01-11 01:26:10 +00:00
|
|
|
|
if (xml_parsing_units.volume == CUFT) {
|
2011-12-30 21:09:17 +00:00
|
|
|
|
/* confusing - we don't really start from ml but millicuft !*/
|
|
|
|
|
volume_of_air = cuft_to_l(type->size.mliter);
|
2013-02-25 23:23:16 +00:00
|
|
|
|
/* milliliters at 1 atm: "true size" */
|
|
|
|
|
volume = volume_of_air / surface_volume_multiplier(type->workingpressure);
|
2014-02-12 22:19:53 +00:00
|
|
|
|
type->size.mliter = rint(volume);
|
2011-12-30 21:09:17 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Ok, we have both size and pressure: try to match a description */
|
|
|
|
|
match_standard_cylinder(type);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void sanitize_cylinder_info(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
|
|
|
|
sanitize_gasmix(&dive->cylinder[i].gasmix);
|
|
|
|
|
sanitize_cylinder_type(&dive->cylinder[i].type);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-10 10:40:35 +00:00
|
|
|
|
/* some events should never be thrown away */
|
2013-10-05 07:29:09 +00:00
|
|
|
|
static bool is_potentially_redundant(struct event *event)
|
2012-11-10 10:40:35 +00:00
|
|
|
|
{
|
|
|
|
|
if (!strcmp(event->name, "gaschange"))
|
2014-01-15 18:54:41 +00:00
|
|
|
|
return false;
|
2012-11-10 19:02:21 +00:00
|
|
|
|
if (!strcmp(event->name, "bookmark"))
|
2014-01-15 18:54:41 +00:00
|
|
|
|
return false;
|
2012-11-10 19:02:21 +00:00
|
|
|
|
if (!strcmp(event->name, "heading"))
|
2014-01-15 18:54:41 +00:00
|
|
|
|
return false;
|
|
|
|
|
return true;
|
2012-11-10 10:40:35 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* match just by name - we compare the details in the code that uses this helper */
|
2012-11-24 02:51:27 +00:00
|
|
|
|
static struct event *find_previous_event(struct divecomputer *dc, struct event *event)
|
2012-11-10 10:40:35 +00:00
|
|
|
|
{
|
2012-11-24 02:51:27 +00:00
|
|
|
|
struct event *ev = dc->events;
|
2012-11-10 10:40:35 +00:00
|
|
|
|
struct event *previous = NULL;
|
|
|
|
|
|
|
|
|
|
if (!event->name)
|
|
|
|
|
return NULL;
|
|
|
|
|
while (ev && ev != event) {
|
2013-01-29 21:10:46 +00:00
|
|
|
|
if (ev->name && !strcmp(ev->name, event->name))
|
2012-11-10 10:40:35 +00:00
|
|
|
|
previous = ev;
|
|
|
|
|
ev = ev->next;
|
|
|
|
|
}
|
|
|
|
|
return previous;
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-09 00:15:18 +00:00
|
|
|
|
static void fixup_surface_pressure(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
struct divecomputer *dc;
|
2013-02-09 13:45:58 +00:00
|
|
|
|
int sum = 0, nr = 0;
|
2013-02-09 00:15:18 +00:00
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dc (dive, dc) {
|
2013-02-09 00:15:18 +00:00
|
|
|
|
if (dc->surface_pressure.mbar) {
|
|
|
|
|
sum += dc->surface_pressure.mbar;
|
|
|
|
|
nr++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (nr)
|
2014-02-28 04:09:57 +00:00
|
|
|
|
dive->surface_pressure.mbar = (sum + nr / 2) / nr;
|
2013-02-09 00:15:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void fixup_water_salinity(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
struct divecomputer *dc;
|
2013-02-09 13:45:58 +00:00
|
|
|
|
int sum = 0, nr = 0;
|
2013-02-09 00:15:18 +00:00
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dc (dive, dc) {
|
2013-02-09 00:15:18 +00:00
|
|
|
|
if (dc->salinity) {
|
|
|
|
|
sum += dc->salinity;
|
|
|
|
|
nr++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (nr)
|
2014-02-28 04:09:57 +00:00
|
|
|
|
dive->salinity = (sum + nr / 2) / nr;
|
2013-02-09 00:15:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-02-09 14:50:53 +00:00
|
|
|
|
static void fixup_meandepth(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
struct divecomputer *dc;
|
|
|
|
|
int sum = 0, nr = 0;
|
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dc (dive, dc) {
|
2013-02-09 14:50:53 +00:00
|
|
|
|
if (dc->meandepth.mm) {
|
|
|
|
|
sum += dc->meandepth.mm;
|
|
|
|
|
nr++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (nr)
|
|
|
|
|
dive->meandepth.mm = (sum + nr / 2) / nr;
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-09 15:12:30 +00:00
|
|
|
|
static void fixup_duration(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
struct divecomputer *dc;
|
2014-06-04 00:06:59 +00:00
|
|
|
|
unsigned int duration = 0;
|
2013-02-09 15:12:30 +00:00
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dc (dive, dc)
|
2014-03-03 21:25:55 +00:00
|
|
|
|
duration = MAX(duration, dc->duration.seconds);
|
2013-02-09 15:12:30 +00:00
|
|
|
|
|
|
|
|
|
dive->duration.seconds = duration;
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-29 20:05:21 +00:00
|
|
|
|
/*
|
|
|
|
|
* What do the dive computers say the water temperature is?
|
|
|
|
|
* (not in the samples, but as dc property for dcs that support that)
|
|
|
|
|
*/
|
|
|
|
|
unsigned int dc_watertemp(struct divecomputer *dc)
|
2013-02-09 15:41:15 +00:00
|
|
|
|
{
|
|
|
|
|
int sum = 0, nr = 0;
|
|
|
|
|
|
2013-11-29 20:05:21 +00:00
|
|
|
|
do {
|
2013-02-09 15:41:15 +00:00
|
|
|
|
if (dc->watertemp.mkelvin) {
|
|
|
|
|
sum += dc->watertemp.mkelvin;
|
|
|
|
|
nr++;
|
|
|
|
|
}
|
2013-11-29 20:05:21 +00:00
|
|
|
|
} while ((dc = dc->next) != NULL);
|
|
|
|
|
if (!nr)
|
|
|
|
|
return 0;
|
|
|
|
|
return (sum + nr / 2) / nr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void fixup_watertemp(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
if (!dive->watertemp.mkelvin)
|
|
|
|
|
dive->watertemp.mkelvin = dc_watertemp(&dive->dc);
|
2013-02-09 15:41:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-02-14 23:18:48 +00:00
|
|
|
|
/*
|
|
|
|
|
* What do the dive computers say the air temperature is?
|
|
|
|
|
*/
|
|
|
|
|
unsigned int dc_airtemp(struct divecomputer *dc)
|
2013-02-09 15:41:15 +00:00
|
|
|
|
{
|
|
|
|
|
int sum = 0, nr = 0;
|
|
|
|
|
|
2013-02-14 23:18:48 +00:00
|
|
|
|
do {
|
2013-02-09 15:41:15 +00:00
|
|
|
|
if (dc->airtemp.mkelvin) {
|
|
|
|
|
sum += dc->airtemp.mkelvin;
|
|
|
|
|
nr++;
|
|
|
|
|
}
|
2013-02-14 23:18:48 +00:00
|
|
|
|
} while ((dc = dc->next) != NULL);
|
|
|
|
|
if (!nr)
|
|
|
|
|
return 0;
|
|
|
|
|
return (sum + nr / 2) / nr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void fixup_airtemp(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
if (!dive->airtemp.mkelvin)
|
|
|
|
|
dive->airtemp.mkelvin = dc_airtemp(&dive->dc);
|
2013-02-09 15:41:15 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-02-14 17:44:18 +00:00
|
|
|
|
/* zero out the airtemp in the dive structure if it was just created by
|
|
|
|
|
* running fixup on the dive. keep it if it had been edited by hand */
|
|
|
|
|
static void un_fixup_airtemp(struct dive *a)
|
|
|
|
|
{
|
2013-02-14 23:18:48 +00:00
|
|
|
|
if (a->airtemp.mkelvin && a->airtemp.mkelvin == dc_airtemp(&a->dc))
|
2013-02-14 17:44:18 +00:00
|
|
|
|
a->airtemp.mkelvin = 0;
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-09 00:35:39 +00:00
|
|
|
|
/*
|
|
|
|
|
* events are stored as a linked list, so the concept of
|
|
|
|
|
* "consecutive, identical events" is somewhat hard to
|
|
|
|
|
* implement correctly (especially given that on some dive
|
|
|
|
|
* computers events are asynchronous, so they can come in
|
|
|
|
|
* between what would be the non-constant sample rate).
|
|
|
|
|
*
|
|
|
|
|
* So what we do is that we throw away clearly redundant
|
|
|
|
|
* events that are fewer than 61 seconds apart (assuming there
|
|
|
|
|
* is no dive computer with a sample rate of more than 60
|
|
|
|
|
* seconds... that would be pretty pointless to plot the
|
|
|
|
|
* profile with)
|
|
|
|
|
*
|
|
|
|
|
* We first only mark the events for deletion so that we
|
|
|
|
|
* still know when the previous event happened.
|
|
|
|
|
*/
|
|
|
|
|
static void fixup_dc_events(struct divecomputer *dc)
|
2011-09-03 20:19:26 +00:00
|
|
|
|
{
|
2013-02-09 00:35:39 +00:00
|
|
|
|
struct event *event;
|
|
|
|
|
|
|
|
|
|
event = dc->events;
|
|
|
|
|
while (event) {
|
|
|
|
|
struct event *prev;
|
|
|
|
|
if (is_potentially_redundant(event)) {
|
|
|
|
|
prev = find_previous_event(dc, event);
|
|
|
|
|
if (prev && prev->value == event->value &&
|
|
|
|
|
prev->flags == event->flags &&
|
|
|
|
|
event->time.seconds - prev->time.seconds < 61)
|
2014-01-15 18:54:41 +00:00
|
|
|
|
event->deleted = true;
|
2013-02-09 00:35:39 +00:00
|
|
|
|
}
|
|
|
|
|
event = event->next;
|
|
|
|
|
}
|
|
|
|
|
event = dc->events;
|
|
|
|
|
while (event) {
|
|
|
|
|
if (event->next && event->next->deleted) {
|
|
|
|
|
struct event *nextnext = event->next->next;
|
|
|
|
|
free(event->next);
|
|
|
|
|
event->next = nextnext;
|
|
|
|
|
} else {
|
|
|
|
|
event = event->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void fixup_dive_dc(struct dive *dive, struct divecomputer *dc)
|
|
|
|
|
{
|
2014-10-11 07:49:48 +00:00
|
|
|
|
int i, j, o2val;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
double depthtime = 0;
|
|
|
|
|
int lasttime = 0;
|
2011-11-17 14:03:11 +00:00
|
|
|
|
int lastindex = -1;
|
2013-02-26 19:15:06 +00:00
|
|
|
|
int maxdepth = dc->maxdepth.mm;
|
|
|
|
|
int mintemp = 0;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
int lastdepth = 0;
|
2014-10-27 16:19:53 +00:00
|
|
|
|
int lasto2val[3] = { 0, 0, 0 };
|
2014-10-05 14:54:19 +00:00
|
|
|
|
int lasttemp = 0, lastpressure = 0, lastdiluentpressure = 0;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
int pressure_delta[MAX_CYLINDERS] = { INT_MAX, };
|
2013-02-09 00:15:18 +00:00
|
|
|
|
|
2013-02-24 19:39:51 +00:00
|
|
|
|
/* Fixup duration and mean depth */
|
|
|
|
|
fixup_dc_duration(dc);
|
2013-02-09 04:10:47 +00:00
|
|
|
|
update_min_max_temperatures(dive, dc->watertemp);
|
2012-11-24 02:51:27 +00:00
|
|
|
|
for (i = 0; i < dc->samples; i++) {
|
|
|
|
|
struct sample *sample = dc->sample + i;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
int time = sample->time.seconds;
|
|
|
|
|
int depth = sample->depth.mm;
|
|
|
|
|
int temp = sample->temperature.mkelvin;
|
2011-11-17 14:03:11 +00:00
|
|
|
|
int pressure = sample->cylinderpressure.mbar;
|
2014-10-05 14:54:19 +00:00
|
|
|
|
int diluent_pressure = sample->diluentpressure.mbar;
|
First step in cleaning up cylinder pressure sensor logic
This clarifies/changes the meaning of our "cylinderindex" entry in our
samples. It has been rather confused, because different dive computers
have done things differently, and the naming really hasn't helped.
There are two totally different - and independent - cylinder "indexes":
- the pressure sensor index, which indicates which cylinder the sensor
data is from.
- the "active cylinder" index, which indicates which cylinder we actually
breathe from.
These two values really are totally independent, and have nothing
what-so-ever to do with each other. The sensor index may well be fixed:
many dive computers only support a single pressure sensor (whether
wireless or wired), and the sensor index is thus always zero.
Other dive computers may support multiple pressure sensors, and the gas
switch event may - or may not - indicate that the sensor changed too. A
dive computer might give the sensor data for *all* cylinders it can read,
regardless of which one is the one we're actively breathing. In fact, some
dive computers might give sensor data for not just *your* cylinder, but
your buddies.
This patch renames "cylinderindex" in the samples as "sensor", making it
quite clear that it's about which sensor index the pressure data in the
sample is about.
The way we figure out which is the currently active gas is with an
explicit has change event. If a computer (like the Uemis Zurich) joins the
two concepts together, then a sensor change should also create a gas
switch event. This patch also changes the Uemis importer to do that.
Finally, it should be noted that the plot info works totally separately
from the sample data, and is about what we actually *display*, not about
the sample pressures etc. In the plot info, the "cylinderindex" does in
fact mean the currently active cylinder, and while it is initially set to
match the sensor information from the samples, we then walk the gas change
events and fix it up - and if the active cylinder differs from the sensor
cylinder, we clear the sensor data.
[Dirk Hohndel: this conflicted with some of my recent changes - I think
I merged things correctly...]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-31 04:00:51 +00:00
|
|
|
|
int index = sample->sensor;
|
2011-11-17 14:03:11 +00:00
|
|
|
|
|
2011-11-19 12:09:14 +00:00
|
|
|
|
if (index == lastindex) {
|
|
|
|
|
/* Remove duplicate redundant pressure information */
|
|
|
|
|
if (pressure == lastpressure)
|
|
|
|
|
sample->cylinderpressure.mbar = 0;
|
2014-10-05 14:54:19 +00:00
|
|
|
|
if (diluent_pressure == lastdiluentpressure)
|
|
|
|
|
sample->diluentpressure.mbar = 0;
|
2011-11-19 12:09:14 +00:00
|
|
|
|
/* check for simply linear data in the samples
|
|
|
|
|
+INT_MAX means uninitialized, -INT_MAX means not linear */
|
|
|
|
|
if (pressure_delta[index] != -INT_MAX && lastpressure) {
|
|
|
|
|
if (pressure_delta[index] == INT_MAX) {
|
|
|
|
|
pressure_delta[index] = abs(pressure - lastpressure);
|
|
|
|
|
} else {
|
|
|
|
|
int cur_delta = abs(pressure - lastpressure);
|
|
|
|
|
if (cur_delta && abs(cur_delta - pressure_delta[index]) > 150) {
|
|
|
|
|
/* ok the samples aren't just a linearisation
|
|
|
|
|
* between start and end */
|
|
|
|
|
pressure_delta[index] = -INT_MAX;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-11-17 14:03:11 +00:00
|
|
|
|
lastindex = index;
|
|
|
|
|
lastpressure = pressure;
|
2014-10-05 14:54:19 +00:00
|
|
|
|
lastdiluentpressure = diluent_pressure;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
2012-11-11 09:36:46 +00:00
|
|
|
|
if (depth > SURFACE_THRESHOLD) {
|
2011-09-03 20:19:26 +00:00
|
|
|
|
if (depth > maxdepth)
|
|
|
|
|
maxdepth = depth;
|
|
|
|
|
}
|
2011-09-05 16:12:54 +00:00
|
|
|
|
|
2011-11-09 15:37:25 +00:00
|
|
|
|
fixup_pressure(dive, sample);
|
2011-09-05 16:12:54 +00:00
|
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
if (temp) {
|
2011-09-04 18:20:27 +00:00
|
|
|
|
/*
|
|
|
|
|
* If we have consecutive identical
|
|
|
|
|
* temperature readings, throw away
|
2011-09-13 03:37:32 +00:00
|
|
|
|
* the redundant ones.
|
2011-09-04 18:20:27 +00:00
|
|
|
|
*/
|
2011-09-13 03:37:32 +00:00
|
|
|
|
if (lasttemp == temp)
|
|
|
|
|
sample->temperature.mkelvin = 0;
|
|
|
|
|
else
|
2011-09-04 18:20:27 +00:00
|
|
|
|
lasttemp = temp;
|
|
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
if (!mintemp || temp < mintemp)
|
|
|
|
|
mintemp = temp;
|
|
|
|
|
}
|
2014-10-11 07:49:48 +00:00
|
|
|
|
|
|
|
|
|
// If there are consecutive identical O2 sensor readings, throw away the redundant ones.
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for (j = 0; j < dc->no_o2sensors; j++) { // for CCR oxygen sensor data:
|
2014-10-11 07:49:48 +00:00
|
|
|
|
o2val = sample->o2sensor[j].mbar;
|
|
|
|
|
if (o2val) {
|
|
|
|
|
if (lasto2val[j] == o2val)
|
|
|
|
|
sample->o2sensor[j].mbar = 0;
|
|
|
|
|
else
|
|
|
|
|
lasto2val[j] = o2val;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-09 04:10:47 +00:00
|
|
|
|
update_min_max_temperatures(dive, sample->temperature);
|
2013-01-24 18:58:59 +00:00
|
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
depthtime += (time - lasttime) * (lastdepth + depth) / 2;
|
|
|
|
|
lastdepth = depth;
|
|
|
|
|
lasttime = time;
|
2012-12-11 05:18:48 +00:00
|
|
|
|
if (sample->cns > dive->maxcns)
|
|
|
|
|
dive->maxcns = sample->cns;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
}
|
2013-02-04 05:21:33 +00:00
|
|
|
|
|
2011-11-19 12:09:14 +00:00
|
|
|
|
/* if all the samples for a cylinder have pressure data that
|
|
|
|
|
* is basically equidistant throw out the sample cylinder pressure
|
|
|
|
|
* information but make sure we still have a valid start and end
|
|
|
|
|
* pressure
|
|
|
|
|
* this happens when DivingLog decides to linearalize the
|
|
|
|
|
* pressure between beginning and end and for strange reasons
|
|
|
|
|
* decides to put that in the sample data as if it came from
|
|
|
|
|
* the dive computer; we don't want that (we'll visualize with
|
|
|
|
|
* constant SAC rate instead)
|
|
|
|
|
* WARNING WARNING - I have only seen this in single tank dives
|
|
|
|
|
* --- maybe I should try to create a multi tank dive and see what
|
|
|
|
|
* --- divinglog does there - but the code right now is only tested
|
|
|
|
|
* --- for the single tank case */
|
|
|
|
|
for (j = 0; j < MAX_CYLINDERS; j++) {
|
|
|
|
|
if (abs(pressure_delta[j]) != INT_MAX) {
|
|
|
|
|
cylinder_t *cyl = dive->cylinder + j;
|
2012-11-24 02:51:27 +00:00
|
|
|
|
for (i = 0; i < dc->samples; i++)
|
First step in cleaning up cylinder pressure sensor logic
This clarifies/changes the meaning of our "cylinderindex" entry in our
samples. It has been rather confused, because different dive computers
have done things differently, and the naming really hasn't helped.
There are two totally different - and independent - cylinder "indexes":
- the pressure sensor index, which indicates which cylinder the sensor
data is from.
- the "active cylinder" index, which indicates which cylinder we actually
breathe from.
These two values really are totally independent, and have nothing
what-so-ever to do with each other. The sensor index may well be fixed:
many dive computers only support a single pressure sensor (whether
wireless or wired), and the sensor index is thus always zero.
Other dive computers may support multiple pressure sensors, and the gas
switch event may - or may not - indicate that the sensor changed too. A
dive computer might give the sensor data for *all* cylinders it can read,
regardless of which one is the one we're actively breathing. In fact, some
dive computers might give sensor data for not just *your* cylinder, but
your buddies.
This patch renames "cylinderindex" in the samples as "sensor", making it
quite clear that it's about which sensor index the pressure data in the
sample is about.
The way we figure out which is the currently active gas is with an
explicit has change event. If a computer (like the Uemis Zurich) joins the
two concepts together, then a sensor change should also create a gas
switch event. This patch also changes the Uemis importer to do that.
Finally, it should be noted that the plot info works totally separately
from the sample data, and is about what we actually *display*, not about
the sample pressures etc. In the plot info, the "cylinderindex" does in
fact mean the currently active cylinder, and while it is initially set to
match the sensor information from the samples, we then walk the gas change
events and fix it up - and if the active cylinder differs from the sensor
cylinder, we clear the sensor data.
[Dirk Hohndel: this conflicted with some of my recent changes - I think
I merged things correctly...]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-31 04:00:51 +00:00
|
|
|
|
if (dc->sample[i].sensor == j)
|
2012-11-24 02:51:27 +00:00
|
|
|
|
dc->sample[i].cylinderpressure.mbar = 0;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
if (!cyl->start.mbar)
|
2011-11-19 12:09:14 +00:00
|
|
|
|
cyl->start.mbar = cyl->sample_start.mbar;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
if (!cyl->end.mbar)
|
2011-11-19 12:09:14 +00:00
|
|
|
|
cyl->end.mbar = cyl->sample_end.mbar;
|
|
|
|
|
cyl->sample_start.mbar = 0;
|
|
|
|
|
cyl->sample_end.mbar = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
2011-09-04 20:06:47 +00:00
|
|
|
|
|
2013-02-09 00:35:39 +00:00
|
|
|
|
update_temperature(&dc->watertemp, mintemp);
|
|
|
|
|
update_depth(&dc->maxdepth, maxdepth);
|
2013-02-09 04:44:04 +00:00
|
|
|
|
if (maxdepth > dive->maxdepth.mm)
|
|
|
|
|
dive->maxdepth.mm = maxdepth;
|
2013-02-09 00:35:39 +00:00
|
|
|
|
fixup_dc_events(dc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
struct dive *fixup_dive(struct dive *dive)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct divecomputer *dc;
|
|
|
|
|
|
|
|
|
|
sanitize_cylinder_info(dive);
|
|
|
|
|
dive->maxcns = dive->cns;
|
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dc (dive, dc)
|
2014-03-03 21:25:55 +00:00
|
|
|
|
fixup_dive_dc(dive, dc);
|
2013-02-17 20:05:08 +00:00
|
|
|
|
|
2013-02-09 00:35:39 +00:00
|
|
|
|
fixup_water_salinity(dive);
|
|
|
|
|
fixup_surface_pressure(dive);
|
2013-02-09 14:50:53 +00:00
|
|
|
|
fixup_meandepth(dive);
|
2013-02-09 15:12:30 +00:00
|
|
|
|
fixup_duration(dive);
|
2013-02-09 15:41:15 +00:00
|
|
|
|
fixup_watertemp(dive);
|
|
|
|
|
fixup_airtemp(dive);
|
2011-10-22 15:12:30 +00:00
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
2011-11-09 15:37:25 +00:00
|
|
|
|
cylinder_t *cyl = dive->cylinder + i;
|
|
|
|
|
add_cylinder_description(&cyl->type);
|
2011-11-10 23:33:38 +00:00
|
|
|
|
if (same_rounded_pressure(cyl->sample_start, cyl->start))
|
2011-11-09 15:37:25 +00:00
|
|
|
|
cyl->start.mbar = 0;
|
2011-11-10 23:33:38 +00:00
|
|
|
|
if (same_rounded_pressure(cyl->sample_end, cyl->end))
|
2011-11-09 15:37:25 +00:00
|
|
|
|
cyl->end.mbar = 0;
|
2011-10-22 15:12:30 +00:00
|
|
|
|
}
|
2012-08-06 21:03:24 +00:00
|
|
|
|
for (i = 0; i < MAX_WEIGHTSYSTEMS; i++) {
|
|
|
|
|
weightsystem_t *ws = dive->weightsystem + i;
|
|
|
|
|
add_weightsystem_description(ws);
|
|
|
|
|
}
|
2014-05-18 21:53:28 +00:00
|
|
|
|
/* we should always have a uniq ID as that gets assigned during alloc_dive(),
|
|
|
|
|
* but we want to make sure... */
|
|
|
|
|
if (!dive->id)
|
|
|
|
|
dive->id = dive_getUniqID(dive);
|
2011-10-22 15:12:30 +00:00
|
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
return dive;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Don't pick a zero for MERGE_MIN() */
|
|
|
|
|
#define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n)
|
2014-02-28 04:09:57 +00:00
|
|
|
|
#define MERGE_MIN(res, a, b, n) res->n = (a->n) ? (b->n) ? MIN(a->n, b->n) : (a->n) : (b->n)
|
2011-09-23 01:01:01 +00:00
|
|
|
|
#define MERGE_TXT(res, a, b, n) res->n = merge_text(a->n, b->n)
|
2011-09-23 03:50:07 +00:00
|
|
|
|
#define MERGE_NONZERO(res, a, b, n) res->n = a->n ? a->n : b->n
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
|
static struct sample *add_sample(struct sample *sample, int time, struct divecomputer *dc)
|
2011-09-03 20:19:26 +00:00
|
|
|
|
{
|
2012-11-24 02:51:27 +00:00
|
|
|
|
struct sample *p = prepare_sample(dc);
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
2012-11-24 02:05:38 +00:00
|
|
|
|
if (p) {
|
|
|
|
|
*p = *sample;
|
|
|
|
|
p->time.seconds = time;
|
2012-11-24 02:51:27 +00:00
|
|
|
|
finish_sample(dc);
|
2012-11-24 02:05:38 +00:00
|
|
|
|
}
|
|
|
|
|
return p;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-11-17 21:20:10 +00:00
|
|
|
|
/*
|
|
|
|
|
* This is like add_sample(), but if the distance from the last sample
|
|
|
|
|
* is excessive, we add two surface samples in between.
|
|
|
|
|
*
|
|
|
|
|
* This is so that if you merge two non-overlapping dives, we make sure
|
|
|
|
|
* that the time in between the dives is at the surface, not some "last
|
|
|
|
|
* sample that happened to be at a depth of 1.2m".
|
|
|
|
|
*/
|
2012-11-24 02:51:27 +00:00
|
|
|
|
static void merge_one_sample(struct sample *sample, int time, struct divecomputer *dc)
|
2012-11-17 21:20:10 +00:00
|
|
|
|
{
|
2014-02-28 04:09:57 +00:00
|
|
|
|
int last = dc->samples - 1;
|
2012-11-17 21:20:10 +00:00
|
|
|
|
if (last >= 0) {
|
|
|
|
|
static struct sample surface;
|
2012-12-07 17:42:47 +00:00
|
|
|
|
struct sample *prev = dc->sample + last;
|
|
|
|
|
int last_time = prev->time.seconds;
|
|
|
|
|
int last_depth = prev->depth.mm;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Only do surface events if the samples are more than
|
|
|
|
|
* a minute apart, and shallower than 5m
|
|
|
|
|
*/
|
|
|
|
|
if (time > last_time + 60 && last_depth < 5000) {
|
2014-02-28 04:09:57 +00:00
|
|
|
|
add_sample(&surface, last_time + 20, dc);
|
2012-11-24 02:51:27 +00:00
|
|
|
|
add_sample(&surface, time - 20, dc);
|
2012-11-17 21:20:10 +00:00
|
|
|
|
}
|
|
|
|
|
}
|
2012-11-24 02:51:27 +00:00
|
|
|
|
add_sample(sample, time, dc);
|
2012-11-17 21:20:10 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
/*
|
|
|
|
|
* Merge samples. Dive 'a' is "offset" seconds before Dive 'b'
|
|
|
|
|
*/
|
2012-11-24 02:51:27 +00:00
|
|
|
|
static void merge_samples(struct divecomputer *res, struct divecomputer *a, struct divecomputer *b, int offset)
|
2011-09-03 20:19:26 +00:00
|
|
|
|
{
|
|
|
|
|
int asamples = a->samples;
|
|
|
|
|
int bsamples = b->samples;
|
|
|
|
|
struct sample *as = a->sample;
|
|
|
|
|
struct sample *bs = b->sample;
|
|
|
|
|
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
/*
|
|
|
|
|
* We want a positive sample offset, so that sample
|
|
|
|
|
* times are always positive. So if the samples for
|
|
|
|
|
* 'b' are before the samples for 'a' (so the offset
|
|
|
|
|
* is negative), we switch a and b around, and use
|
|
|
|
|
* the reverse offset.
|
|
|
|
|
*/
|
|
|
|
|
if (offset < 0) {
|
|
|
|
|
offset = -offset;
|
|
|
|
|
asamples = bsamples;
|
|
|
|
|
bsamples = a->samples;
|
|
|
|
|
as = bs;
|
|
|
|
|
bs = a->sample;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
for (;;) {
|
|
|
|
|
int at, bt;
|
|
|
|
|
struct sample sample;
|
|
|
|
|
|
|
|
|
|
if (!res)
|
2012-11-24 02:51:27 +00:00
|
|
|
|
return;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
|
|
|
|
at = asamples ? as->time.seconds : -1;
|
|
|
|
|
bt = bsamples ? bs->time.seconds + offset : -1;
|
|
|
|
|
|
|
|
|
|
/* No samples? All done! */
|
|
|
|
|
if (at < 0 && bt < 0)
|
2012-11-24 02:51:27 +00:00
|
|
|
|
return;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
|
|
|
|
/* Only samples from a? */
|
|
|
|
|
if (bt < 0) {
|
2014-02-28 04:09:57 +00:00
|
|
|
|
add_sample_a:
|
2012-11-24 02:05:38 +00:00
|
|
|
|
merge_one_sample(as, at, res);
|
2011-09-03 20:19:26 +00:00
|
|
|
|
as++;
|
|
|
|
|
asamples--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Only samples from b? */
|
|
|
|
|
if (at < 0) {
|
2014-02-28 04:09:57 +00:00
|
|
|
|
add_sample_b:
|
2012-11-24 02:05:38 +00:00
|
|
|
|
merge_one_sample(bs, bt, res);
|
2011-09-03 20:19:26 +00:00
|
|
|
|
bs++;
|
|
|
|
|
bsamples--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (at < bt)
|
|
|
|
|
goto add_sample_a;
|
|
|
|
|
if (at > bt)
|
|
|
|
|
goto add_sample_b;
|
|
|
|
|
|
|
|
|
|
/* same-time sample: add a merged sample. Take the non-zero ones */
|
|
|
|
|
sample = *bs;
|
|
|
|
|
if (as->depth.mm)
|
|
|
|
|
sample.depth = as->depth;
|
|
|
|
|
if (as->temperature.mkelvin)
|
|
|
|
|
sample.temperature = as->temperature;
|
2011-09-04 03:31:18 +00:00
|
|
|
|
if (as->cylinderpressure.mbar)
|
|
|
|
|
sample.cylinderpressure = as->cylinderpressure;
|
First step in cleaning up cylinder pressure sensor logic
This clarifies/changes the meaning of our "cylinderindex" entry in our
samples. It has been rather confused, because different dive computers
have done things differently, and the naming really hasn't helped.
There are two totally different - and independent - cylinder "indexes":
- the pressure sensor index, which indicates which cylinder the sensor
data is from.
- the "active cylinder" index, which indicates which cylinder we actually
breathe from.
These two values really are totally independent, and have nothing
what-so-ever to do with each other. The sensor index may well be fixed:
many dive computers only support a single pressure sensor (whether
wireless or wired), and the sensor index is thus always zero.
Other dive computers may support multiple pressure sensors, and the gas
switch event may - or may not - indicate that the sensor changed too. A
dive computer might give the sensor data for *all* cylinders it can read,
regardless of which one is the one we're actively breathing. In fact, some
dive computers might give sensor data for not just *your* cylinder, but
your buddies.
This patch renames "cylinderindex" in the samples as "sensor", making it
quite clear that it's about which sensor index the pressure data in the
sample is about.
The way we figure out which is the currently active gas is with an
explicit has change event. If a computer (like the Uemis Zurich) joins the
two concepts together, then a sensor change should also create a gas
switch event. This patch also changes the Uemis importer to do that.
Finally, it should be noted that the plot info works totally separately
from the sample data, and is about what we actually *display*, not about
the sample pressures etc. In the plot info, the "cylinderindex" does in
fact mean the currently active cylinder, and while it is initially set to
match the sensor information from the samples, we then walk the gas change
events and fix it up - and if the active cylinder differs from the sensor
cylinder, we clear the sensor data.
[Dirk Hohndel: this conflicted with some of my recent changes - I think
I merged things correctly...]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-31 04:00:51 +00:00
|
|
|
|
if (as->sensor)
|
|
|
|
|
sample.sensor = as->sensor;
|
2012-12-08 04:08:29 +00:00
|
|
|
|
if (as->cns)
|
|
|
|
|
sample.cns = as->cns;
|
2014-10-19 14:07:07 +00:00
|
|
|
|
if (as->setpoint.mbar)
|
|
|
|
|
sample.setpoint = as->setpoint;
|
2012-12-11 20:30:34 +00:00
|
|
|
|
if (as->ndl.seconds)
|
|
|
|
|
sample.ndl = as->ndl;
|
|
|
|
|
if (as->stoptime.seconds)
|
|
|
|
|
sample.stoptime = as->stoptime;
|
|
|
|
|
if (as->stopdepth.mm)
|
|
|
|
|
sample.stopdepth = as->stopdepth;
|
2012-12-31 02:11:01 +00:00
|
|
|
|
if (as->in_deco)
|
2014-01-15 18:54:41 +00:00
|
|
|
|
sample.in_deco = true;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
2012-11-24 02:05:38 +00:00
|
|
|
|
merge_one_sample(&sample, at, res);
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
|
|
|
|
as++;
|
|
|
|
|
bs++;
|
|
|
|
|
asamples--;
|
|
|
|
|
bsamples--;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *merge_text(const char *a, const char *b)
|
|
|
|
|
{
|
|
|
|
|
char *res;
|
Small changes in the memory management when dive-merging
This patch makes a couple of modifications:
1) divelist.c:delete_single_dive() now tries to free all memory associated
with a dive, such as the string values for divemaster, location, notes &
etc.
2) dive.c:merge_text(), now always makes a copy in memory for the returned
string - either combined or one of the two which are passed
to the function.
The reason for the above two changes is that when (say) importing the same
data over and over, technically a merge will occur for the contained dives,
but mapped pointers can go out of scope.
main.c:report_dives() calls try_to_merge() and if succeeds the two dives
that were merged are deleted from the table. when we delete a dive,
we now make sure all string data is cleared with it, but also in the actual merge
itself, which precedes, copies of the merged texts are made (with merge_text()),
so that the new, resulted dive has his own text allocations.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-24 01:53:25 +00:00
|
|
|
|
if (!a && !b)
|
|
|
|
|
return NULL;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
if (!a || !*a)
|
2014-07-03 04:05:22 +00:00
|
|
|
|
return copy_string(b);
|
2011-09-03 20:19:26 +00:00
|
|
|
|
if (!b || !*b)
|
Small changes in the memory management when dive-merging
This patch makes a couple of modifications:
1) divelist.c:delete_single_dive() now tries to free all memory associated
with a dive, such as the string values for divemaster, location, notes &
etc.
2) dive.c:merge_text(), now always makes a copy in memory for the returned
string - either combined or one of the two which are passed
to the function.
The reason for the above two changes is that when (say) importing the same
data over and over, technically a merge will occur for the contained dives,
but mapped pointers can go out of scope.
main.c:report_dives() calls try_to_merge() and if succeeds the two dives
that were merged are deleted from the table. when we delete a dive,
we now make sure all string data is cleared with it, but also in the actual merge
itself, which precedes, copies of the merged texts are made (with merge_text()),
so that the new, resulted dive has his own text allocations.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-24 01:53:25 +00:00
|
|
|
|
return strdup(a);
|
2014-02-28 04:09:57 +00:00
|
|
|
|
if (!strcmp(a, b))
|
2014-07-03 04:05:22 +00:00
|
|
|
|
return copy_string(a);
|
2012-12-28 13:43:04 +00:00
|
|
|
|
res = malloc(strlen(a) + strlen(b) + 32);
|
2011-09-03 20:19:26 +00:00
|
|
|
|
if (!res)
|
|
|
|
|
return (char *)a;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
sprintf(res, translate("gettextFromC", "(%s) or (%s)"), a, b);
|
2011-09-03 20:19:26 +00:00
|
|
|
|
return res;
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
#define SORT(a, b, field) \
|
|
|
|
|
if (a->field != b->field) \
|
2014-03-05 20:19:45 +00:00
|
|
|
|
return a->field < b->field ? -1 : 1
|
2011-09-23 03:28:04 +00:00
|
|
|
|
|
|
|
|
|
static int sort_event(struct event *a, struct event *b)
|
|
|
|
|
{
|
2014-02-28 04:09:57 +00:00
|
|
|
|
SORT(a, b, time.seconds);
|
|
|
|
|
SORT(a, b, type);
|
|
|
|
|
SORT(a, b, flags);
|
|
|
|
|
SORT(a, b, value);
|
2011-09-23 03:28:04 +00:00
|
|
|
|
return strcmp(a->name, b->name);
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
|
static void merge_events(struct divecomputer *res, struct divecomputer *src1, struct divecomputer *src2, int offset)
|
2011-09-23 03:28:04 +00:00
|
|
|
|
{
|
|
|
|
|
struct event *a, *b;
|
|
|
|
|
struct event **p = &res->events;
|
|
|
|
|
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
/* Always use positive offsets */
|
|
|
|
|
if (offset < 0) {
|
2012-11-24 02:51:27 +00:00
|
|
|
|
struct divecomputer *tmp;
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
|
|
|
|
|
offset = -offset;
|
|
|
|
|
tmp = src1;
|
|
|
|
|
src1 = src2;
|
|
|
|
|
src2 = tmp;
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-23 03:28:04 +00:00
|
|
|
|
a = src1->events;
|
|
|
|
|
b = src2->events;
|
|
|
|
|
while (b) {
|
|
|
|
|
b->time.seconds += offset;
|
|
|
|
|
b = b->next;
|
|
|
|
|
}
|
|
|
|
|
b = src2->events;
|
|
|
|
|
|
|
|
|
|
while (a || b) {
|
|
|
|
|
int s;
|
|
|
|
|
if (!b) {
|
|
|
|
|
*p = a;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (!a) {
|
|
|
|
|
*p = b;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
s = sort_event(a, b);
|
|
|
|
|
/* Pick b */
|
|
|
|
|
if (s > 0) {
|
|
|
|
|
*p = b;
|
|
|
|
|
p = &b->next;
|
|
|
|
|
b = b->next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
/* Pick 'a' or neither */
|
|
|
|
|
if (s < 0) {
|
|
|
|
|
*p = a;
|
|
|
|
|
p = &a->next;
|
|
|
|
|
}
|
|
|
|
|
a = a->next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-04 03:31:18 +00:00
|
|
|
|
/* Pick whichever has any info (if either). Prefer 'a' */
|
2013-03-28 02:04:46 +00:00
|
|
|
|
static void merge_cylinder_type(cylinder_type_t *src, cylinder_type_t *dst)
|
2011-09-04 03:31:18 +00:00
|
|
|
|
{
|
2013-03-28 02:04:46 +00:00
|
|
|
|
if (!dst->size.mliter)
|
|
|
|
|
dst->size.mliter = src->size.mliter;
|
|
|
|
|
if (!dst->workingpressure.mbar)
|
|
|
|
|
dst->workingpressure.mbar = src->workingpressure.mbar;
|
|
|
|
|
if (!dst->description) {
|
|
|
|
|
dst->description = src->description;
|
|
|
|
|
src->description = NULL;
|
2012-12-24 01:53:28 +00:00
|
|
|
|
}
|
2011-09-04 03:31:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-03-28 02:04:46 +00:00
|
|
|
|
static void merge_cylinder_mix(struct gasmix *src, struct gasmix *dst)
|
2011-09-04 03:31:18 +00:00
|
|
|
|
{
|
2013-03-28 02:04:46 +00:00
|
|
|
|
if (!dst->o2.permille)
|
|
|
|
|
*dst = *src;
|
2011-09-04 03:31:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-03-28 02:04:46 +00:00
|
|
|
|
static void merge_cylinder_info(cylinder_t *src, cylinder_t *dst)
|
2011-09-04 03:31:18 +00:00
|
|
|
|
{
|
2013-03-28 02:04:46 +00:00
|
|
|
|
merge_cylinder_type(&src->type, &dst->type);
|
|
|
|
|
merge_cylinder_mix(&src->gasmix, &dst->gasmix);
|
|
|
|
|
MERGE_MAX(dst, dst, src, start.mbar);
|
|
|
|
|
MERGE_MIN(dst, dst, src, end.mbar);
|
2011-09-04 03:31:18 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-10-29 18:27:14 +00:00
|
|
|
|
static void merge_weightsystem_info(weightsystem_t *res, weightsystem_t *a, weightsystem_t *b)
|
|
|
|
|
{
|
|
|
|
|
if (!a->weight.grams)
|
|
|
|
|
a = b;
|
|
|
|
|
*res = *a;
|
|
|
|
|
}
|
|
|
|
|
|
2014-05-25 16:01:16 +00:00
|
|
|
|
int gasmix_distance(const struct gasmix *a, const struct gasmix *b)
|
2013-03-28 02:04:46 +00:00
|
|
|
|
{
|
2013-03-28 17:06:43 +00:00
|
|
|
|
int a_o2 = get_o2(a), b_o2 = get_o2(b);
|
|
|
|
|
int a_he = get_he(a), b_he = get_he(b);
|
2013-03-28 02:04:46 +00:00
|
|
|
|
int delta_o2 = a_o2 - b_o2, delta_he = a_he - b_he;
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
delta_he = delta_he * delta_he;
|
|
|
|
|
delta_o2 = delta_o2 * delta_o2;
|
2013-03-28 02:04:46 +00:00
|
|
|
|
return delta_he + delta_o2;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-12 18:46:41 +00:00
|
|
|
|
/* fill_pressures(): Compute partial gas pressures in bar from gasmix and ambient pressures, possibly for OC or CCR, to be
|
2014-10-13 19:19:21 +00:00
|
|
|
|
* extended to PSCT. This function does the calculations of gass pressures applicable to a single point on the dive profile.
|
|
|
|
|
* The structure "pressures" is used to return calculated gas pressures to the calling software.
|
2014-10-12 18:46:41 +00:00
|
|
|
|
* Call parameters: po2 = po2 value applicable to the record in calling function
|
|
|
|
|
* amb_pressure = ambient pressure applicable to the record in calling function
|
|
|
|
|
* *pressures = structure for communicating o2 sensor values from and gas pressures to the calling function.
|
|
|
|
|
* *mix = structure containing cylinder gas mixture information.
|
|
|
|
|
* This function called by: calculate_gas_information_new() in profile.c; add_segment() in deco.c.
|
|
|
|
|
*/
|
2014-10-13 19:19:21 +00:00
|
|
|
|
extern void fill_pressures(struct gas_pressures *pressures, const double amb_pressure, const struct gasmix *mix, double po2)
|
|
|
|
|
{
|
|
|
|
|
if (po2) { // This is probably a CCR dive where pressures->o2 is defined
|
2014-10-14 08:46:40 +00:00
|
|
|
|
if (po2 >= amb_pressure || get_o2(mix) == 1000) {
|
2014-10-13 19:19:21 +00:00
|
|
|
|
pressures->o2 = amb_pressure;
|
2014-10-14 08:46:40 +00:00
|
|
|
|
pressures->n2 = pressures->he = 0.0;
|
|
|
|
|
} else {
|
2014-10-12 18:46:41 +00:00
|
|
|
|
pressures->o2 = po2;
|
2014-10-14 08:46:40 +00:00
|
|
|
|
pressures->he = (amb_pressure - pressures->o2) * (double)get_he(mix) / (1000 - get_o2(mix));
|
|
|
|
|
pressures->n2 = amb_pressure - pressures->o2 - pressures->he;
|
|
|
|
|
}
|
2014-10-13 19:19:21 +00:00
|
|
|
|
} else {
|
|
|
|
|
// Open circuit dives: no gas pressure values available, they need to be calculated
|
|
|
|
|
pressures->o2 = get_o2(mix) / 1000.0 * amb_pressure; // These calculations are also used if the CCR calculation above..
|
|
|
|
|
pressures->he = get_he(mix) / 1000.0 * amb_pressure; // ..returned a po2 of zero (i.e. o2 sensor data not resolvable)
|
2014-09-15 12:55:20 +00:00
|
|
|
|
pressures->n2 = (1000 - get_o2(mix) - get_he(mix)) / 1000.0 * amb_pressure;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2013-03-28 02:04:46 +00:00
|
|
|
|
static int find_cylinder_match(cylinder_t *cyl, cylinder_t array[], unsigned int used)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
int best = -1, score = INT_MAX;
|
|
|
|
|
|
|
|
|
|
if (cylinder_nodata(cyl))
|
|
|
|
|
return -1;
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
|
|
|
|
const cylinder_t *match;
|
|
|
|
|
int distance;
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
if (used & (1 << i))
|
2013-03-28 02:04:46 +00:00
|
|
|
|
continue;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
match = array + i;
|
2013-03-28 02:04:46 +00:00
|
|
|
|
distance = gasmix_distance(&cyl->gasmix, &match->gasmix);
|
|
|
|
|
if (distance >= score)
|
|
|
|
|
continue;
|
|
|
|
|
best = i;
|
|
|
|
|
score = distance;
|
|
|
|
|
}
|
|
|
|
|
return best;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Force an initial gaschange event to the (old) gas #0 */
|
|
|
|
|
static void add_initial_gaschange(struct dive *dive, struct divecomputer *dc)
|
|
|
|
|
{
|
|
|
|
|
struct event *ev = get_next_event(dc->events, "gaschange");
|
|
|
|
|
|
|
|
|
|
if (ev && ev->time.seconds < 30)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
/* Old starting gas mix */
|
2013-11-20 19:24:36 +00:00
|
|
|
|
add_gas_switch_event(dive, dc, 0, 0);
|
2013-03-28 02:04:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void dc_cylinder_renumber(struct dive *dive, struct divecomputer *dc, int mapping[])
|
|
|
|
|
{
|
|
|
|
|
int i;
|
2014-08-17 18:26:21 +00:00
|
|
|
|
struct event *ev;
|
2013-03-28 02:04:46 +00:00
|
|
|
|
|
|
|
|
|
/* Did the first gas get remapped? Add gas switch event */
|
|
|
|
|
if (mapping[0] > 0)
|
|
|
|
|
add_initial_gaschange(dive, dc);
|
|
|
|
|
|
|
|
|
|
/* Remap the sensor indexes */
|
|
|
|
|
for (i = 0; i < dc->samples; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
|
struct sample *s = dc->sample + i;
|
2013-03-28 02:04:46 +00:00
|
|
|
|
int sensor;
|
|
|
|
|
|
|
|
|
|
if (!s->cylinderpressure.mbar)
|
|
|
|
|
continue;
|
|
|
|
|
sensor = mapping[s->sensor];
|
|
|
|
|
if (sensor >= 0)
|
|
|
|
|
s->sensor = sensor;
|
|
|
|
|
}
|
2014-08-17 18:26:21 +00:00
|
|
|
|
|
|
|
|
|
/* Remap the gas change indexes */
|
|
|
|
|
for (ev = dc->events; ev; ev = ev->next) {
|
|
|
|
|
if (!event_is_gaschange(ev))
|
|
|
|
|
continue;
|
|
|
|
|
if (ev->gas.index < 0)
|
|
|
|
|
continue;
|
|
|
|
|
ev->gas.index = mapping[ev->gas.index];
|
|
|
|
|
}
|
2013-03-28 02:04:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If the cylinder indexes change (due to merging dives or deleting
|
|
|
|
|
* cylinders in the middle), we need to change the indexes in the
|
|
|
|
|
* dive computer data for this dive.
|
|
|
|
|
*
|
|
|
|
|
* Also note that we assume that the initial cylinder is cylinder 0,
|
|
|
|
|
* so if that got renamed, we need to create a fake gas change event
|
|
|
|
|
*/
|
|
|
|
|
static void cylinder_renumber(struct dive *dive, int mapping[])
|
|
|
|
|
{
|
|
|
|
|
struct divecomputer *dc;
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dc (dive, dc)
|
2013-03-28 02:04:46 +00:00
|
|
|
|
dc_cylinder_renumber(dive, dc, mapping);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Merging cylinder information is non-trivial, because the two dive computers
|
|
|
|
|
* may have different ideas of what the different cylinder indexing is.
|
|
|
|
|
*
|
|
|
|
|
* Logic: take all the cylinder information from the preferred dive ('a'), and
|
|
|
|
|
* then try to match each of the cylinders in the other dive by the gasmix that
|
|
|
|
|
* is the best match and hasn't been used yet.
|
|
|
|
|
*/
|
|
|
|
|
static void merge_cylinders(struct dive *res, struct dive *a, struct dive *b)
|
|
|
|
|
{
|
|
|
|
|
int i, renumber = 0;
|
|
|
|
|
int mapping[MAX_CYLINDERS];
|
|
|
|
|
unsigned int used = 0;
|
|
|
|
|
|
|
|
|
|
/* Copy the cylinder info raw from 'a' */
|
|
|
|
|
memcpy(res->cylinder, a->cylinder, sizeof(res->cylinder));
|
|
|
|
|
memset(a->cylinder, 0, sizeof(a->cylinder));
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
|
|
|
|
int j;
|
|
|
|
|
cylinder_t *cyl = b->cylinder + i;
|
|
|
|
|
|
|
|
|
|
j = find_cylinder_match(cyl, res->cylinder, used);
|
|
|
|
|
mapping[i] = j;
|
|
|
|
|
if (j < 0)
|
|
|
|
|
continue;
|
|
|
|
|
used |= 1 << j;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
merge_cylinder_info(cyl, res->cylinder + j);
|
2013-03-28 02:04:46 +00:00
|
|
|
|
|
|
|
|
|
/* If that renumbered the cylinders, fix it up! */
|
|
|
|
|
if (i != j)
|
|
|
|
|
renumber = 1;
|
|
|
|
|
}
|
|
|
|
|
if (renumber)
|
|
|
|
|
cylinder_renumber(b, mapping);
|
|
|
|
|
}
|
|
|
|
|
|
2012-10-29 18:27:14 +00:00
|
|
|
|
static void merge_equipment(struct dive *res, struct dive *a, struct dive *b)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2013-03-28 02:04:46 +00:00
|
|
|
|
merge_cylinders(res, a, b);
|
2012-10-29 18:27:14 +00:00
|
|
|
|
for (i = 0; i < MAX_WEIGHTSYSTEMS; i++)
|
2014-02-28 04:09:57 +00:00
|
|
|
|
merge_weightsystem_info(res->weightsystem + i, a->weightsystem + i, b->weightsystem + i);
|
2012-10-29 18:27:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-02-14 17:44:18 +00:00
|
|
|
|
static void merge_airtemps(struct dive *res, struct dive *a, struct dive *b)
|
|
|
|
|
{
|
|
|
|
|
un_fixup_airtemp(a);
|
|
|
|
|
un_fixup_airtemp(b);
|
|
|
|
|
MERGE_NONZERO(res, a, b, airtemp.mkelvin);
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-09 18:46:39 +00:00
|
|
|
|
/*
|
|
|
|
|
* When merging two dives, this picks the trip from one, and removes it
|
|
|
|
|
* from the other.
|
|
|
|
|
*
|
|
|
|
|
* The 'next' dive is not involved in the dive merging, but is the dive
|
|
|
|
|
* that will be the next dive after the merged dive.
|
|
|
|
|
*/
|
2012-11-11 06:49:19 +00:00
|
|
|
|
static void pick_trip(struct dive *res, struct dive *pick)
|
2012-11-09 18:46:39 +00:00
|
|
|
|
{
|
|
|
|
|
tripflag_t tripflag = pick->tripflag;
|
|
|
|
|
dive_trip_t *trip = pick->divetrip;
|
|
|
|
|
|
|
|
|
|
res->tripflag = tripflag;
|
2012-11-10 18:51:03 +00:00
|
|
|
|
add_dive_to_trip(res, trip);
|
2012-11-09 18:46:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Pick a trip for a dive
|
|
|
|
|
*/
|
2012-11-11 06:20:05 +00:00
|
|
|
|
static void merge_trip(struct dive *res, struct dive *a, struct dive *b)
|
2012-11-09 18:46:39 +00:00
|
|
|
|
{
|
2012-11-26 00:51:55 +00:00
|
|
|
|
dive_trip_t *atrip, *btrip;
|
|
|
|
|
|
2012-11-09 18:46:39 +00:00
|
|
|
|
/*
|
|
|
|
|
* The larger tripflag is more relevant: we prefer
|
|
|
|
|
* take manually assigned trips over auto-generated
|
|
|
|
|
* ones.
|
|
|
|
|
*/
|
|
|
|
|
if (a->tripflag > b->tripflag)
|
|
|
|
|
goto pick_a;
|
|
|
|
|
|
|
|
|
|
if (a->tripflag < b->tripflag)
|
|
|
|
|
goto pick_b;
|
|
|
|
|
|
2012-11-26 00:51:55 +00:00
|
|
|
|
/* Otherwise, look at the trip data and pick the "better" one */
|
|
|
|
|
atrip = a->divetrip;
|
|
|
|
|
btrip = b->divetrip;
|
|
|
|
|
if (!atrip)
|
|
|
|
|
goto pick_b;
|
|
|
|
|
if (!btrip)
|
|
|
|
|
goto pick_a;
|
|
|
|
|
if (!atrip->location)
|
2012-11-09 18:46:39 +00:00
|
|
|
|
goto pick_b;
|
2012-11-26 00:51:55 +00:00
|
|
|
|
if (!btrip->location)
|
2012-11-09 18:46:39 +00:00
|
|
|
|
goto pick_a;
|
2012-11-26 00:51:55 +00:00
|
|
|
|
if (!atrip->notes)
|
2012-11-09 18:46:39 +00:00
|
|
|
|
goto pick_b;
|
2012-11-26 00:51:55 +00:00
|
|
|
|
if (!btrip->notes)
|
2012-11-09 18:46:39 +00:00
|
|
|
|
goto pick_a;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Ok, so both have location and notes.
|
|
|
|
|
* Pick the earlier one.
|
|
|
|
|
*/
|
|
|
|
|
if (a->when < b->when)
|
|
|
|
|
goto pick_a;
|
|
|
|
|
goto pick_b;
|
|
|
|
|
|
|
|
|
|
pick_a:
|
2012-11-11 06:49:19 +00:00
|
|
|
|
b = a;
|
2012-11-09 18:46:39 +00:00
|
|
|
|
pick_b:
|
2012-11-11 06:49:19 +00:00
|
|
|
|
pick_trip(res, b);
|
2012-11-09 18:46:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-11-25 23:10:03 +00:00
|
|
|
|
#if CURRENTLY_NOT_USED
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
/*
|
|
|
|
|
* Sample 's' is between samples 'a' and 'b'. It is 'offset' seconds before 'b'.
|
|
|
|
|
*
|
|
|
|
|
* If 's' and 'a' are at the same time, offset is 0, and b is NULL.
|
|
|
|
|
*/
|
|
|
|
|
static int compare_sample(struct sample *s, struct sample *a, struct sample *b, int offset)
|
|
|
|
|
{
|
|
|
|
|
unsigned int depth = a->depth.mm;
|
|
|
|
|
int diff;
|
|
|
|
|
|
|
|
|
|
if (offset) {
|
|
|
|
|
unsigned int interval = b->time.seconds - a->time.seconds;
|
|
|
|
|
unsigned int depth_a = a->depth.mm;
|
|
|
|
|
unsigned int depth_b = b->depth.mm;
|
|
|
|
|
|
|
|
|
|
if (offset > interval)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
/* pick the average depth, scaled by the offset from 'b' */
|
|
|
|
|
depth = (depth_a * offset) + (depth_b * (interval - offset));
|
|
|
|
|
depth /= interval;
|
|
|
|
|
}
|
|
|
|
|
diff = s->depth.mm - depth;
|
|
|
|
|
if (diff < 0)
|
|
|
|
|
diff = -diff;
|
|
|
|
|
/* cut off at one meter difference */
|
|
|
|
|
if (diff > 1000)
|
|
|
|
|
diff = 1000;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
return diff * diff;
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Calculate a "difference" in samples between the two dives, given
|
|
|
|
|
* the offset in seconds between them. Use this to find the best
|
|
|
|
|
* match of samples between two different dive computers.
|
|
|
|
|
*/
|
2012-11-24 02:51:27 +00:00
|
|
|
|
static unsigned long sample_difference(struct divecomputer *a, struct divecomputer *b, int offset)
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
{
|
|
|
|
|
int asamples = a->samples;
|
|
|
|
|
int bsamples = b->samples;
|
|
|
|
|
struct sample *as = a->sample;
|
|
|
|
|
struct sample *bs = b->sample;
|
|
|
|
|
unsigned long error = 0;
|
|
|
|
|
int start = -1;
|
|
|
|
|
|
|
|
|
|
if (!asamples || !bsamples)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* skip the first sample - this way we know can always look at
|
|
|
|
|
* as/bs[-1] to look at the samples around it in the loop.
|
|
|
|
|
*/
|
2014-02-28 04:09:57 +00:00
|
|
|
|
as++;
|
|
|
|
|
bs++;
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
asamples--;
|
|
|
|
|
bsamples--;
|
|
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
|
int at, bt, diff;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* If we run out of samples, punt */
|
|
|
|
|
if (!asamples)
|
|
|
|
|
return INT_MAX;
|
|
|
|
|
if (!bsamples)
|
|
|
|
|
return INT_MAX;
|
|
|
|
|
|
|
|
|
|
at = as->time.seconds;
|
|
|
|
|
bt = bs->time.seconds + offset;
|
|
|
|
|
|
|
|
|
|
/* b hasn't started yet? Ignore it */
|
|
|
|
|
if (bt < 0) {
|
|
|
|
|
bs++;
|
|
|
|
|
bsamples--;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (at < bt) {
|
2014-02-28 04:09:57 +00:00
|
|
|
|
diff = compare_sample(as, bs - 1, bs, bt - at);
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
as++;
|
|
|
|
|
asamples--;
|
|
|
|
|
} else if (at > bt) {
|
2014-02-28 04:09:57 +00:00
|
|
|
|
diff = compare_sample(bs, as - 1, as, at - bt);
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
bs++;
|
|
|
|
|
bsamples--;
|
|
|
|
|
} else {
|
|
|
|
|
diff = compare_sample(as, bs, NULL, 0);
|
2014-02-28 04:09:57 +00:00
|
|
|
|
as++;
|
|
|
|
|
bs++;
|
|
|
|
|
asamples--;
|
|
|
|
|
bsamples--;
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Invalid comparison point? */
|
|
|
|
|
if (diff < 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (start < 0)
|
|
|
|
|
start = at;
|
|
|
|
|
|
|
|
|
|
error += diff;
|
|
|
|
|
|
|
|
|
|
if (at - start > 120)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Dive 'a' is 'offset' seconds before dive 'b'
|
|
|
|
|
*
|
|
|
|
|
* This is *not* because the dive computers clocks aren't in sync,
|
|
|
|
|
* it is because the dive computers may "start" the dive at different
|
|
|
|
|
* points in the dive, so the sample at time X in dive 'a' is the
|
|
|
|
|
* same as the sample at time X+offset in dive 'b'.
|
|
|
|
|
*
|
|
|
|
|
* For example, some dive computers take longer to "wake up" when
|
|
|
|
|
* they sense that you are under water (ie Uemis Zurich if it was off
|
|
|
|
|
* when the dive started). And other dive computers have different
|
|
|
|
|
* depths that they activate at, etc etc.
|
|
|
|
|
*
|
|
|
|
|
* If we cannot find a shared offset, don't try to merge.
|
|
|
|
|
*/
|
2012-11-24 02:51:27 +00:00
|
|
|
|
static int find_sample_offset(struct divecomputer *a, struct divecomputer *b)
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
{
|
|
|
|
|
int offset, best;
|
|
|
|
|
unsigned long max;
|
|
|
|
|
|
|
|
|
|
/* No samples? Merge at any time (0 offset) */
|
|
|
|
|
if (!a->samples)
|
|
|
|
|
return 0;
|
|
|
|
|
if (!b->samples)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Common special-case: merging a dive that came from
|
|
|
|
|
* the same dive computer, so the samples are identical.
|
|
|
|
|
* Check this first, without wasting time trying to find
|
|
|
|
|
* some minimal offset case.
|
|
|
|
|
*/
|
|
|
|
|
best = 0;
|
|
|
|
|
max = sample_difference(a, b, 0);
|
|
|
|
|
if (!max)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Otherwise, look if we can find anything better within
|
|
|
|
|
* a thirty second window..
|
|
|
|
|
*/
|
|
|
|
|
for (offset = -30; offset <= 30; offset++) {
|
|
|
|
|
unsigned long diff;
|
|
|
|
|
|
|
|
|
|
diff = sample_difference(a, b, offset);
|
|
|
|
|
if (diff > max)
|
|
|
|
|
continue;
|
|
|
|
|
best = offset;
|
|
|
|
|
max = diff;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return best;
|
|
|
|
|
}
|
2012-11-25 23:10:03 +00:00
|
|
|
|
#endif
|
Try to find optimal dive sample merge offset
When we merge dives where the samples have come from different dive
computers, the samples may be offset from each other due to the dive
computers not having decided that the dive starts at quite the same
time.
For example, some dive computers may take a while to wake up when
submerged, or there may be differences in exactly when the dive
computer decides that a dive has started. Different computers tend to
have different depths that they consider the start of a real dive.
So when we merge two dives, look for differences in the sample data,
and search for the sample time offset that minimizes the differences
(logic: minimize the sum-of-square of the depth differences over a
two-minute window at the start of the dive).
This still doesn't really result in perfect merges, since different
computers will give slightly different values anyway, but it improves
the dive merging noticeably. To the point that this seems to have
found a bug in our Uemis data import (it looks like the Uemis importer
does an incorrect saltwater pressure conversion, and the data is
actually in centimeter, not in pressure).
So there is room for improvement, but this is at least a reasonable
approximation and starting point.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-10 11:23:13 +00:00
|
|
|
|
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
/*
|
|
|
|
|
* Are a and b "similar" values, when given a reasonable lower end expected
|
|
|
|
|
* difference?
|
|
|
|
|
*
|
|
|
|
|
* So for example, we'd expect different dive computers to give different
|
|
|
|
|
* max depth readings. You might have them on different arms, and they
|
|
|
|
|
* have different pressure sensors and possibly different ideas about
|
|
|
|
|
* water salinity etc.
|
|
|
|
|
*
|
|
|
|
|
* So have an expected minimum difference, but also allow a larger relative
|
|
|
|
|
* error value.
|
|
|
|
|
*/
|
|
|
|
|
static int similar(unsigned long a, unsigned long b, unsigned long expected)
|
|
|
|
|
{
|
|
|
|
|
if (a && b) {
|
|
|
|
|
unsigned long min, max, diff;
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
min = a;
|
|
|
|
|
max = b;
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
if (a > b) {
|
|
|
|
|
min = b;
|
|
|
|
|
max = a;
|
|
|
|
|
}
|
|
|
|
|
diff = max - min;
|
|
|
|
|
|
|
|
|
|
/* Smaller than expected difference? */
|
|
|
|
|
if (diff < expected)
|
|
|
|
|
return 1;
|
|
|
|
|
/* Error less than 10% or the maximum */
|
2014-02-28 04:09:57 +00:00
|
|
|
|
if (diff * 10 < max)
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2012-12-16 18:55:58 +00:00
|
|
|
|
/*
|
|
|
|
|
* Match two dive computer entries against each other, and
|
|
|
|
|
* tell if it's the same dive. Return 0 if "don't know",
|
|
|
|
|
* positive for "same dive" and negative for "definitely
|
|
|
|
|
* not the same dive"
|
|
|
|
|
*/
|
|
|
|
|
int match_one_dc(struct divecomputer *a, struct divecomputer *b)
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
{
|
2012-12-16 18:55:58 +00:00
|
|
|
|
/* Not same model? Don't know if matching.. */
|
|
|
|
|
if (!a->model || !b->model)
|
|
|
|
|
return 0;
|
|
|
|
|
if (strcasecmp(a->model, b->model))
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
return 0;
|
2012-12-16 18:55:58 +00:00
|
|
|
|
|
|
|
|
|
/* Different device ID's? Don't know */
|
|
|
|
|
if (a->deviceid != b->deviceid)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* Do we have dive IDs? */
|
|
|
|
|
if (!a->diveid || !b->diveid)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* If they have different dive ID's on the same
|
|
|
|
|
* dive computer, that's a definite "same or not"
|
|
|
|
|
*/
|
|
|
|
|
return a->diveid == b->diveid ? 1 : -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Match every dive computer against each other to see if
|
|
|
|
|
* we have a matching dive.
|
|
|
|
|
*
|
|
|
|
|
* Return values:
|
|
|
|
|
* -1 for "is definitely *NOT* the same dive"
|
|
|
|
|
* 0 for "don't know"
|
|
|
|
|
* 1 for "is definitely the same dive"
|
|
|
|
|
*/
|
|
|
|
|
static int match_dc_dive(struct divecomputer *a, struct divecomputer *b)
|
|
|
|
|
{
|
|
|
|
|
do {
|
|
|
|
|
struct divecomputer *tmp = b;
|
|
|
|
|
do {
|
|
|
|
|
int match = match_one_dc(a, tmp);
|
|
|
|
|
if (match)
|
|
|
|
|
return match;
|
|
|
|
|
tmp = tmp->next;
|
|
|
|
|
} while (tmp);
|
|
|
|
|
a = a->next;
|
|
|
|
|
} while (a);
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-24 20:59:11 +00:00
|
|
|
|
static bool new_without_trip(struct dive *a)
|
|
|
|
|
{
|
|
|
|
|
return a->downloaded && !a->divetrip;
|
|
|
|
|
}
|
|
|
|
|
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
/*
|
|
|
|
|
* Do we want to automatically try to merge two dives that
|
|
|
|
|
* look like they are the same dive?
|
|
|
|
|
*
|
|
|
|
|
* This happens quite commonly because you download a dive
|
|
|
|
|
* that you already had, or perhaps because you maintained
|
|
|
|
|
* multiple dive logs and want to load them all together
|
|
|
|
|
* (possibly one of them was imported from another dive log
|
|
|
|
|
* application entirely).
|
|
|
|
|
*
|
|
|
|
|
* NOTE! We mainly look at the dive time, but it can differ
|
|
|
|
|
* between two dives due to a few issues:
|
|
|
|
|
*
|
|
|
|
|
* - rounding the dive date to the nearest minute in other dive
|
|
|
|
|
* applications
|
|
|
|
|
*
|
|
|
|
|
* - dive computers with "relative datestamps" (ie the dive
|
|
|
|
|
* computer doesn't actually record an absolute date at all,
|
|
|
|
|
* but instead at download-time syncronizes its internal
|
|
|
|
|
* time with real-time on the downloading computer)
|
|
|
|
|
*
|
|
|
|
|
* - using multiple dive computers with different real time on
|
|
|
|
|
* the same dive
|
|
|
|
|
*
|
|
|
|
|
* We do not merge dives that look radically different, and if
|
|
|
|
|
* the dates are *too* far off the user will have to join two
|
|
|
|
|
* dives together manually. But this tries to handle the sane
|
|
|
|
|
* cases.
|
|
|
|
|
*/
|
|
|
|
|
static int likely_same_dive(struct dive *a, struct dive *b)
|
|
|
|
|
{
|
2013-01-23 19:53:42 +00:00
|
|
|
|
int match, fuzz = 20 * 60;
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
|
2014-07-24 20:59:11 +00:00
|
|
|
|
/* Don't try to merge dives with different trip information */
|
|
|
|
|
if (a->divetrip != b->divetrip) {
|
|
|
|
|
/*
|
|
|
|
|
* Exception: if the dive is downloaded without any
|
|
|
|
|
* explicit trip information, we do want to merge it
|
|
|
|
|
* with existing old dives even if they have trips.
|
|
|
|
|
*/
|
|
|
|
|
if (!new_without_trip(a) && !new_without_trip(b))
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
Allow overlapping (and disjoint) dive trips
We used to have the rule that a dive trip has to have all dives in it in
sequential order, even though our XML file really is much more flexible,
and allows arbitrary nesting of dives within a dive trip.
Put another way, the old model had fairly inflexible rules:
- the dive array is sorted by time
- a dive trip is always a contiguous slice of this sorted array
which makes perfect sense when you think of the dive and trip list as a
physical activity by one person, but leads to various very subtle issues
in the general case when there are no guarantees that the user then uses
subsurface that way.
In particular, if you load the XML files of two divers that have
overlapping dive trips, the end result is incredibly messy, and does not
conform to the above model at all.
There's two ways to enforce such conformance:
- disallow that kind of behavior entirely.
This is actually hard. Our XML files aren't date-based, they are
based on XML nesting rules, and even a single XML file can have
nesting that violates the date ordering. With multiple XML files,
it's trivial to do in practice, and while we could just fail at
loading, the failure would have to be a hard failure that leaves the
user no way to use the data at all.
- try to "fix it up" by sorting, splitting, and combining dive trips
automatically.
Dirk had a patch to do this, but it really does destroy the actual
dive data: if you load both mine and Dirk's dive trips, you ended up
with a result that followed the above two technical rules, but that
didn't actually make any *sense*.
So this patch doesn't try to enforce the rules, and instead just changes
them to be more generic:
- the dive array is still sorted by dive time
- a dive trip is just an arbitrary collection of dives.
The relaxed rules means that mixing dives and dive trips for two people
is trivial, and we can easily handle any XML file. The dive trip is
defined by the XML nesting level, and is totally independent of any
date-based sorting.
It does require a few things:
- when we save our dive data, we have to do it hierarchically by dive
trip, not just by walking the dive array linearly.
- similarly, when we create the dive tree model, we can't just blindly
walk the array of dives one by one, we have to look up the correct
trip (parent)
- when we try to merge two dives that are adjacent (by date sorting),
we can't do it if they are in different trips.
but apart from that, nothing else really changes.
NOTE! Despite the new relaxed model, creating totally disjoing dive
trips is not all that easy (nor is there any *reason* for it to be
easty). Our GUI interfaces still are "add dive to trip above" etc, and
the automatic adding of dives to dive trips is obviously still based on
date.
So this does not really change the expected normal usage, the relaxed
data structure rules just mean that we don't need to worry about the odd
cases as much, because we can just let them be.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-30 19:00:37 +00:00
|
|
|
|
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
/*
|
|
|
|
|
* Do some basic sanity testing of the values we
|
|
|
|
|
* have filled in during 'fixup_dive()'
|
|
|
|
|
*/
|
2013-02-09 15:12:30 +00:00
|
|
|
|
if (!similar(a->maxdepth.mm, b->maxdepth.mm, 1000) ||
|
2013-02-16 17:04:03 +00:00
|
|
|
|
(a->meandepth.mm && b->meandepth.mm && !similar(a->meandepth.mm, b->meandepth.mm, 1000)) ||
|
2014-02-28 04:09:57 +00:00
|
|
|
|
!similar(a->duration.seconds, b->duration.seconds, 5 * 60))
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
return 0;
|
|
|
|
|
|
2012-12-16 18:55:58 +00:00
|
|
|
|
/* See if we can get an exact match on the dive computer */
|
|
|
|
|
match = match_dc_dive(&a->dc, &b->dc);
|
|
|
|
|
if (match)
|
|
|
|
|
return match > 0;
|
|
|
|
|
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
/*
|
2012-12-16 18:55:58 +00:00
|
|
|
|
* Allow a time difference due to dive computer time
|
|
|
|
|
* setting etc. Check if they overlap.
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
*/
|
2013-02-09 15:12:30 +00:00
|
|
|
|
fuzz = MAX(a->duration.seconds, b->duration.seconds) / 2;
|
2012-12-16 18:55:58 +00:00
|
|
|
|
if (fuzz < 60)
|
|
|
|
|
fuzz = 60;
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
|
|
|
|
|
return ((a->when <= b->when + fuzz) && (a->when >= b->when - fuzz));
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
/*
|
|
|
|
|
* This could do a lot more merging. Right now it really only
|
|
|
|
|
* merges almost exact duplicates - something that happens easily
|
|
|
|
|
* with overlapping dive downloads.
|
|
|
|
|
*/
|
2013-10-05 07:29:09 +00:00
|
|
|
|
struct dive *try_to_merge(struct dive *a, struct dive *b, bool prefer_downloaded)
|
2011-09-03 20:19:26 +00:00
|
|
|
|
{
|
Improve automatic dive merging logic
This tunes the heuristics for when to merge two dives together into a
single dive. We used to just look at the date, and say "if they're
within one minute of each other, try to merge". This looks at the
actual dive data, and tries to see just how much sense it makes to
merge the dive.
It also checks if the dives to be merged use different dive computers,
and if so relaxes the one minute to five, since most people aren't
quite as OCD as I am, and don't tend to set their dive computers quite
that exactly to the same time and date.
I'm sure people can come up with other heuristics, but this should
make that easier too.
NOTE! If you have things like wrong timezones etc, and the
divecomputer dates are thus off by hours rather than by a couple of
minutes, this will still not merge them. For that kind of situation,
we'd need some kind of manual merge option. Note that that is *not*
the same as the current "merge two adjacent dives" together, which
joins two separate dives into one *longer* dive with a surface
interval in between.
That kind of manual merge UI makes sense, but is independent of this
partical change.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-04 20:26:28 +00:00
|
|
|
|
if (likely_same_dive(a, b))
|
|
|
|
|
return merge_dives(a, b, 0, prefer_downloaded);
|
|
|
|
|
return NULL;
|
2012-11-25 04:29:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void free_events(struct event *ev)
|
|
|
|
|
{
|
|
|
|
|
while (ev) {
|
|
|
|
|
struct event *next = ev->next;
|
|
|
|
|
free(ev);
|
|
|
|
|
ev = next;
|
Add special download modes to force updates from the divecomputer
This will hopefully not be something we need often, but if we improve
support for a divecomputer (either in libdivecomputer or in our native
Uemis code or even in the way we handle (and potentially discard) events),
then it is extremely useful to be able to say "re-download things
from the divecomputer and for things that were not edited in Subsurface,
don't try to merge the data (which gives BAD results if for example you
fixed a bug in the depth calculation in libdivecomputer) but instead
simply take the samples, the events and some of the other unedited data
straight from the download".
This commit implements just that - a "force download" checkbox in the
download dialog that makes us reimport all dives from the dive computer,
even the ones we already have, and an "always prefer downloaded dive"
checkbox that then tells Subsurface not to merge but simply to take the
data from the downloaded dive - without overwriting the things we have
already edited in Subsurface (like location, buddy, equipment, etc).
This, as a precaution, refuses to merge dives that don't have identical
start times. So if you have edited the date / time of a dive or if you
have previously merged your dive with a different dive computer (and
therefore modified samples and events) you are out of luck.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-11 13:29:26 +00:00
|
|
|
|
}
|
2012-11-25 04:29:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void free_dc(struct divecomputer *dc)
|
|
|
|
|
{
|
|
|
|
|
free(dc->sample);
|
2014-05-12 17:58:15 +00:00
|
|
|
|
free((void *)dc->model);
|
2012-11-25 04:29:14 +00:00
|
|
|
|
free_events(dc->events);
|
|
|
|
|
free(dc);
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-02 22:29:02 +00:00
|
|
|
|
static void free_pic(struct picture *picture)
|
|
|
|
|
{
|
|
|
|
|
if (picture) {
|
|
|
|
|
free(picture->filename);
|
|
|
|
|
free(picture);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-25 04:29:14 +00:00
|
|
|
|
static int same_sample(struct sample *a, struct sample *b)
|
|
|
|
|
{
|
|
|
|
|
if (a->time.seconds != b->time.seconds)
|
|
|
|
|
return 0;
|
|
|
|
|
if (a->depth.mm != b->depth.mm)
|
|
|
|
|
return 0;
|
|
|
|
|
if (a->temperature.mkelvin != b->temperature.mkelvin)
|
|
|
|
|
return 0;
|
|
|
|
|
if (a->cylinderpressure.mbar != b->cylinderpressure.mbar)
|
|
|
|
|
return 0;
|
First step in cleaning up cylinder pressure sensor logic
This clarifies/changes the meaning of our "cylinderindex" entry in our
samples. It has been rather confused, because different dive computers
have done things differently, and the naming really hasn't helped.
There are two totally different - and independent - cylinder "indexes":
- the pressure sensor index, which indicates which cylinder the sensor
data is from.
- the "active cylinder" index, which indicates which cylinder we actually
breathe from.
These two values really are totally independent, and have nothing
what-so-ever to do with each other. The sensor index may well be fixed:
many dive computers only support a single pressure sensor (whether
wireless or wired), and the sensor index is thus always zero.
Other dive computers may support multiple pressure sensors, and the gas
switch event may - or may not - indicate that the sensor changed too. A
dive computer might give the sensor data for *all* cylinders it can read,
regardless of which one is the one we're actively breathing. In fact, some
dive computers might give sensor data for not just *your* cylinder, but
your buddies.
This patch renames "cylinderindex" in the samples as "sensor", making it
quite clear that it's about which sensor index the pressure data in the
sample is about.
The way we figure out which is the currently active gas is with an
explicit has change event. If a computer (like the Uemis Zurich) joins the
two concepts together, then a sensor change should also create a gas
switch event. This patch also changes the Uemis importer to do that.
Finally, it should be noted that the plot info works totally separately
from the sample data, and is about what we actually *display*, not about
the sample pressures etc. In the plot info, the "cylinderindex" does in
fact mean the currently active cylinder, and while it is initially set to
match the sensor information from the samples, we then walk the gas change
events and fix it up - and if the active cylinder differs from the sensor
cylinder, we clear the sensor data.
[Dirk Hohndel: this conflicted with some of my recent changes - I think
I merged things correctly...]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-31 04:00:51 +00:00
|
|
|
|
return a->sensor == b->sensor;
|
2012-11-25 04:29:14 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int same_dc(struct divecomputer *a, struct divecomputer *b)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct event *eva, *evb;
|
|
|
|
|
|
2012-12-16 20:33:37 +00:00
|
|
|
|
i = match_one_dc(a, b);
|
|
|
|
|
if (i)
|
|
|
|
|
return i > 0;
|
|
|
|
|
|
2012-11-25 04:29:14 +00:00
|
|
|
|
if (a->when && b->when && a->when != b->when)
|
|
|
|
|
return 0;
|
|
|
|
|
if (a->samples != b->samples)
|
|
|
|
|
return 0;
|
|
|
|
|
for (i = 0; i < a->samples; i++)
|
2014-02-28 04:09:57 +00:00
|
|
|
|
if (!same_sample(a->sample + i, b->sample + i))
|
2012-11-25 04:29:14 +00:00
|
|
|
|
return 0;
|
|
|
|
|
eva = a->events;
|
|
|
|
|
evb = b->events;
|
|
|
|
|
while (eva && evb) {
|
|
|
|
|
if (!same_event(eva, evb))
|
|
|
|
|
return 0;
|
|
|
|
|
eva = eva->next;
|
|
|
|
|
evb = evb->next;
|
|
|
|
|
}
|
|
|
|
|
return eva == evb;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-23 00:57:07 +00:00
|
|
|
|
static int might_be_same_device(struct divecomputer *a, struct divecomputer *b)
|
|
|
|
|
{
|
|
|
|
|
/* No dive computer model? That matches anything */
|
|
|
|
|
if (!a->model || !b->model)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
/* Otherwise at least the model names have to match */
|
|
|
|
|
if (strcasecmp(a->model, b->model))
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
/* No device ID? Match */
|
|
|
|
|
if (!a->deviceid || !b->deviceid)
|
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
|
|
return a->deviceid == b->deviceid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void remove_redundant_dc(struct divecomputer *dc, int prefer_downloaded)
|
2012-11-25 04:29:14 +00:00
|
|
|
|
{
|
|
|
|
|
do {
|
|
|
|
|
struct divecomputer **p = &dc->next;
|
|
|
|
|
|
|
|
|
|
/* Check this dc against all the following ones.. */
|
|
|
|
|
while (*p) {
|
|
|
|
|
struct divecomputer *check = *p;
|
2013-01-23 00:57:07 +00:00
|
|
|
|
if (same_dc(dc, check) || (prefer_downloaded && might_be_same_device(dc, check))) {
|
2012-11-25 04:29:14 +00:00
|
|
|
|
*p = check->next;
|
|
|
|
|
check->next = NULL;
|
|
|
|
|
free_dc(check);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
p = &check->next;
|
|
|
|
|
}
|
|
|
|
|
|
2013-01-23 00:57:07 +00:00
|
|
|
|
/* .. and then continue down the chain, but we */
|
|
|
|
|
prefer_downloaded = 0;
|
2012-11-25 04:29:14 +00:00
|
|
|
|
dc = dc->next;
|
|
|
|
|
} while (dc);
|
2012-11-11 06:20:05 +00:00
|
|
|
|
}
|
|
|
|
|
|
2012-11-25 20:39:08 +00:00
|
|
|
|
static void clear_dc(struct divecomputer *dc)
|
|
|
|
|
{
|
|
|
|
|
memset(dc, 0, sizeof(*dc));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static struct divecomputer *find_matching_computer(struct divecomputer *match, struct divecomputer *list)
|
|
|
|
|
{
|
|
|
|
|
struct divecomputer *p;
|
|
|
|
|
|
|
|
|
|
while ((p = list) != NULL) {
|
|
|
|
|
list = list->next;
|
|
|
|
|
|
2013-01-23 00:57:07 +00:00
|
|
|
|
if (might_be_same_device(match, p))
|
2012-11-25 20:39:08 +00:00
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return p;
|
|
|
|
|
}
|
|
|
|
|
|
2013-02-04 05:21:47 +00:00
|
|
|
|
|
|
|
|
|
static void copy_dive_computer(struct divecomputer *res, struct divecomputer *a)
|
|
|
|
|
{
|
|
|
|
|
*res = *a;
|
2014-07-03 04:05:22 +00:00
|
|
|
|
res->model = copy_string(a->model);
|
2013-02-04 05:21:47 +00:00
|
|
|
|
res->samples = res->alloc_samples = 0;
|
|
|
|
|
res->sample = NULL;
|
|
|
|
|
res->events = NULL;
|
|
|
|
|
res->next = NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2012-11-25 20:39:08 +00:00
|
|
|
|
/*
|
|
|
|
|
* Join dive computers with a specific time offset between
|
|
|
|
|
* them.
|
|
|
|
|
*
|
|
|
|
|
* Use the dive computer ID's (or names, if ID's are missing)
|
|
|
|
|
* to match them up. If we find a matching dive computer, we
|
|
|
|
|
* merge them. If not, we just take the data from 'a'.
|
|
|
|
|
*/
|
|
|
|
|
static void interleave_dive_computers(struct divecomputer *res,
|
2014-02-28 04:09:57 +00:00
|
|
|
|
struct divecomputer *a, struct divecomputer *b, int offset)
|
2012-11-25 20:39:08 +00:00
|
|
|
|
{
|
|
|
|
|
do {
|
|
|
|
|
struct divecomputer *match;
|
|
|
|
|
|
2013-02-04 05:21:47 +00:00
|
|
|
|
copy_dive_computer(res, a);
|
2012-11-25 20:39:08 +00:00
|
|
|
|
|
|
|
|
|
match = find_matching_computer(a, b);
|
|
|
|
|
if (match) {
|
|
|
|
|
merge_events(res, a, match, offset);
|
|
|
|
|
merge_samples(res, a, match, offset);
|
2014-05-20 05:01:40 +00:00
|
|
|
|
/* Use the diveid of the later dive! */
|
|
|
|
|
if (offset > 0)
|
|
|
|
|
res->diveid = match->diveid;
|
2012-11-25 20:39:08 +00:00
|
|
|
|
} else {
|
|
|
|
|
res->sample = a->sample;
|
|
|
|
|
res->samples = a->samples;
|
|
|
|
|
res->events = a->events;
|
|
|
|
|
a->sample = NULL;
|
|
|
|
|
a->samples = 0;
|
|
|
|
|
a->events = NULL;
|
|
|
|
|
}
|
|
|
|
|
a = a->next;
|
|
|
|
|
if (!a)
|
|
|
|
|
break;
|
|
|
|
|
res->next = calloc(1, sizeof(struct divecomputer));
|
|
|
|
|
res = res->next;
|
|
|
|
|
} while (res);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Join dive computer information.
|
|
|
|
|
*
|
|
|
|
|
* If we have old-style dive computer information (no model
|
|
|
|
|
* name etc), we will prefer a new-style one and just throw
|
|
|
|
|
* away the old. We're assuming it's a re-download.
|
|
|
|
|
*
|
2013-01-23 00:57:07 +00:00
|
|
|
|
* Otherwise, we'll just try to keep all the information,
|
|
|
|
|
* unless the user has specified that they prefer the
|
|
|
|
|
* downloaded computer, in which case we'll aggressively
|
|
|
|
|
* try to throw out old information that *might* be from
|
|
|
|
|
* that one.
|
2012-11-25 20:39:08 +00:00
|
|
|
|
*/
|
2013-01-23 00:57:07 +00:00
|
|
|
|
static void join_dive_computers(struct divecomputer *res, struct divecomputer *a, struct divecomputer *b, int prefer_downloaded)
|
2012-11-25 20:39:08 +00:00
|
|
|
|
{
|
2012-12-16 20:33:37 +00:00
|
|
|
|
struct divecomputer *tmp;
|
|
|
|
|
|
2012-11-25 20:39:08 +00:00
|
|
|
|
if (a->model && !b->model) {
|
|
|
|
|
*res = *a;
|
|
|
|
|
clear_dc(a);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
if (b->model && !a->model) {
|
|
|
|
|
*res = *b;
|
|
|
|
|
clear_dc(b);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*res = *a;
|
|
|
|
|
clear_dc(a);
|
2012-12-16 20:33:37 +00:00
|
|
|
|
tmp = res;
|
|
|
|
|
while (tmp->next)
|
|
|
|
|
tmp = tmp->next;
|
2012-11-25 20:39:08 +00:00
|
|
|
|
|
2012-12-16 20:33:37 +00:00
|
|
|
|
tmp->next = calloc(1, sizeof(*tmp));
|
|
|
|
|
*tmp->next = *b;
|
2012-11-25 20:39:08 +00:00
|
|
|
|
clear_dc(b);
|
|
|
|
|
|
2013-01-23 00:57:07 +00:00
|
|
|
|
remove_redundant_dc(res, prefer_downloaded);
|
2012-11-25 20:39:08 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-07-10 16:39:51 +00:00
|
|
|
|
static bool tag_seen_before(struct tag_entry *start, struct tag_entry *before)
|
|
|
|
|
{
|
2014-10-11 11:25:52 +00:00
|
|
|
|
while (start && start != before) {
|
2014-07-10 16:39:51 +00:00
|
|
|
|
if (same_string(start->tag->name, before->tag->name))
|
|
|
|
|
return true;
|
|
|
|
|
start = start->next;
|
|
|
|
|
}
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* remove duplicates and empty nodes */
|
|
|
|
|
void taglist_cleanup(struct tag_entry **tag_list)
|
|
|
|
|
{
|
|
|
|
|
struct tag_entry **tl = tag_list;
|
|
|
|
|
while (*tl) {
|
|
|
|
|
/* skip tags that are empty or that we have seen before */
|
|
|
|
|
if (same_string((*tl)->tag->name, "") || tag_seen_before(*tag_list, *tl)) {
|
|
|
|
|
*tl = (*tl)->next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
tl = &(*tl)->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
int taglist_get_tagstring(struct tag_entry *tag_list, char *buffer, int len)
|
|
|
|
|
{
|
2013-11-02 01:12:42 +00:00
|
|
|
|
int i = 0;
|
|
|
|
|
struct tag_entry *tmp;
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
tmp = tag_list;
|
2013-11-02 01:12:42 +00:00
|
|
|
|
memset(buffer, 0, len);
|
2014-02-28 04:09:57 +00:00
|
|
|
|
while (tmp != NULL) {
|
2013-11-02 01:12:42 +00:00
|
|
|
|
int newlength = strlen(tmp->tag->name);
|
|
|
|
|
if (i > 0)
|
|
|
|
|
newlength += 2;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
if ((i + newlength) < len) {
|
2013-11-02 01:12:42 +00:00
|
|
|
|
if (i > 0) {
|
2014-02-28 04:09:57 +00:00
|
|
|
|
strcpy(buffer + i, ", ");
|
|
|
|
|
strcpy(buffer + i + 2, tmp->tag->name);
|
2013-11-02 01:12:42 +00:00
|
|
|
|
} else {
|
|
|
|
|
strcpy(buffer, tmp->tag->name);
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
i += newlength;
|
|
|
|
|
tmp = tmp->next;
|
|
|
|
|
}
|
|
|
|
|
return i;
|
|
|
|
|
}
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
static inline void taglist_free_divetag(struct divetag *tag)
|
|
|
|
|
{
|
2013-11-02 01:12:42 +00:00
|
|
|
|
if (tag->name != NULL)
|
|
|
|
|
free(tag->name);
|
|
|
|
|
if (tag->source != NULL)
|
|
|
|
|
free(tag->source);
|
|
|
|
|
free(tag);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Add a tag to the tag_list, keep the list sorted */
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
static struct divetag *taglist_add_divetag(struct tag_entry **tag_list, struct divetag *tag)
|
|
|
|
|
{
|
|
|
|
|
struct tag_entry *next, *entry;
|
|
|
|
|
|
|
|
|
|
while ((next = *tag_list) != NULL) {
|
|
|
|
|
int cmp = strcmp(next->tag->name, tag->name);
|
|
|
|
|
|
|
|
|
|
/* Already have it? */
|
|
|
|
|
if (!cmp)
|
|
|
|
|
return next->tag;
|
|
|
|
|
/* Is the entry larger? If so, insert here */
|
|
|
|
|
if (cmp > 0)
|
|
|
|
|
break;
|
|
|
|
|
/* Continue traversing the list */
|
|
|
|
|
tag_list = &next->next;
|
2013-11-02 01:12:42 +00:00
|
|
|
|
}
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
|
|
|
|
|
/* Insert in front of it */
|
|
|
|
|
entry = malloc(sizeof(struct tag_entry));
|
|
|
|
|
entry->next = next;
|
|
|
|
|
entry->tag = tag;
|
|
|
|
|
*tag_list = entry;
|
|
|
|
|
return tag;
|
2013-11-02 01:12:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
struct divetag *taglist_add_tag(struct tag_entry **tag_list, const char *tag)
|
2013-11-02 01:12:42 +00:00
|
|
|
|
{
|
2013-11-19 15:12:34 +00:00
|
|
|
|
int i = 0, is_default_tag = 0;
|
2013-11-02 01:12:42 +00:00
|
|
|
|
struct divetag *ret_tag, *new_tag;
|
|
|
|
|
const char *translation;
|
|
|
|
|
new_tag = malloc(sizeof(struct divetag));
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
for (i = 0; i < sizeof(default_tags) / sizeof(char *); i++) {
|
2013-11-19 15:12:34 +00:00
|
|
|
|
if (strcmp(default_tags[i], tag) == 0) {
|
|
|
|
|
is_default_tag = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* Only translate default tags */
|
|
|
|
|
if (is_default_tag) {
|
|
|
|
|
translation = translate("gettextFromC", tag);
|
2014-02-28 04:09:57 +00:00
|
|
|
|
new_tag->name = malloc(strlen(translation) + 1);
|
|
|
|
|
memcpy(new_tag->name, translation, strlen(translation) + 1);
|
|
|
|
|
new_tag->source = malloc(strlen(tag) + 1);
|
|
|
|
|
memcpy(new_tag->source, tag, strlen(tag) + 1);
|
2013-11-19 15:12:34 +00:00
|
|
|
|
} else {
|
|
|
|
|
new_tag->source = NULL;
|
2014-02-28 04:09:57 +00:00
|
|
|
|
new_tag->name = malloc(strlen(tag) + 1);
|
|
|
|
|
memcpy(new_tag->name, tag, strlen(tag) + 1);
|
2013-11-02 01:12:42 +00:00
|
|
|
|
}
|
|
|
|
|
/* Try to insert new_tag into g_tag_list if we are not operating on it */
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
if (tag_list != &g_tag_list) {
|
|
|
|
|
ret_tag = taglist_add_divetag(&g_tag_list, new_tag);
|
2013-11-02 01:12:42 +00:00
|
|
|
|
/* g_tag_list already contains new_tag, free the duplicate */
|
|
|
|
|
if (ret_tag != new_tag)
|
|
|
|
|
taglist_free_divetag(new_tag);
|
|
|
|
|
ret_tag = taglist_add_divetag(tag_list, ret_tag);
|
|
|
|
|
} else {
|
|
|
|
|
ret_tag = taglist_add_divetag(tag_list, new_tag);
|
|
|
|
|
if (ret_tag != new_tag)
|
|
|
|
|
taglist_free_divetag(new_tag);
|
|
|
|
|
}
|
|
|
|
|
return ret_tag;
|
|
|
|
|
}
|
|
|
|
|
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
void taglist_free(struct tag_entry *entry)
|
|
|
|
|
{
|
2014-07-02 22:29:02 +00:00
|
|
|
|
STRUCTURED_LIST_FREE(struct tag_entry, entry, free)
|
2013-11-02 01:12:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Merge src1 and src2, write to *dst */
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
static void taglist_merge(struct tag_entry **dst, struct tag_entry *src1, struct tag_entry *src2)
|
2013-11-02 01:12:42 +00:00
|
|
|
|
{
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
struct tag_entry *entry;
|
|
|
|
|
|
|
|
|
|
for (entry = src1; entry; entry = entry->next)
|
|
|
|
|
taglist_add_divetag(dst, entry->tag);
|
|
|
|
|
for (entry = src2; entry; entry = entry->next)
|
|
|
|
|
taglist_add_divetag(dst, entry->tag);
|
2013-11-02 01:12:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void taglist_init_global()
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
|
for (i = 0; i < sizeof(default_tags) / sizeof(char *); i++)
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
taglist_add_tag(&g_tag_list, default_tags[i]);
|
2013-11-02 01:12:42 +00:00
|
|
|
|
}
|
|
|
|
|
|
2013-10-05 07:29:09 +00:00
|
|
|
|
struct dive *merge_dives(struct dive *a, struct dive *b, int offset, bool prefer_downloaded)
|
2012-11-11 06:20:05 +00:00
|
|
|
|
{
|
|
|
|
|
struct dive *res = alloc_dive();
|
Add special download modes to force updates from the divecomputer
This will hopefully not be something we need often, but if we improve
support for a divecomputer (either in libdivecomputer or in our native
Uemis code or even in the way we handle (and potentially discard) events),
then it is extremely useful to be able to say "re-download things
from the divecomputer and for things that were not edited in Subsurface,
don't try to merge the data (which gives BAD results if for example you
fixed a bug in the depth calculation in libdivecomputer) but instead
simply take the samples, the events and some of the other unedited data
straight from the download".
This commit implements just that - a "force download" checkbox in the
download dialog that makes us reimport all dives from the dive computer,
even the ones we already have, and an "always prefer downloaded dive"
checkbox that then tells Subsurface not to merge but simply to take the
data from the downloaded dive - without overwriting the things we have
already edited in Subsurface (like location, buddy, equipment, etc).
This, as a precaution, refuses to merge dives that don't have identical
start times. So if you have edited the date / time of a dive or if you
have previously merged your dive with a different dive computer (and
therefore modified samples and events) you are out of luck.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-11 13:29:26 +00:00
|
|
|
|
struct dive *dl = NULL;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
|
2012-12-07 17:22:35 +00:00
|
|
|
|
/* Aim for newly downloaded dives to be 'b' (keep old dive data first) */
|
|
|
|
|
if (a->downloaded && !b->downloaded) {
|
|
|
|
|
struct dive *tmp = a;
|
|
|
|
|
a = b;
|
|
|
|
|
b = tmp;
|
2012-11-21 23:34:04 +00:00
|
|
|
|
}
|
2012-12-07 17:22:35 +00:00
|
|
|
|
if (prefer_downloaded && b->downloaded)
|
|
|
|
|
dl = b;
|
|
|
|
|
|
2014-01-11 07:46:05 +00:00
|
|
|
|
/*
|
|
|
|
|
* Did the user ask us to merge dives in the dive list?
|
|
|
|
|
* We may want to just join the dive computers, not try to
|
|
|
|
|
* interleave them at some offset.
|
|
|
|
|
*/
|
|
|
|
|
if (offset && likely_same_dive(a, b))
|
|
|
|
|
offset = 0;
|
|
|
|
|
|
2012-11-25 04:29:14 +00:00
|
|
|
|
res->when = dl ? dl->when : a->when;
|
2012-11-11 10:00:27 +00:00
|
|
|
|
res->selected = a->selected || b->selected;
|
2012-11-11 06:20:05 +00:00
|
|
|
|
merge_trip(res, a, b);
|
2012-12-05 17:59:52 +00:00
|
|
|
|
MERGE_NONZERO(res, a, b, latitude.udeg);
|
|
|
|
|
MERGE_NONZERO(res, a, b, longitude.udeg);
|
2011-09-23 01:01:01 +00:00
|
|
|
|
MERGE_TXT(res, a, b, location);
|
|
|
|
|
MERGE_TXT(res, a, b, notes);
|
|
|
|
|
MERGE_TXT(res, a, b, buddy);
|
|
|
|
|
MERGE_TXT(res, a, b, divemaster);
|
2011-12-07 19:58:16 +00:00
|
|
|
|
MERGE_MAX(res, a, b, rating);
|
2012-08-14 23:07:25 +00:00
|
|
|
|
MERGE_TXT(res, a, b, suit);
|
2011-09-12 19:56:34 +00:00
|
|
|
|
MERGE_MAX(res, a, b, number);
|
2012-12-11 20:30:34 +00:00
|
|
|
|
MERGE_NONZERO(res, a, b, cns);
|
2012-11-10 18:18:10 +00:00
|
|
|
|
MERGE_NONZERO(res, a, b, visibility);
|
Get rid of crazy empty tag_list element at the start
So this is totally unrelated to the git repository format, except for
the fact that I noticed it while writing the git saving code.
The subsurface divetag list handling is being stupid, and has a
initial dummy entry at the head of the list for no good reason.
I say "no good reason", because there *is* a reason for it: it allows
code to avoid the special case of empty list and adding entries to
before the first entry etc etc. But that reason is a really *bad*
reason, because it's valid only because people don't understand basic
list manipulation and pointers to pointers.
So get rid of the dummy element, and do things right instead - by
passing a *pointer* to the list, instead of the list. And then when
traversing the list and looking for a place to insert things, don't go
to the next entry - just update the "pointer to pointer" to point to
the address of the next entry. Each entry in a C linked list is no
different than the list itself, so you can use the pointer to the
pointer to the next entry as a pointer to the list.
This is a pet peeve of mine. The real beauty of pointers can never be
understood unless you understand the indirection they allow. People
who grew up with Pascal and were corrupted by that mindset are
mentally stunted. Niklaus Wirth has a lot to answer for!
But never fear. You too can overcome that mental limitation, it just
needs some brain exercise. Reading this patch may help. In particular,
contemplate the new "taglist_add_divetag()".
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2014-03-10 17:18:13 +00:00
|
|
|
|
taglist_merge(&res->tag_list, a->tag_list, b->tag_list);
|
2012-10-29 18:27:14 +00:00
|
|
|
|
merge_equipment(res, a, b);
|
2013-02-14 17:44:18 +00:00
|
|
|
|
merge_airtemps(res, a, b);
|
Add special download modes to force updates from the divecomputer
This will hopefully not be something we need often, but if we improve
support for a divecomputer (either in libdivecomputer or in our native
Uemis code or even in the way we handle (and potentially discard) events),
then it is extremely useful to be able to say "re-download things
from the divecomputer and for things that were not edited in Subsurface,
don't try to merge the data (which gives BAD results if for example you
fixed a bug in the depth calculation in libdivecomputer) but instead
simply take the samples, the events and some of the other unedited data
straight from the download".
This commit implements just that - a "force download" checkbox in the
download dialog that makes us reimport all dives from the dive computer,
even the ones we already have, and an "always prefer downloaded dive"
checkbox that then tells Subsurface not to merge but simply to take the
data from the downloaded dive - without overwriting the things we have
already edited in Subsurface (like location, buddy, equipment, etc).
This, as a precaution, refuses to merge dives that don't have identical
start times. So if you have edited the date / time of a dive or if you
have previously merged your dive with a different dive computer (and
therefore modified samples and events) you are out of luck.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-11-11 13:29:26 +00:00
|
|
|
|
if (dl) {
|
2013-01-23 00:57:07 +00:00
|
|
|
|
/* If we prefer downloaded, do those first, and get rid of "might be same" computers */
|
|
|
|
|
join_dive_computers(&res->dc, &dl->dc, &a->dc, 1);
|
2014-05-14 04:08:06 +00:00
|
|
|
|
} else if (offset && might_be_same_device(&a->dc, &b->dc))
|
2012-11-25 20:39:08 +00:00
|
|
|
|
interleave_dive_computers(&res->dc, &a->dc, &b->dc, offset);
|
|
|
|
|
else
|
2013-01-23 00:57:07 +00:00
|
|
|
|
join_dive_computers(&res->dc, &a->dc, &b->dc, 0);
|
2012-11-25 04:29:14 +00:00
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
|
fixup_dive(res);
|
|
|
|
|
return res;
|
2011-09-03 20:19:26 +00:00
|
|
|
|
}
|
2013-01-31 03:09:16 +00:00
|
|
|
|
|
|
|
|
|
struct dive *find_dive_including(timestamp_t when)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
|
|
|
|
/* binary search, anyone? Too lazy for now;
|
|
|
|
|
* also we always use the duration from the first divecomputer
|
|
|
|
|
* could this ever be a problem? */
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dive (i, dive) {
|
2013-02-09 15:12:30 +00:00
|
|
|
|
if (dive->when <= when && when <= dive->when + dive->duration.seconds)
|
2013-01-31 03:09:16 +00:00
|
|
|
|
return dive;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2013-10-05 07:29:09 +00:00
|
|
|
|
bool dive_within_time_range(struct dive *dive, timestamp_t when, timestamp_t offset)
|
2013-01-31 03:09:16 +00:00
|
|
|
|
{
|
2013-02-09 15:12:30 +00:00
|
|
|
|
return when - offset <= dive->when && dive->when + dive->duration.seconds <= when + offset;
|
2013-01-31 03:09:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* find the n-th dive that is part of a group of dives within the offset around 'when'.
|
|
|
|
|
* How is that for a vague definition of what this function should do... */
|
|
|
|
|
struct dive *find_dive_n_near(timestamp_t when, int n, timestamp_t offset)
|
|
|
|
|
{
|
|
|
|
|
int i, j = 0;
|
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dive (i, dive) {
|
2013-01-31 03:09:16 +00:00
|
|
|
|
if (dive_within_time_range(dive, when, offset))
|
|
|
|
|
if (++j == n)
|
|
|
|
|
return dive;
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2013-11-18 13:53:05 +00:00
|
|
|
|
|
|
|
|
|
void shift_times(const timestamp_t amount)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dive (i, dive) {
|
2013-11-18 13:53:05 +00:00
|
|
|
|
if (!dive->selected)
|
|
|
|
|
continue;
|
|
|
|
|
dive->when += amount;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-03-20 20:57:49 +00:00
|
|
|
|
|
|
|
|
|
timestamp_t get_times()
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
struct dive *dive;
|
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
for_each_dive (i, dive) {
|
2014-03-20 20:57:49 +00:00
|
|
|
|
if (dive->selected)
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
return dive->when;
|
|
|
|
|
}
|
2014-04-17 14:34:21 +00:00
|
|
|
|
|
|
|
|
|
void set_save_userid_local(short value)
|
|
|
|
|
{
|
|
|
|
|
prefs.save_userid_local = value;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void set_userid(char *rUserId)
|
|
|
|
|
{
|
2014-10-11 21:35:31 +00:00
|
|
|
|
prefs.userid = strdup(rUserId);
|
2014-04-17 14:34:21 +00:00
|
|
|
|
}
|
2014-04-26 15:29:40 +00:00
|
|
|
|
|
|
|
|
|
int average_depth(struct diveplan *dive)
|
|
|
|
|
{
|
|
|
|
|
int integral = 0;
|
|
|
|
|
int last_time = 0;
|
|
|
|
|
int last_depth = 0;
|
|
|
|
|
struct divedatapoint *dp = dive->dp;
|
|
|
|
|
|
2014-07-10 20:11:44 +00:00
|
|
|
|
if (!dp)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2014-04-26 15:29:40 +00:00
|
|
|
|
while (dp) {
|
|
|
|
|
if (dp->time) {
|
|
|
|
|
/* Ignore gas indication samples */
|
|
|
|
|
integral += (dp->depth + last_depth) * (dp->time - last_time) / 2;
|
|
|
|
|
last_time = dp->time;
|
|
|
|
|
last_depth = dp->depth;
|
|
|
|
|
}
|
|
|
|
|
dp = dp->next;
|
|
|
|
|
}
|
2014-07-15 10:14:15 +00:00
|
|
|
|
if (last_time)
|
|
|
|
|
return integral / last_time;
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
2014-04-26 15:29:40 +00:00
|
|
|
|
}
|
2014-06-02 19:56:02 +00:00
|
|
|
|
|
2014-06-02 21:28:02 +00:00
|
|
|
|
struct picture *alloc_picture()
|
2014-06-02 19:56:02 +00:00
|
|
|
|
{
|
2014-06-02 21:28:02 +00:00
|
|
|
|
struct picture *pic = malloc(sizeof(struct picture));
|
|
|
|
|
if (!pic)
|
|
|
|
|
exit(1);
|
|
|
|
|
memset(pic, 0, sizeof(struct picture));
|
|
|
|
|
return pic;
|
2014-06-02 19:56:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-08 18:55:03 +00:00
|
|
|
|
static bool new_picture_for_dive(struct dive *d, char *filename)
|
|
|
|
|
{
|
2014-10-11 11:25:52 +00:00
|
|
|
|
FOR_EACH_PICTURE (d) {
|
2014-06-08 18:55:03 +00:00
|
|
|
|
if (same_string(picture->filename, filename))
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2014-07-01 16:29:19 +00:00
|
|
|
|
// only add pictures that have timestamps between 30 minutes before the dive and
|
|
|
|
|
// 30 minutes after the dive ends
|
|
|
|
|
#define D30MIN (30 * 60)
|
2014-06-03 17:51:47 +00:00
|
|
|
|
void dive_create_picture(struct dive *d, char *filename, int shift_time)
|
|
|
|
|
{
|
2014-06-09 00:17:49 +00:00
|
|
|
|
timestamp_t timestamp;
|
2014-06-08 18:55:03 +00:00
|
|
|
|
if (!new_picture_for_dive(d, filename))
|
|
|
|
|
return;
|
2014-06-03 17:51:47 +00:00
|
|
|
|
struct picture *p = alloc_picture();
|
|
|
|
|
p->filename = filename;
|
2014-06-09 00:17:49 +00:00
|
|
|
|
picture_load_exif_data(p, ×tamp);
|
2014-07-01 16:29:19 +00:00
|
|
|
|
if (timestamp) {
|
2014-06-09 16:38:50 +00:00
|
|
|
|
p->offset.seconds = timestamp - d->when + shift_time;
|
2014-07-08 19:29:06 +00:00
|
|
|
|
if (p->offset.seconds < -D30MIN || p->offset.seconds > (int)d->duration.seconds + D30MIN) {
|
2014-07-01 16:29:19 +00:00
|
|
|
|
// this picture doesn't belong to this dive
|
|
|
|
|
free(p);
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
2014-06-03 17:51:47 +00:00
|
|
|
|
dive_add_picture(d, p);
|
|
|
|
|
dive_set_geodata_from_picture(d, p);
|
|
|
|
|
}
|
|
|
|
|
|
2014-06-08 19:34:18 +00:00
|
|
|
|
void dive_add_picture(struct dive *d, struct picture *newpic)
|
|
|
|
|
{
|
|
|
|
|
struct picture **pic_ptr = &d->picture_list;
|
|
|
|
|
/* let's keep the list sorted by time */
|
2014-10-11 11:25:52 +00:00
|
|
|
|
while (*pic_ptr && (*pic_ptr)->offset.seconds < newpic->offset.seconds)
|
2014-06-08 19:34:18 +00:00
|
|
|
|
pic_ptr = &(*pic_ptr)->next;
|
|
|
|
|
newpic->next = *pic_ptr;
|
|
|
|
|
*pic_ptr = newpic;
|
2014-06-02 21:28:02 +00:00
|
|
|
|
return;
|
2014-06-02 19:56:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-03 07:10:39 +00:00
|
|
|
|
unsigned int dive_get_picture_count(struct dive *d)
|
2014-06-02 19:56:02 +00:00
|
|
|
|
{
|
2014-06-03 07:10:39 +00:00
|
|
|
|
unsigned int i = 0;
|
2014-10-11 11:25:52 +00:00
|
|
|
|
FOR_EACH_PICTURE (d)
|
2014-06-02 20:07:26 +00:00
|
|
|
|
i++;
|
|
|
|
|
return i;
|
2014-06-02 19:56:02 +00:00
|
|
|
|
}
|
|
|
|
|
|
2014-06-02 21:28:02 +00:00
|
|
|
|
void dive_set_geodata_from_picture(struct dive *d, struct picture *pic)
|
|
|
|
|
{
|
|
|
|
|
if (!d->latitude.udeg && pic->latitude.udeg) {
|
|
|
|
|
d->latitude = pic->latitude;
|
|
|
|
|
d->longitude = pic->longitude;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-11 11:25:52 +00:00
|
|
|
|
static void picture_free(struct picture *p)
|
|
|
|
|
{
|
2014-07-30 02:03:32 +00:00
|
|
|
|
if (!p)
|
|
|
|
|
return;
|
2014-10-11 11:25:52 +00:00
|
|
|
|
free(p->filename);
|
|
|
|
|
free(p);
|
2014-07-30 02:03:32 +00:00
|
|
|
|
}
|
2014-08-05 19:37:14 +00:00
|
|
|
|
void dive_remove_picture(char *filename)
|
2014-06-02 19:56:02 +00:00
|
|
|
|
{
|
2014-07-30 02:03:32 +00:00
|
|
|
|
struct picture **ep = ¤t_dive->picture_list;
|
2014-08-05 19:37:14 +00:00
|
|
|
|
while (ep && !same_string((*ep)->filename, filename))
|
2014-07-30 02:03:32 +00:00
|
|
|
|
ep = &(*ep)->next;
|
|
|
|
|
if (ep) {
|
|
|
|
|
struct picture *temp = (*ep)->next;
|
|
|
|
|
picture_free(*ep);
|
|
|
|
|
*ep = temp;
|
|
|
|
|
}
|
2014-06-02 19:56:02 +00:00
|
|
|
|
}
|
2014-06-11 20:56:33 +00:00
|
|
|
|
|
|
|
|
|
/* this always acts on the current divecomputer of the current dive */
|
|
|
|
|
void make_first_dc()
|
|
|
|
|
{
|
|
|
|
|
struct divecomputer *dc = ¤t_dive->dc;
|
|
|
|
|
struct divecomputer *newdc = malloc(sizeof(*newdc));
|
|
|
|
|
struct divecomputer *cur_dc = current_dc; /* needs to be in a local variable so the macro isn't re-executed */
|
|
|
|
|
|
|
|
|
|
/* skip the current DC in the linked list */
|
|
|
|
|
while (dc && dc->next != cur_dc)
|
|
|
|
|
dc = dc->next;
|
|
|
|
|
if (!dc) {
|
2014-07-10 20:11:42 +00:00
|
|
|
|
free(newdc);
|
2014-06-11 20:56:33 +00:00
|
|
|
|
fprintf(stderr, "data inconsistent: can't find the current DC");
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
dc->next = cur_dc->next;
|
|
|
|
|
*newdc = current_dive->dc;
|
|
|
|
|
current_dive->dc = *cur_dc;
|
|
|
|
|
current_dive->dc.next = newdc;
|
|
|
|
|
free(cur_dc);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* always acts on the current dive */
|
|
|
|
|
int count_divecomputers(void)
|
|
|
|
|
{
|
|
|
|
|
int ret = 1;
|
|
|
|
|
struct divecomputer *dc = current_dive->dc.next;
|
|
|
|
|
while (dc) {
|
|
|
|
|
ret++;
|
|
|
|
|
dc = dc->next;
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* always acts on the current dive */
|
|
|
|
|
void delete_current_divecomputer(void)
|
|
|
|
|
{
|
|
|
|
|
struct divecomputer *dc = current_dc;
|
|
|
|
|
|
|
|
|
|
if (dc == ¤t_dive->dc) {
|
|
|
|
|
/* remove the first one, so copy the second one in place of the first and free the second one
|
|
|
|
|
* be careful about freeing the no longer needed structures - since we copy things around we can't use free_dc()*/
|
|
|
|
|
struct divecomputer *fdc = dc->next;
|
|
|
|
|
free(dc->sample);
|
|
|
|
|
free((void *)dc->model);
|
|
|
|
|
free_events(dc->events);
|
|
|
|
|
memcpy(dc, fdc, sizeof(struct divecomputer));
|
|
|
|
|
free(fdc);
|
|
|
|
|
} else {
|
|
|
|
|
struct divecomputer *pdc = ¤t_dive->dc;
|
|
|
|
|
while (pdc->next != dc && pdc->next)
|
|
|
|
|
pdc = pdc->next;
|
|
|
|
|
if (pdc->next == dc) {
|
|
|
|
|
pdc->next = dc->next;
|
|
|
|
|
free_dc(dc);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (dc_number == count_divecomputers())
|
|
|
|
|
dc_number--;
|
|
|
|
|
}
|