2011-09-20 19:40:34 +00:00
|
|
|
/* profile.c */
|
2012-08-26 21:41:05 +00:00
|
|
|
/* creates all the necessary data for drawing the dive profile
|
2011-09-20 19:40:34 +00:00
|
|
|
*/
|
2013-10-06 15:55:58 +00:00
|
|
|
#include "gettext.h"
|
2013-09-25 00:07:07 +00:00
|
|
|
#include <limits.h>
|
2013-10-05 07:29:09 +00:00
|
|
|
#include <string.h>
|
2011-08-31 17:20:46 +00:00
|
|
|
|
|
|
|
#include "dive.h"
|
|
|
|
#include "display.h"
|
2011-09-05 19:12:58 +00:00
|
|
|
#include "divelist.h"
|
2013-05-04 19:41:49 +00:00
|
|
|
|
2013-05-04 22:36:40 +00:00
|
|
|
#include "profile.h"
|
2013-05-30 18:56:00 +00:00
|
|
|
#include "deco.h"
|
2012-11-10 10:40:35 +00:00
|
|
|
#include "libdivecomputer/parser.h"
|
2012-11-29 04:13:21 +00:00
|
|
|
#include "libdivecomputer/version.h"
|
2014-01-19 00:21:13 +00:00
|
|
|
#include "membuffer.h"
|
2011-08-31 17:20:46 +00:00
|
|
|
|
2013-05-16 16:09:06 +00:00
|
|
|
int selected_dive = -1; /* careful: 0 is a valid value */
|
2014-03-17 15:19:09 +00:00
|
|
|
unsigned int dc_number = 0;
|
2011-08-31 18:07:31 +00:00
|
|
|
|
2013-05-03 21:16:09 +00:00
|
|
|
|
2014-03-07 16:31:47 +00:00
|
|
|
static struct plot_data *last_pi_entry_new = NULL;
|
2012-09-11 08:16:34 +00:00
|
|
|
|
2013-12-19 21:11:43 +00:00
|
|
|
#ifdef DEBUG_PI
|
2011-11-04 21:32:15 +00:00
|
|
|
/* debugging tool - not normally used */
|
2014-02-28 04:09:57 +00:00
|
|
|
static void dump_pi(struct plot_info *pi)
|
2011-11-04 21:32:15 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
printf("pi:{nr:%d maxtime:%d meandepth:%d maxdepth:%d \n"
|
2014-02-28 04:09:57 +00:00
|
|
|
" maxpressure:%d mintemp:%d maxtemp:%d\n",
|
|
|
|
pi->nr, pi->maxtime, pi->meandepth, pi->maxdepth,
|
|
|
|
pi->maxpressure, pi->mintemp, pi->maxtemp);
|
2012-12-01 21:02:30 +00:00
|
|
|
for (i = 0; i < pi->nr; i++) {
|
|
|
|
struct plot_data *entry = &pi->entry[i];
|
Fix overly complicated and fragile "same_cylinder" logic
The plot-info per-event 'same_cylinder' logic was fragile, and caused
us to not print the beginning pressure of the first cylinder.
In particular, there was a nasty interaction with not all plot entries
having pressures, and the whole logic that avoid some of the early
plot entries because they are fake entries that are just there to make
sure that we don't step off the edge of the world. When we then only
do certain things on the particular entries that don't have the same
cylinder as the last plot entry, things don't always happen like they
should.
Fix this by:
- get rid of the computed "same_cylinder" state entirely. All the
cases where we use it, we might as well just look at what the last
cylinder we used was, and thus "same_cylinder" is just about testing
the current cylinder index against that last index.
- get rid of some of the edge conditions by just writing the loops
more clearly, so that they simply don't have special cases. For
example, instead of setting some "last_pressure" for a cylinder at
cylinder changes, just set the damn thing on every single sample. The
last pressure will automatically be the pressure we set last! The code
is simpler and more straightforward.
So this simplifies the code and just makes it less fragile - it
doesn't matter if the cylinder change happens to happen at a sample
that doesn't have a pressure reading, for example, because we no
longer care so deeply about exactly which sample the cylinder change
happens at. As a result, the bug Mika noticed just goes away.
Reported-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-25 01:55:48 +00:00
|
|
|
printf(" entry[%d]:{cylinderindex:%d sec:%d pressure:{%d,%d}\n"
|
2014-02-28 04:09:57 +00:00
|
|
|
" time:%d:%02d temperature:%d depth:%d stopdepth:%d stoptime:%d ndl:%d smoothed:%d po2:%lf phe:%lf pn2:%lf sum-pp %lf}\n",
|
|
|
|
i, entry->cylinderindex, entry->sec,
|
|
|
|
entry->pressure[0], entry->pressure[1],
|
|
|
|
entry->sec / 60, entry->sec % 60,
|
|
|
|
entry->temperature, entry->depth, entry->stopdepth, entry->stoptime, entry->ndl, entry->smoothed,
|
|
|
|
entry->po2, entry->phe, entry->pn2,
|
|
|
|
entry->po2 + entry->phe + entry->pn2);
|
2012-12-01 21:02:30 +00:00
|
|
|
}
|
2011-11-04 21:32:15 +00:00
|
|
|
printf(" }\n");
|
|
|
|
}
|
2013-12-19 21:11:43 +00:00
|
|
|
#endif
|
2011-11-04 21:32:15 +00:00
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
#define ROUND_UP(x, y) ((((x) + (y) - 1) / (y)) * (y))
|
|
|
|
#define DIV_UP(x, y) (((x) + (y) - 1) / (y))
|
2013-05-03 18:04:51 +00:00
|
|
|
|
2011-08-31 21:35:31 +00:00
|
|
|
/*
|
|
|
|
* When showing dive profiles, we scale things to the
|
|
|
|
* current dive. However, we don't scale past less than
|
|
|
|
* 30 minutes or 90 ft, just so that small dives show
|
2012-06-11 00:45:36 +00:00
|
|
|
* up as such unless zoom is enabled.
|
|
|
|
* We also need to add 180 seconds at the end so the min/max
|
2011-09-16 23:22:00 +00:00
|
|
|
* plots correctly
|
2011-08-31 21:35:31 +00:00
|
|
|
*/
|
2013-05-03 21:16:09 +00:00
|
|
|
int get_maxtime(struct plot_info *pi)
|
2011-08-31 21:15:50 +00:00
|
|
|
{
|
2011-09-16 15:20:06 +00:00
|
|
|
int seconds = pi->maxtime;
|
2014-02-27 15:31:00 +00:00
|
|
|
if (prefs.zoomed_plot) {
|
2012-06-11 00:45:36 +00:00
|
|
|
/* Rounded up to one minute, with at least 2.5 minutes to
|
|
|
|
* spare.
|
|
|
|
* For dive times shorter than 10 minutes, we use seconds/4 to
|
|
|
|
* calculate the space dynamically.
|
|
|
|
* This is seamless since 600/4 = 150.
|
|
|
|
*/
|
2013-01-29 21:10:46 +00:00
|
|
|
if (seconds < 600)
|
2014-02-28 04:09:57 +00:00
|
|
|
return ROUND_UP(seconds + seconds / 4, 60);
|
2012-06-11 00:45:36 +00:00
|
|
|
else
|
2014-02-28 04:09:57 +00:00
|
|
|
return ROUND_UP(seconds + 150, 60);
|
2012-06-09 20:40:12 +00:00
|
|
|
} else {
|
|
|
|
/* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */
|
2014-02-28 04:09:57 +00:00
|
|
|
return MAX(30 * 60, ROUND_UP(seconds + 150, 60 * 5));
|
2012-06-09 20:40:12 +00:00
|
|
|
}
|
2011-08-31 21:15:50 +00:00
|
|
|
}
|
|
|
|
|
2012-11-01 18:44:18 +00:00
|
|
|
/* get the maximum depth to which we want to plot
|
2013-12-31 22:32:15 +00:00
|
|
|
* take into account the additional vertical space needed to plot
|
2012-11-01 18:44:18 +00:00
|
|
|
* partial pressure graphs */
|
2013-05-03 21:16:09 +00:00
|
|
|
int get_maxdepth(struct plot_info *pi)
|
2011-08-31 21:15:50 +00:00
|
|
|
{
|
2011-09-16 16:10:13 +00:00
|
|
|
unsigned mm = pi->maxdepth;
|
2012-11-01 18:44:18 +00:00
|
|
|
int md;
|
|
|
|
|
2014-02-27 15:31:00 +00:00
|
|
|
if (prefs.zoomed_plot) {
|
2012-06-11 00:45:36 +00:00
|
|
|
/* Rounded up to 10m, with at least 3m to spare */
|
2014-02-28 04:09:57 +00:00
|
|
|
md = ROUND_UP(mm + 3000, 10000);
|
2012-06-11 00:45:36 +00:00
|
|
|
} else {
|
|
|
|
/* Minimum 30m, rounded up to 10m, with at least 3m to spare */
|
2014-02-28 04:09:57 +00:00
|
|
|
md = MAX((unsigned)30000, ROUND_UP(mm + 3000, 10000));
|
2012-11-01 18:44:18 +00:00
|
|
|
}
|
2013-01-13 12:02:37 +00:00
|
|
|
md += pi->maxpp * 9000;
|
2012-11-01 18:44:18 +00:00
|
|
|
return md;
|
2011-08-31 21:15:50 +00:00
|
|
|
}
|
|
|
|
|
2012-11-09 20:38:00 +00:00
|
|
|
/* collect all event names and whether we display them */
|
2013-05-06 21:58:18 +00:00
|
|
|
struct ev_select *ev_namelist;
|
|
|
|
int evn_allocated;
|
|
|
|
int evn_used;
|
2011-10-25 07:29:19 +00:00
|
|
|
|
2013-10-09 07:14:39 +00:00
|
|
|
#if WE_DONT_USE_THIS /* we need to implement event filters in Qt */
|
2014-02-28 04:09:57 +00:00
|
|
|
int evn_foreach(void (*callback)(const char *, bool *, void *), void *data) {
|
2011-10-25 09:51:16 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < evn_used; i++) {
|
2012-10-21 18:34:11 +00:00
|
|
|
/* here we display an event name on screen - so translate */
|
2014-02-28 04:09:57 +00:00
|
|
|
callback(translate("gettextFromC", ev_namelist[i].ev_name), &ev_namelist[i].plot_ev, data);
|
2011-10-25 09:51:16 +00:00
|
|
|
}
|
2013-02-25 21:38:01 +00:00
|
|
|
return i;
|
2011-10-25 09:51:16 +00:00
|
|
|
}
|
2013-10-09 07:14:39 +00:00
|
|
|
#endif /* WE_DONT_USE_THIS */
|
2011-10-25 09:51:16 +00:00
|
|
|
|
2013-01-31 13:07:04 +00:00
|
|
|
void clear_events(void)
|
|
|
|
{
|
|
|
|
evn_used = 0;
|
|
|
|
}
|
|
|
|
|
2011-10-25 07:29:19 +00:00
|
|
|
void remember_event(const char *eventname)
|
|
|
|
{
|
2012-11-09 20:38:00 +00:00
|
|
|
int i = 0, len;
|
2011-10-25 07:29:19 +00:00
|
|
|
|
|
|
|
if (!eventname || (len = strlen(eventname)) == 0)
|
|
|
|
return;
|
|
|
|
while (i < evn_used) {
|
2012-11-09 20:38:00 +00:00
|
|
|
if (!strncmp(eventname, ev_namelist[i].ev_name, len))
|
2011-10-25 07:29:19 +00:00
|
|
|
return;
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
if (evn_used == evn_allocated) {
|
|
|
|
evn_allocated += 10;
|
|
|
|
ev_namelist = realloc(ev_namelist, evn_allocated * sizeof(struct ev_select));
|
2014-02-28 04:09:57 +00:00
|
|
|
if (!ev_namelist)
|
2011-10-25 07:29:19 +00:00
|
|
|
/* we are screwed, but let's just bail out */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ev_namelist[evn_used].ev_name = strdup(eventname);
|
2014-01-15 18:54:41 +00:00
|
|
|
ev_namelist[evn_used].plot_ev = true;
|
2011-10-25 07:29:19 +00:00
|
|
|
evn_used++;
|
|
|
|
}
|
|
|
|
|
2013-02-25 23:23:16 +00:00
|
|
|
/* Get local sac-rate (in ml/min) between entry1 and entry2 */
|
2013-10-14 21:48:43 +00:00
|
|
|
static int get_local_sac(struct plot_data *entry1, struct plot_data *entry2, struct dive *dive)
|
2013-02-21 02:57:50 +00:00
|
|
|
{
|
|
|
|
int index = entry1->cylinderindex;
|
2013-02-25 23:23:16 +00:00
|
|
|
cylinder_t *cyl;
|
|
|
|
int duration = entry2->sec - entry1->sec;
|
|
|
|
int depth, airuse;
|
|
|
|
pressure_t a, b;
|
|
|
|
double atm;
|
2013-02-21 02:57:50 +00:00
|
|
|
|
|
|
|
if (entry2->cylinderindex != index)
|
|
|
|
return 0;
|
2013-02-25 23:23:16 +00:00
|
|
|
if (duration <= 0)
|
2013-02-21 02:57:50 +00:00
|
|
|
return 0;
|
2013-02-25 23:23:16 +00:00
|
|
|
a.mbar = GET_PRESSURE(entry1);
|
|
|
|
b.mbar = GET_PRESSURE(entry2);
|
2014-04-26 17:55:17 +00:00
|
|
|
if (!b.mbar || a.mbar <= b.mbar)
|
2013-02-21 02:57:50 +00:00
|
|
|
return 0;
|
|
|
|
|
2013-02-25 23:23:16 +00:00
|
|
|
/* Mean pressure in ATM */
|
|
|
|
depth = (entry1->depth + entry2->depth) / 2;
|
2014-02-11 21:08:29 +00:00
|
|
|
atm = depth_to_atm(depth, dive);
|
2013-02-21 02:57:50 +00:00
|
|
|
|
2013-02-25 23:23:16 +00:00
|
|
|
cyl = dive->cylinder + index;
|
|
|
|
|
|
|
|
airuse = gas_volume(cyl, a) - gas_volume(cyl, b);
|
|
|
|
|
|
|
|
/* milliliters per minute */
|
|
|
|
return airuse / atm * 60 / duration;
|
2013-02-21 02:57:50 +00:00
|
|
|
}
|
|
|
|
|
2011-09-08 15:33:02 +00:00
|
|
|
static void analyze_plot_info_minmax_minute(struct plot_data *entry, struct plot_data *first, struct plot_data *last, int index)
|
|
|
|
{
|
|
|
|
struct plot_data *p = entry;
|
|
|
|
int time = entry->sec;
|
2014-02-28 04:09:57 +00:00
|
|
|
int seconds = 90 * (index + 1);
|
2011-09-08 22:59:04 +00:00
|
|
|
struct plot_data *min, *max;
|
|
|
|
int avg, nr;
|
2011-09-08 15:33:02 +00:00
|
|
|
|
|
|
|
/* Go back 'seconds' in time */
|
|
|
|
while (p > first) {
|
|
|
|
if (p[-1].sec < time - seconds)
|
|
|
|
break;
|
|
|
|
p--;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Then go forward until we hit an entry past the time */
|
2011-09-08 22:59:04 +00:00
|
|
|
min = max = p;
|
2011-10-23 05:40:53 +00:00
|
|
|
avg = p->depth;
|
2011-09-08 15:33:02 +00:00
|
|
|
nr = 1;
|
|
|
|
while (++p < last) {
|
2011-10-23 05:40:53 +00:00
|
|
|
int depth = p->depth;
|
2011-09-08 15:33:02 +00:00
|
|
|
if (p->sec > time + seconds)
|
|
|
|
break;
|
2011-10-23 05:40:53 +00:00
|
|
|
avg += depth;
|
2014-02-28 04:09:57 +00:00
|
|
|
nr++;
|
2011-10-23 05:40:53 +00:00
|
|
|
if (depth < min->depth)
|
2011-09-08 22:59:04 +00:00
|
|
|
min = p;
|
2011-10-23 05:40:53 +00:00
|
|
|
if (depth > max->depth)
|
2011-09-08 22:59:04 +00:00
|
|
|
max = p;
|
2011-09-08 15:33:02 +00:00
|
|
|
}
|
|
|
|
entry->min[index] = min;
|
|
|
|
entry->max[index] = max;
|
2014-02-28 04:09:57 +00:00
|
|
|
entry->avg[index] = (avg + nr / 2) / nr;
|
2011-09-08 15:33:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void analyze_plot_info_minmax(struct plot_data *entry, struct plot_data *first, struct plot_data *last)
|
|
|
|
{
|
|
|
|
analyze_plot_info_minmax_minute(entry, first, last, 0);
|
|
|
|
analyze_plot_info_minmax_minute(entry, first, last, 1);
|
|
|
|
analyze_plot_info_minmax_minute(entry, first, last, 2);
|
|
|
|
}
|
|
|
|
|
2011-09-17 04:45:32 +00:00
|
|
|
static velocity_t velocity(int speed)
|
|
|
|
{
|
|
|
|
velocity_t v;
|
|
|
|
|
|
|
|
if (speed < -304) /* ascent faster than -60ft/min */
|
|
|
|
v = CRAZY;
|
|
|
|
else if (speed < -152) /* above -30ft/min */
|
|
|
|
v = FAST;
|
|
|
|
else if (speed < -76) /* -15ft/min */
|
|
|
|
v = MODERATE;
|
|
|
|
else if (speed < -25) /* -5ft/min */
|
|
|
|
v = SLOW;
|
|
|
|
else if (speed < 25) /* very hard to find data, but it appears that the recommendations
|
2012-08-26 21:41:05 +00:00
|
|
|
for descent are usually about 2x ascent rate; still, we want
|
2011-09-17 04:45:32 +00:00
|
|
|
stable to mean stable */
|
|
|
|
v = STABLE;
|
|
|
|
else if (speed < 152) /* between 5 and 30ft/min is considered slow */
|
|
|
|
v = SLOW;
|
|
|
|
else if (speed < 304) /* up to 60ft/min is moderate */
|
|
|
|
v = MODERATE;
|
|
|
|
else if (speed < 507) /* up to 100ft/min is fast */
|
|
|
|
v = FAST;
|
|
|
|
else /* more than that is just crazy - you'll blow your ears out */
|
|
|
|
v = CRAZY;
|
|
|
|
|
|
|
|
return v;
|
|
|
|
}
|
2013-05-03 18:04:51 +00:00
|
|
|
|
2014-01-14 18:43:58 +00:00
|
|
|
struct plot_info *analyze_plot_info(struct plot_info *pi)
|
2011-09-08 15:33:02 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int nr = pi->nr;
|
|
|
|
|
|
|
|
/* Smoothing function: 5-point triangular smooth */
|
2011-09-30 05:49:12 +00:00
|
|
|
for (i = 2; i < nr; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
2011-10-23 05:40:53 +00:00
|
|
|
int depth;
|
2011-09-08 15:33:02 +00:00
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
if (i < nr - 2) {
|
|
|
|
depth = entry[-2].depth + 2 * entry[-1].depth + 3 * entry[0].depth + 2 * entry[1].depth + entry[2].depth;
|
|
|
|
entry->smoothed = (depth + 4) / 9;
|
2011-09-16 23:22:00 +00:00
|
|
|
}
|
|
|
|
/* vertical velocity in mm/sec */
|
2011-09-17 04:45:32 +00:00
|
|
|
/* Linus wants to smooth this - let's at least look at the samples that aren't FAST or CRAZY */
|
2011-09-16 23:22:00 +00:00
|
|
|
if (entry[0].sec - entry[-1].sec) {
|
2013-09-25 00:07:07 +00:00
|
|
|
entry->speed = (entry[0].depth - entry[-1].depth) / (entry[0].sec - entry[-1].sec);
|
|
|
|
entry->velocity = velocity(entry->speed);
|
2013-05-31 06:21:39 +00:00
|
|
|
/* if our samples are short and we aren't too FAST*/
|
2011-09-30 05:49:12 +00:00
|
|
|
if (entry[0].sec - entry[-1].sec < 15 && entry->velocity < FAST) {
|
2011-09-17 04:45:32 +00:00
|
|
|
int past = -2;
|
2014-02-28 04:09:57 +00:00
|
|
|
while (i + past > 0 && entry[0].sec - entry[past].sec < 15)
|
2011-09-17 04:45:32 +00:00
|
|
|
past--;
|
2012-08-26 21:41:05 +00:00
|
|
|
entry->velocity = velocity((entry[0].depth - entry[past].depth) /
|
2014-02-28 04:09:57 +00:00
|
|
|
(entry[0].sec - entry[past].sec));
|
2011-09-17 04:45:32 +00:00
|
|
|
}
|
2013-01-29 21:10:46 +00:00
|
|
|
} else {
|
2011-09-16 23:22:00 +00:00
|
|
|
entry->velocity = STABLE;
|
2013-09-25 00:07:07 +00:00
|
|
|
entry->speed = 0;
|
2013-01-29 21:10:46 +00:00
|
|
|
}
|
2011-09-08 15:33:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* One-, two- and three-minute minmax data */
|
|
|
|
for (i = 0; i < nr; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
|
|
|
analyze_plot_info_minmax(entry, pi->entry, pi->entry + nr);
|
2011-09-08 15:33:02 +00:00
|
|
|
}
|
2012-08-26 21:41:05 +00:00
|
|
|
|
2011-09-08 15:33:02 +00:00
|
|
|
return pi;
|
|
|
|
}
|
|
|
|
|
2011-10-22 02:04:44 +00:00
|
|
|
/*
|
|
|
|
* simple structure to track the beginning and end tank pressure as
|
|
|
|
* well as the integral of depth over time spent while we have no
|
|
|
|
* pressure reading from the tank */
|
|
|
|
typedef struct pr_track_struct pr_track_t;
|
|
|
|
struct pr_track_struct {
|
|
|
|
int start;
|
|
|
|
int end;
|
|
|
|
int t_start;
|
|
|
|
int t_end;
|
Do pressure-time integral using integer values
Now that the pressure_time calculations are done in our "native"
integer units (millibar and seconds), we might as well keep using
integer variables.
We still do floating point calculations at various stages for the
conversions (including turning a depth in mm into a pressure in mbar),
so it's not like this avoids floating point per se. And the final
approximation is still done as a fraction of the pressure-time values,
using floating point. So floating point is very much involved, but
it's used for conversions, not (for example) to sum up lots of small
values.
With floating point, I had to think about the dynamic range in order
to convince myself that summing up small values will not subtly lose
precision.
With integers, those kinds of issues do not exist. The "lost
precision" case is not subtle, it would be a very obvious overflow,
and it's easy to think about. It turns out that for the pressure-time
integral to overflow in "just" 31 bits, we'd have to have pressures
and times that aren't even close to the range of scuba cylinder air
use (eg "spend more than a day at a depth of 200+ m").
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-07 07:58:33 +00:00
|
|
|
int pressure_time;
|
2011-10-22 02:04:44 +00:00
|
|
|
pr_track_t *next;
|
|
|
|
};
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
static pr_track_t *pr_track_alloc(int start, int t_start)
|
|
|
|
{
|
2011-10-22 02:04:44 +00:00
|
|
|
pr_track_t *pt = malloc(sizeof(pr_track_t));
|
|
|
|
pt->start = start;
|
|
|
|
pt->end = 0;
|
2013-03-28 19:03:00 +00:00
|
|
|
pt->t_start = pt->t_end = t_start;
|
Do pressure-time integral using integer values
Now that the pressure_time calculations are done in our "native"
integer units (millibar and seconds), we might as well keep using
integer variables.
We still do floating point calculations at various stages for the
conversions (including turning a depth in mm into a pressure in mbar),
so it's not like this avoids floating point per se. And the final
approximation is still done as a fraction of the pressure-time values,
using floating point. So floating point is very much involved, but
it's used for conversions, not (for example) to sum up lots of small
values.
With floating point, I had to think about the dynamic range in order
to convince myself that summing up small values will not subtly lose
precision.
With integers, those kinds of issues do not exist. The "lost
precision" case is not subtle, it would be a very obvious overflow,
and it's easy to think about. It turns out that for the pressure-time
integral to overflow in "just" 31 bits, we'd have to have pressures
and times that aren't even close to the range of scuba cylinder air
use (eg "spend more than a day at a depth of 200+ m").
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-07 07:58:33 +00:00
|
|
|
pt->pressure_time = 0;
|
2011-10-22 02:04:44 +00:00
|
|
|
pt->next = NULL;
|
|
|
|
return pt;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* poor man's linked list */
|
|
|
|
static pr_track_t *list_last(pr_track_t *list)
|
|
|
|
{
|
|
|
|
pr_track_t *tail = list;
|
|
|
|
if (!tail)
|
|
|
|
return NULL;
|
|
|
|
while (tail->next) {
|
|
|
|
tail = tail->next;
|
|
|
|
}
|
|
|
|
return tail;
|
|
|
|
}
|
|
|
|
|
|
|
|
static pr_track_t *list_add(pr_track_t *list, pr_track_t *element)
|
|
|
|
{
|
|
|
|
pr_track_t *tail = list_last(list);
|
|
|
|
if (!tail)
|
|
|
|
return element;
|
|
|
|
tail->next = element;
|
|
|
|
return list;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void list_free(pr_track_t *list)
|
|
|
|
{
|
|
|
|
if (!list)
|
|
|
|
return;
|
|
|
|
list_free(list->next);
|
|
|
|
free(list);
|
|
|
|
}
|
|
|
|
|
2013-12-19 21:11:43 +00:00
|
|
|
#ifdef DEBUG_PR_TRACK
|
2011-11-21 20:29:16 +00:00
|
|
|
static void dump_pr_track(pr_track_t **track_pr)
|
|
|
|
{
|
|
|
|
int cyl;
|
|
|
|
pr_track_t *list;
|
|
|
|
|
|
|
|
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
|
|
|
|
list = track_pr[cyl];
|
|
|
|
while (list) {
|
Do pressure-time integral using integer values
Now that the pressure_time calculations are done in our "native"
integer units (millibar and seconds), we might as well keep using
integer variables.
We still do floating point calculations at various stages for the
conversions (including turning a depth in mm into a pressure in mbar),
so it's not like this avoids floating point per se. And the final
approximation is still done as a fraction of the pressure-time values,
using floating point. So floating point is very much involved, but
it's used for conversions, not (for example) to sum up lots of small
values.
With floating point, I had to think about the dynamic range in order
to convince myself that summing up small values will not subtly lose
precision.
With integers, those kinds of issues do not exist. The "lost
precision" case is not subtle, it would be a very obvious overflow,
and it's easy to think about. It turns out that for the pressure-time
integral to overflow in "just" 31 bits, we'd have to have pressures
and times that aren't even close to the range of scuba cylinder air
use (eg "spend more than a day at a depth of 200+ m").
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-07 07:58:33 +00:00
|
|
|
printf("cyl%d: start %d end %d t_start %d t_end %d pt %d\n", cyl,
|
2014-02-28 04:09:57 +00:00
|
|
|
list->start, list->end, list->t_start, list->t_end, list->pressure_time);
|
2011-11-21 20:29:16 +00:00
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-12-19 21:11:43 +00:00
|
|
|
#endif
|
2011-11-21 20:29:16 +00:00
|
|
|
|
2013-12-31 22:32:16 +00:00
|
|
|
typedef struct pr_interpolate_struct pr_interpolate_t;
|
|
|
|
struct pr_interpolate_struct {
|
|
|
|
int start;
|
|
|
|
int end;
|
|
|
|
int pressure_time;
|
2014-01-01 12:35:16 +00:00
|
|
|
int acc_pressure_time;
|
2013-12-31 22:32:16 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef DEBUG_PR_INTERPOLATE
|
2014-01-01 12:35:16 +00:00
|
|
|
static void dump_pr_interpolate(int i, pr_interpolate_t interpolate_pr)
|
2013-12-31 22:32:16 +00:00
|
|
|
{
|
2014-01-08 13:00:30 +00:00
|
|
|
printf("Interpolate for entry %d: start %d - end %d - pt %d - acc_pt %d\n", i,
|
|
|
|
interpolate_pr.start, interpolate_pr.end, interpolate_pr.pressure_time, interpolate_pr.acc_pressure_time);
|
2013-12-31 22:32:16 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2013-01-07 02:20:12 +00:00
|
|
|
/*
|
|
|
|
* This looks at the pressures for one cylinder, and
|
|
|
|
* calculates any missing beginning/end pressures for
|
|
|
|
* each segment by taking the over-all SAC-rate into
|
|
|
|
* account for that cylinder.
|
|
|
|
*
|
|
|
|
* NOTE! Many segments have full pressure information
|
|
|
|
* (both beginning and ending pressure). But if we have
|
|
|
|
* switched away from a cylinder, we will have the
|
|
|
|
* beginning pressure for the first segment with a
|
|
|
|
* missing end pressure. We may then have one or more
|
|
|
|
* segments without beginning or end pressures, until
|
|
|
|
* we finally have a segment with an end pressure.
|
|
|
|
*
|
|
|
|
* We want to spread out the pressure over these missing
|
|
|
|
* segments according to how big of a time_pressure area
|
|
|
|
* they have.
|
|
|
|
*/
|
|
|
|
static void fill_missing_segment_pressures(pr_track_t *list)
|
|
|
|
{
|
|
|
|
while (list) {
|
|
|
|
int start = list->start, end;
|
|
|
|
pr_track_t *tmp = list;
|
Do pressure-time integral using integer values
Now that the pressure_time calculations are done in our "native"
integer units (millibar and seconds), we might as well keep using
integer variables.
We still do floating point calculations at various stages for the
conversions (including turning a depth in mm into a pressure in mbar),
so it's not like this avoids floating point per se. And the final
approximation is still done as a fraction of the pressure-time values,
using floating point. So floating point is very much involved, but
it's used for conversions, not (for example) to sum up lots of small
values.
With floating point, I had to think about the dynamic range in order
to convince myself that summing up small values will not subtly lose
precision.
With integers, those kinds of issues do not exist. The "lost
precision" case is not subtle, it would be a very obvious overflow,
and it's easy to think about. It turns out that for the pressure-time
integral to overflow in "just" 31 bits, we'd have to have pressures
and times that aren't even close to the range of scuba cylinder air
use (eg "spend more than a day at a depth of 200+ m").
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-07 07:58:33 +00:00
|
|
|
int pt_sum = 0, pt = 0;
|
2013-01-07 02:20:12 +00:00
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
pt_sum += tmp->pressure_time;
|
|
|
|
end = tmp->end;
|
|
|
|
if (end)
|
|
|
|
break;
|
|
|
|
end = start;
|
|
|
|
if (!tmp->next)
|
|
|
|
break;
|
|
|
|
tmp = tmp->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!start)
|
|
|
|
start = end;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now 'start' and 'end' contain the pressure values
|
|
|
|
* for the set of segments described by 'list'..'tmp'.
|
|
|
|
* pt_sum is the sum of all the pressure-times of the
|
|
|
|
* segments.
|
|
|
|
*
|
|
|
|
* Now dole out the pressures relative to pressure-time.
|
|
|
|
*/
|
|
|
|
list->start = start;
|
|
|
|
tmp->end = end;
|
|
|
|
for (;;) {
|
|
|
|
int pressure;
|
|
|
|
pt += list->pressure_time;
|
|
|
|
pressure = start;
|
|
|
|
if (pt_sum)
|
2014-02-28 04:09:57 +00:00
|
|
|
pressure -= (start - end) * (double)pt / pt_sum;
|
2013-01-07 02:20:12 +00:00
|
|
|
list->end = pressure;
|
2014-01-01 12:35:16 +00:00
|
|
|
if (list == tmp)
|
2013-01-07 02:20:12 +00:00
|
|
|
break;
|
|
|
|
list = list->next;
|
|
|
|
list->start = pressure;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Ok, we've done that set of segments */
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* What's the pressure-time between two plot data entries?
|
|
|
|
* We're calculating the integral of pressure over time by
|
|
|
|
* adding these up.
|
Don't bother with "correct" units for the pressure_time calculation
I fixed the pressure-time calculations to use "proper" units, but
thinking about it some more, it turns out that units don't really
matter. As long as we use the *same* unit for calculating the
integral, and then re-calculating the step-wise entries, the units
will cancel out.
So we can simplify the "pressure_time()" function a bit, and use
whatever units are most natural for our internal representation. So
instead of using atm, use "mbar".
Now, since the units don't matter, this patch doesn't really make much
of a difference conceptually. Sure, it's a slightly simpler function,
but maybe using more "natural" units for it would be worth it. But it
turns out that using milli-bar and seconds has an advantage: we could
do all the pressure_time integral using 32-bit integers, and we'd
still be able to represent values that would be equivalent to staying
at 24 bar for a whole day.
This patch doesn't actually change the code to use integers, but with
this unit choice, we at least have that possibility.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-07 07:33:42 +00:00
|
|
|
*
|
|
|
|
* The units won't matter as long as everybody agrees about
|
|
|
|
* them, since they'll cancel out - we use this to calculate
|
|
|
|
* a constant SAC-rate-equivalent, but we only use it to
|
|
|
|
* scale pressures, so it ends up being a unitless scaling
|
|
|
|
* factor.
|
2013-01-07 02:20:12 +00:00
|
|
|
*/
|
2013-02-08 20:49:12 +00:00
|
|
|
static inline int pressure_time(struct dive *dive, struct divecomputer *dc, struct plot_data *a, struct plot_data *b)
|
2013-01-07 02:20:12 +00:00
|
|
|
{
|
|
|
|
int time = b->sec - a->sec;
|
2014-02-28 04:09:57 +00:00
|
|
|
int depth = (a->depth + b->depth) / 2;
|
2013-01-07 02:20:12 +00:00
|
|
|
|
2014-01-01 12:35:16 +00:00
|
|
|
if (depth <= SURFACE_THRESHOLD)
|
|
|
|
return 0;
|
|
|
|
|
2013-02-09 00:15:18 +00:00
|
|
|
return depth_to_mbar(depth, dive) * time;
|
2013-01-07 02:20:12 +00:00
|
|
|
}
|
|
|
|
|
2013-12-31 22:32:16 +00:00
|
|
|
static struct pr_interpolate_struct get_pr_interpolate_data(pr_track_t *segment, struct plot_info *pi, int cur)
|
|
|
|
{
|
|
|
|
struct pr_interpolate_struct interpolate;
|
|
|
|
int i;
|
2014-01-01 12:35:16 +00:00
|
|
|
struct plot_data *entry;
|
2013-12-31 22:32:16 +00:00
|
|
|
|
|
|
|
interpolate.start = segment->start;
|
|
|
|
interpolate.end = segment->end;
|
|
|
|
interpolate.acc_pressure_time = 0;
|
|
|
|
interpolate.pressure_time = 0;
|
|
|
|
|
|
|
|
for (i = 0; i < pi->nr; i++) {
|
|
|
|
entry = pi->entry + i;
|
|
|
|
if (entry->sec < segment->t_start)
|
|
|
|
continue;
|
|
|
|
if (entry->sec >= segment->t_end) {
|
|
|
|
interpolate.pressure_time += entry->pressure_time;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (entry->sec == segment->t_start) {
|
|
|
|
interpolate.acc_pressure_time = 0;
|
|
|
|
interpolate.pressure_time = 0;
|
|
|
|
if (SENSOR_PRESSURE(entry))
|
|
|
|
interpolate.start = SENSOR_PRESSURE(entry);
|
2014-01-01 12:35:16 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (i < cur) {
|
2013-12-31 22:32:16 +00:00
|
|
|
if (SENSOR_PRESSURE(entry)) {
|
|
|
|
interpolate.start = SENSOR_PRESSURE(entry);
|
|
|
|
interpolate.acc_pressure_time = 0;
|
|
|
|
interpolate.pressure_time = 0;
|
|
|
|
} else {
|
|
|
|
interpolate.acc_pressure_time += entry->pressure_time;
|
|
|
|
interpolate.pressure_time += entry->pressure_time;
|
|
|
|
}
|
2014-01-01 12:35:16 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (i == cur) {
|
2013-12-31 22:32:16 +00:00
|
|
|
interpolate.acc_pressure_time += entry->pressure_time;
|
|
|
|
interpolate.pressure_time += entry->pressure_time;
|
2014-01-01 12:35:16 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
interpolate.pressure_time += entry->pressure_time;
|
|
|
|
if (SENSOR_PRESSURE(entry)) {
|
|
|
|
interpolate.end = SENSOR_PRESSURE(entry);
|
|
|
|
break;
|
2013-12-31 22:32:16 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return interpolate;
|
|
|
|
}
|
|
|
|
|
2013-01-07 02:20:12 +00:00
|
|
|
static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi, pr_track_t **track_pr)
|
2011-10-22 02:04:44 +00:00
|
|
|
{
|
|
|
|
int cyl, i;
|
|
|
|
struct plot_data *entry;
|
|
|
|
int cur_pr[MAX_CYLINDERS];
|
|
|
|
|
2013-12-19 21:11:43 +00:00
|
|
|
#ifdef DEBUG_PR_TRACK
|
|
|
|
/* another great debugging tool */
|
|
|
|
dump_pr_track(track_pr);
|
|
|
|
#endif
|
2011-10-22 02:04:44 +00:00
|
|
|
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
|
2014-03-07 00:16:10 +00:00
|
|
|
if (!track_pr[cyl]) {
|
|
|
|
/* no segment where this cylinder is used */
|
|
|
|
cur_pr[cyl] = -1;
|
2013-03-28 19:03:00 +00:00
|
|
|
continue;
|
2014-03-07 00:16:10 +00:00
|
|
|
}
|
2013-01-07 02:20:12 +00:00
|
|
|
fill_missing_segment_pressures(track_pr[cyl]);
|
2011-10-22 02:04:44 +00:00
|
|
|
cur_pr[cyl] = track_pr[cyl]->start;
|
|
|
|
}
|
2011-10-29 22:57:26 +00:00
|
|
|
|
2011-11-04 22:34:30 +00:00
|
|
|
/* The first two are "fillers", but in case we don't have a sample
|
|
|
|
* at time 0 we need to process the second of them here */
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
2013-12-31 22:32:16 +00:00
|
|
|
double magic;
|
2013-01-07 02:20:12 +00:00
|
|
|
pr_track_t *segment;
|
2014-01-01 12:35:16 +00:00
|
|
|
pr_interpolate_t interpolate;
|
2013-01-07 02:20:12 +00:00
|
|
|
|
2011-10-29 21:09:27 +00:00
|
|
|
entry = pi->entry + i;
|
2013-01-07 02:20:12 +00:00
|
|
|
cyl = entry->cylinderindex;
|
|
|
|
|
2011-10-22 02:04:44 +00:00
|
|
|
if (SENSOR_PRESSURE(entry)) {
|
2013-01-07 02:20:12 +00:00
|
|
|
cur_pr[cyl] = SENSOR_PRESSURE(entry);
|
|
|
|
continue;
|
2011-10-22 02:04:44 +00:00
|
|
|
}
|
2013-01-07 02:20:12 +00:00
|
|
|
|
2014-01-01 12:35:16 +00:00
|
|
|
/* Find the right pressure segment for this entry.. */
|
2013-01-07 02:20:12 +00:00
|
|
|
segment = track_pr[cyl];
|
|
|
|
while (segment && segment->t_end < entry->sec)
|
|
|
|
segment = segment->next;
|
|
|
|
|
|
|
|
/* No (or empty) segment? Just use our current pressure */
|
|
|
|
if (!segment || !segment->pressure_time) {
|
|
|
|
SENSOR_PRESSURE(entry) = cur_pr[cyl];
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2014-01-01 12:35:16 +00:00
|
|
|
interpolate = get_pr_interpolate_data(segment, pi, i);
|
2013-12-31 22:32:16 +00:00
|
|
|
#ifdef DEBUG_PR_INTERPOLATE
|
2014-01-01 12:35:16 +00:00
|
|
|
dump_pr_interpolate(i, interpolate);
|
2013-12-31 22:32:16 +00:00
|
|
|
#endif
|
2014-01-08 14:51:35 +00:00
|
|
|
/* if this segment has pressure time, calculate a new interpolated pressure */
|
2014-01-08 13:00:30 +00:00
|
|
|
if (interpolate.pressure_time) {
|
|
|
|
/* Overall pressure change over total pressure-time for this segment*/
|
2014-02-28 04:09:57 +00:00
|
|
|
magic = (interpolate.end - interpolate.start) / (double)interpolate.pressure_time;
|
2014-01-08 13:00:30 +00:00
|
|
|
|
|
|
|
/* Use that overall pressure change to update the current pressure */
|
2014-02-12 22:19:53 +00:00
|
|
|
cur_pr[cyl] = rint(interpolate.start + magic * interpolate.acc_pressure_time);
|
2014-01-08 13:00:30 +00:00
|
|
|
}
|
2014-01-08 14:51:35 +00:00
|
|
|
INTERPOLATED_PRESSURE(entry) = cur_pr[cyl];
|
2011-10-22 02:04:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-20 18:52:17 +00:00
|
|
|
int get_cylinder_index(struct dive *dive, struct event *ev)
|
2011-10-23 14:52:45 +00:00
|
|
|
{
|
|
|
|
int i;
|
2013-03-28 16:56:32 +00:00
|
|
|
int best = 0, score = INT_MAX;
|
|
|
|
int target_o2, target_he;
|
2011-10-23 14:52:45 +00:00
|
|
|
|
|
|
|
/*
|
2013-03-28 16:56:32 +00:00
|
|
|
* Crazy gas change events give us odd encoded o2/he in percent.
|
|
|
|
* Decode into our internal permille format.
|
|
|
|
*/
|
|
|
|
target_o2 = (ev->value & 0xFFFF) * 10;
|
|
|
|
target_he = (ev->value >> 16) * 10;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Try to find a cylinder that best matches the target gas
|
|
|
|
* mix.
|
2011-10-23 14:52:45 +00:00
|
|
|
*/
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
cylinder_t *cyl = dive->cylinder + i;
|
2013-03-28 16:56:32 +00:00
|
|
|
int delta_o2, delta_he, distance;
|
|
|
|
|
|
|
|
if (cylinder_nodata(cyl))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
delta_o2 = get_o2(&cyl->gasmix) - target_o2;
|
|
|
|
delta_he = get_he(&cyl->gasmix) - target_he;
|
2013-09-18 07:06:38 +00:00
|
|
|
distance = delta_o2 * delta_o2;
|
|
|
|
|
|
|
|
/* Check the event type to figure out if we should care about the he part.
|
|
|
|
* 11 is SAMPLE_EVENT_GASCHANGE, aka without he
|
|
|
|
* 25 is SAMPLE_EVENT_GASCHANGE2, aka with he
|
|
|
|
*/
|
|
|
|
if (ev->type == 25)
|
|
|
|
distance += delta_he * delta_he;
|
2013-03-28 16:56:32 +00:00
|
|
|
if (distance >= score)
|
|
|
|
continue;
|
|
|
|
score = distance;
|
|
|
|
best = i;
|
2011-10-23 14:52:45 +00:00
|
|
|
}
|
2013-03-28 16:56:32 +00:00
|
|
|
return best;
|
2011-10-23 14:52:45 +00:00
|
|
|
}
|
|
|
|
|
2013-03-28 02:04:46 +00:00
|
|
|
struct event *get_next_event(struct event *event, char *name)
|
2011-10-23 14:52:45 +00:00
|
|
|
{
|
2012-11-09 20:38:00 +00:00
|
|
|
if (!name || !*name)
|
|
|
|
return NULL;
|
2011-10-23 14:52:45 +00:00
|
|
|
while (event) {
|
2012-11-09 20:38:00 +00:00
|
|
|
if (!strcmp(event->name, name))
|
2011-10-23 14:52:45 +00:00
|
|
|
return event;
|
|
|
|
event = event->next;
|
|
|
|
}
|
|
|
|
return event;
|
|
|
|
}
|
|
|
|
|
2014-02-23 16:36:20 +00:00
|
|
|
static int count_events(struct divecomputer *dc)
|
|
|
|
{
|
|
|
|
int result = 0;
|
|
|
|
struct event *ev = dc->events;
|
|
|
|
while (ev != NULL) {
|
|
|
|
result++;
|
|
|
|
ev = ev->next;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2011-10-23 14:52:45 +00:00
|
|
|
static int set_cylinder_index(struct plot_info *pi, int i, int cylinderindex, unsigned int end)
|
|
|
|
{
|
|
|
|
while (i < pi->nr) {
|
2014-02-28 04:09:57 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
2011-10-23 14:52:45 +00:00
|
|
|
if (entry->sec > end)
|
|
|
|
break;
|
|
|
|
if (entry->cylinderindex != cylinderindex) {
|
|
|
|
entry->cylinderindex = cylinderindex;
|
|
|
|
entry->pressure[0] = 0;
|
|
|
|
}
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2012-11-24 02:51:27 +00:00
|
|
|
static void check_gas_change_events(struct dive *dive, struct divecomputer *dc, struct plot_info *pi)
|
2011-10-23 14:52:45 +00:00
|
|
|
{
|
|
|
|
int i = 0, cylinderindex = 0;
|
2012-11-24 02:51:27 +00:00
|
|
|
struct event *ev = get_next_event(dc->events, "gaschange");
|
2011-10-23 14:52:45 +00:00
|
|
|
|
|
|
|
if (!ev)
|
|
|
|
return;
|
|
|
|
|
|
|
|
do {
|
|
|
|
i = set_cylinder_index(pi, i, cylinderindex, ev->time.seconds);
|
|
|
|
cylinderindex = get_cylinder_index(dive, ev);
|
2012-11-09 20:38:00 +00:00
|
|
|
ev = get_next_event(ev->next, "gaschange");
|
2011-10-23 14:52:45 +00:00
|
|
|
} while (ev);
|
|
|
|
set_cylinder_index(pi, i, cylinderindex, ~0u);
|
|
|
|
}
|
|
|
|
|
2014-01-15 15:34:55 +00:00
|
|
|
|
|
|
|
struct plot_info calculate_max_limits_new(struct dive *dive, struct divecomputer *dc)
|
|
|
|
{
|
2014-02-18 03:10:04 +00:00
|
|
|
static struct plot_info pi;
|
2014-01-15 15:34:55 +00:00
|
|
|
int maxdepth = dive->maxdepth.mm;
|
|
|
|
int maxtime = 0;
|
|
|
|
int maxpressure = 0, minpressure = INT_MAX;
|
2014-02-23 22:32:25 +00:00
|
|
|
int maxhr = 0, minhr = INT_MAX;
|
2014-01-15 15:34:55 +00:00
|
|
|
int mintemp = dive->mintemp.mkelvin;
|
|
|
|
int maxtemp = dive->maxtemp.mkelvin;
|
|
|
|
int cyl;
|
|
|
|
|
|
|
|
/* Get the per-cylinder maximum pressure if they are manual */
|
|
|
|
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
|
|
|
|
unsigned int mbar = dive->cylinder[cyl].start.mbar;
|
|
|
|
if (mbar > maxpressure)
|
|
|
|
maxpressure = mbar;
|
2014-04-28 19:47:56 +00:00
|
|
|
if (mbar < minpressure)
|
|
|
|
minpressure = mbar;
|
2014-01-15 15:34:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Then do all the samples from all the dive computers */
|
|
|
|
do {
|
|
|
|
int i = dc->samples;
|
|
|
|
int lastdepth = 0;
|
|
|
|
struct sample *s = dc->sample;
|
|
|
|
|
|
|
|
while (--i >= 0) {
|
|
|
|
int depth = s->depth.mm;
|
|
|
|
int pressure = s->cylinderpressure.mbar;
|
|
|
|
int temperature = s->temperature.mkelvin;
|
2014-02-23 22:32:25 +00:00
|
|
|
int heartbeat = s->heartbeat;
|
2014-01-15 15:34:55 +00:00
|
|
|
|
|
|
|
if (!mintemp && temperature < mintemp)
|
|
|
|
mintemp = temperature;
|
|
|
|
if (temperature > maxtemp)
|
|
|
|
maxtemp = temperature;
|
|
|
|
|
|
|
|
if (pressure && pressure < minpressure)
|
|
|
|
minpressure = pressure;
|
|
|
|
if (pressure > maxpressure)
|
|
|
|
maxpressure = pressure;
|
2014-02-23 22:32:25 +00:00
|
|
|
if (heartbeat > maxhr)
|
|
|
|
maxhr = heartbeat;
|
|
|
|
if (heartbeat < minhr)
|
|
|
|
minhr = heartbeat;
|
2014-01-15 15:34:55 +00:00
|
|
|
|
|
|
|
if (depth > maxdepth)
|
|
|
|
maxdepth = s->depth.mm;
|
|
|
|
if ((depth > SURFACE_THRESHOLD || lastdepth > SURFACE_THRESHOLD) &&
|
|
|
|
s->time.seconds > maxtime)
|
|
|
|
maxtime = s->time.seconds;
|
|
|
|
lastdepth = depth;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
} while ((dc = dc->next) != NULL);
|
|
|
|
|
|
|
|
if (minpressure > maxpressure)
|
|
|
|
minpressure = 0;
|
2014-02-23 22:32:25 +00:00
|
|
|
if (minhr > maxhr)
|
|
|
|
minhr = 0;
|
2014-01-15 15:34:55 +00:00
|
|
|
|
2014-02-10 14:50:45 +00:00
|
|
|
memset(&pi, 0, sizeof(pi));
|
2014-01-15 15:34:55 +00:00
|
|
|
pi.maxdepth = maxdepth;
|
|
|
|
pi.maxtime = maxtime;
|
|
|
|
pi.maxpressure = maxpressure;
|
|
|
|
pi.minpressure = minpressure;
|
2014-02-23 22:32:25 +00:00
|
|
|
pi.minhr = minhr;
|
|
|
|
pi.maxhr = maxhr;
|
2014-01-15 15:34:55 +00:00
|
|
|
pi.mintemp = mintemp;
|
|
|
|
pi.maxtemp = maxtemp;
|
|
|
|
return pi;
|
|
|
|
}
|
|
|
|
|
2014-02-23 16:36:20 +00:00
|
|
|
/* copy the previous entry (we know this exists), update time and depth
|
|
|
|
* and zero out the sensor pressure (since this is a synthetic entry)
|
|
|
|
* increment the entry pointer and the count of synthetic entries. */
|
2014-02-28 04:09:57 +00:00
|
|
|
#define INSERT_ENTRY(_time, _depth) \
|
|
|
|
*entry = entry[-1]; \
|
|
|
|
entry->sec = _time; \
|
|
|
|
entry->depth = _depth; \
|
|
|
|
SENSOR_PRESSURE(entry) = 0; \
|
|
|
|
entry++; \
|
2014-02-23 16:36:20 +00:00
|
|
|
idx++
|
|
|
|
|
2014-01-14 18:43:58 +00:00
|
|
|
struct plot_data *populate_plot_entries(struct dive *dive, struct divecomputer *dc, struct plot_info *pi)
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
{
|
|
|
|
int idx, maxtime, nr, i;
|
2013-11-12 22:00:55 +00:00
|
|
|
int lastdepth, lasttime, lasttemp = 0;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
struct plot_data *plot_data;
|
2014-02-23 16:36:20 +00:00
|
|
|
struct event *ev = dc->events;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
|
2013-02-04 05:21:33 +00:00
|
|
|
maxtime = pi->maxtime;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
|
|
|
|
/*
|
2013-01-07 02:20:12 +00:00
|
|
|
* We want to have a plot_info event at least every 10s (so "maxtime/10+1"),
|
2014-02-23 16:36:20 +00:00
|
|
|
* but samples could be more dense than that (so add in dc->samples). We also
|
|
|
|
* need to have one for every event (so count events and add that) and
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
* additionally we want two surface events around the whole thing (thus the
|
|
|
|
* additional 4).
|
|
|
|
*/
|
2014-02-23 16:36:20 +00:00
|
|
|
nr = dc->samples + 5 + maxtime / 10 + count_events(dc);
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
plot_data = calloc(nr, sizeof(struct plot_data));
|
|
|
|
pi->entry = plot_data;
|
|
|
|
if (!plot_data)
|
|
|
|
return NULL;
|
|
|
|
pi->nr = nr;
|
|
|
|
idx = 2; /* the two extra events at the start */
|
|
|
|
|
|
|
|
lastdepth = 0;
|
|
|
|
lasttime = 0;
|
2014-02-23 16:36:20 +00:00
|
|
|
/* skip events at time = 0 */
|
|
|
|
while (ev && ev->time.seconds == 0)
|
|
|
|
ev = ev->next;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
for (i = 0; i < dc->samples; i++) {
|
|
|
|
struct plot_data *entry = plot_data + idx;
|
2014-02-28 04:09:57 +00:00
|
|
|
struct sample *sample = dc->sample + i;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
int time = sample->time.seconds;
|
|
|
|
int depth = sample->depth.mm;
|
|
|
|
int offset, delta;
|
|
|
|
|
|
|
|
/* Add intermediate plot entries if required */
|
|
|
|
delta = time - lasttime;
|
2013-01-07 23:14:13 +00:00
|
|
|
if (delta < 0) {
|
|
|
|
time = lasttime;
|
|
|
|
delta = 0;
|
|
|
|
}
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
for (offset = 10; offset < delta; offset += 10) {
|
|
|
|
if (lasttime + offset > maxtime)
|
|
|
|
break;
|
|
|
|
|
2014-02-23 16:36:20 +00:00
|
|
|
/* Add events if they are between plot entries */
|
|
|
|
while (ev && ev->time.seconds < lasttime + offset) {
|
|
|
|
INSERT_ENTRY(ev->time.seconds, interpolate(lastdepth, depth, ev->time.seconds - lasttime, delta));
|
|
|
|
ev = ev->next;
|
|
|
|
}
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
|
2014-02-23 16:36:20 +00:00
|
|
|
/* now insert the time interpolated entry */
|
|
|
|
INSERT_ENTRY(lasttime + offset, interpolate(lastdepth, depth, offset, delta));
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
|
2014-02-23 16:36:20 +00:00
|
|
|
/* skip events that happened at this time */
|
|
|
|
while (ev && ev->time.seconds == lasttime + offset)
|
|
|
|
ev = ev->next;
|
|
|
|
}
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
|
2014-02-23 16:36:20 +00:00
|
|
|
/* Add events if they are between plot entries */
|
|
|
|
while (ev && ev->time.seconds < time) {
|
|
|
|
INSERT_ENTRY(ev->time.seconds, interpolate(lastdepth, depth, ev->time.seconds - lasttime, delta));
|
|
|
|
ev = ev->next;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (time > maxtime)
|
|
|
|
break;
|
|
|
|
|
|
|
|
entry->sec = time;
|
|
|
|
entry->depth = depth;
|
|
|
|
|
|
|
|
entry->stopdepth = sample->stopdepth.mm;
|
|
|
|
entry->stoptime = sample->stoptime.seconds;
|
|
|
|
entry->ndl = sample->ndl.seconds;
|
|
|
|
pi->has_ndl |= sample->ndl.seconds;
|
|
|
|
entry->in_deco = sample->in_deco;
|
|
|
|
entry->cns = sample->cns;
|
|
|
|
entry->po2 = sample->po2 / 1000.0;
|
|
|
|
/* FIXME! sensor index -> cylinder index translation! */
|
|
|
|
entry->cylinderindex = sample->sensor;
|
|
|
|
SENSOR_PRESSURE(entry) = sample->cylinderpressure.mbar;
|
2013-11-12 22:00:55 +00:00
|
|
|
if (sample->temperature.mkelvin)
|
|
|
|
entry->temperature = lasttemp = sample->temperature.mkelvin;
|
|
|
|
else
|
|
|
|
entry->temperature = lasttemp;
|
2014-01-17 22:00:28 +00:00
|
|
|
entry->heartbeat = sample->heartbeat;
|
|
|
|
entry->bearing = sample->bearing;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
|
2014-02-23 16:36:20 +00:00
|
|
|
/* skip events that happened at this time */
|
|
|
|
while (ev && ev->time.seconds == time)
|
|
|
|
ev = ev->next;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
lasttime = time;
|
|
|
|
lastdepth = depth;
|
|
|
|
idx++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add two final surface events */
|
2014-02-28 04:09:57 +00:00
|
|
|
plot_data[idx++].sec = lasttime + 1;
|
|
|
|
plot_data[idx++].sec = lasttime + 2;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
pi->nr = idx;
|
|
|
|
|
|
|
|
return plot_data;
|
|
|
|
}
|
|
|
|
|
2014-02-23 16:36:20 +00:00
|
|
|
#undef INSERT_ENTRY
|
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
static void populate_cylinder_pressure_data(int idx, int start, int end, struct plot_info *pi)
|
2011-09-08 15:33:02 +00:00
|
|
|
{
|
2013-01-07 00:09:48 +00:00
|
|
|
int i;
|
2011-09-08 15:33:02 +00:00
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
/* First: check that none of the entries has sensor pressure for this cylinder index */
|
|
|
|
for (i = 0; i < pi->nr; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
2013-01-07 00:09:48 +00:00
|
|
|
if (entry->cylinderindex != idx)
|
|
|
|
continue;
|
|
|
|
if (SENSOR_PRESSURE(entry))
|
|
|
|
return;
|
|
|
|
}
|
2012-12-06 18:01:16 +00:00
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
/* Then: populate the first entry with the beginning cylinder pressure */
|
|
|
|
for (i = 0; i < pi->nr; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
2013-01-07 00:09:48 +00:00
|
|
|
if (entry->cylinderindex != idx)
|
|
|
|
continue;
|
|
|
|
SENSOR_PRESSURE(entry) = start;
|
|
|
|
break;
|
|
|
|
}
|
2013-01-04 04:45:20 +00:00
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
/* .. and the last entry with the ending cylinder pressure */
|
2013-01-29 21:10:46 +00:00
|
|
|
for (i = pi->nr; --i >= 0; /* nothing */) {
|
2014-02-28 04:09:57 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
2013-01-07 00:09:48 +00:00
|
|
|
if (entry->cylinderindex != idx)
|
|
|
|
continue;
|
|
|
|
SENSOR_PRESSURE(entry) = end;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2011-10-23 14:18:30 +00:00
|
|
|
|
2013-10-14 21:48:43 +00:00
|
|
|
static void calculate_sac(struct dive *dive, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int i = 0, last = 0;
|
|
|
|
struct plot_data *last_entry = NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < pi->nr; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
2013-10-14 21:48:43 +00:00
|
|
|
if (!last_entry || last_entry->cylinderindex != entry->cylinderindex) {
|
|
|
|
last = i;
|
|
|
|
last_entry = entry;
|
|
|
|
entry->sac = get_local_sac(entry, pi->entry + i + 1, dive);
|
|
|
|
} else {
|
|
|
|
int j;
|
|
|
|
entry->sac = 0;
|
|
|
|
for (j = last; j < i; j++)
|
|
|
|
entry->sac += get_local_sac(pi->entry + j, pi->entry + j + 1, dive);
|
|
|
|
entry->sac /= (i - last);
|
|
|
|
if (entry->sec - last_entry->sec >= SAC_WINDOW) {
|
|
|
|
last++;
|
|
|
|
last_entry = pi->entry + last;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
static void populate_secondary_sensor_data(struct divecomputer *dc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
/* We should try to see if it has interesting pressure data here */
|
|
|
|
}
|
2011-10-23 14:52:45 +00:00
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
static void setup_gas_sensor_pressure(struct dive *dive, struct divecomputer *dc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct divecomputer *secondary;
|
Do a better job at creating plot info entries
This simplifies - and improves - the code to generate the plot info
entries from the samples.
We used to generate exactly one plot info entry per sample, and then -
because the result doesn't have high enough granularity - we'd
generate additional plot info entries at gas change events etc.
Which resulted in all kinds of ugly special case logic. Not only for
the gas switch, btw: you can see the effects of this in the deco graph
(done at plot entry boundaries) and in the gas pressure curves.
So this throws that "do special plot entries for gas switch events"
code away entirely, and replaces it with a much more straightforward
model: we generate plot entries at a minimum of ten-second intervals.
If you have samples more often than that, you'll get more frequent
plot entries, but you'll never get less than that "every ten seconds".
As a result, the code is smaller and simpler (99 insertions, 161
deletions), and actually does a better job too.
You can see the difference especially in the test dives that only have
a few entries (or if you create a new dive without a dive computer,
using the "Add Dive" menu entry). Look at the deco graph of test-dive
20 before and after, for example. You can also see it very subtly in
the cylinder pressure curves going from line segments to curves on
that same dive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-06 20:53:25 +00:00
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
/* First, populate the pressures with the manual cylinder data.. */
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++) {
|
2014-02-28 04:09:57 +00:00
|
|
|
cylinder_t *cyl = dive->cylinder + i;
|
|
|
|
int start = cyl->start.mbar ?: cyl->sample_start.mbar;
|
|
|
|
int end = cyl->end.mbar ?: cyl->sample_end.mbar;
|
2013-01-07 00:09:48 +00:00
|
|
|
|
|
|
|
if (!start || !end)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
populate_cylinder_pressure_data(i, start, end, pi);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Here, we should try to walk through all the dive computers,
|
|
|
|
* and try to see if they have sensor data different from the
|
|
|
|
* primary dive computer (dc).
|
|
|
|
*/
|
|
|
|
secondary = &dive->dc;
|
|
|
|
do {
|
|
|
|
if (secondary == dc)
|
|
|
|
continue;
|
|
|
|
populate_secondary_sensor_data(dc, pi);
|
|
|
|
} while ((secondary = secondary->next) != NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void populate_pressure_information(struct dive *dive, struct divecomputer *dc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int i, cylinderindex;
|
2014-02-28 04:09:57 +00:00
|
|
|
pr_track_t *track_pr[MAX_CYLINDERS] = { NULL, };
|
2013-01-07 00:09:48 +00:00
|
|
|
pr_track_t *current;
|
2014-01-15 18:54:41 +00:00
|
|
|
bool missing_pr = false;
|
2013-01-07 00:09:48 +00:00
|
|
|
|
2013-03-28 19:03:00 +00:00
|
|
|
cylinderindex = -1;
|
|
|
|
current = NULL;
|
|
|
|
for (i = 0; i < pi->nr; i++) {
|
2013-01-07 00:09:48 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
2013-03-28 19:03:00 +00:00
|
|
|
unsigned pressure = SENSOR_PRESSURE(entry);
|
2011-10-23 14:18:30 +00:00
|
|
|
|
2013-01-07 00:55:25 +00:00
|
|
|
/* discrete integration of pressure over time to get the SAC rate equivalent */
|
2013-03-28 19:03:00 +00:00
|
|
|
if (current) {
|
2014-02-28 04:09:57 +00:00
|
|
|
entry->pressure_time = pressure_time(dive, dc, entry - 1, entry);
|
2013-12-31 22:32:16 +00:00
|
|
|
current->pressure_time += entry->pressure_time;
|
2013-03-28 19:03:00 +00:00
|
|
|
current->t_end = entry->sec;
|
|
|
|
}
|
2013-01-07 00:55:25 +00:00
|
|
|
|
2011-10-22 02:04:44 +00:00
|
|
|
/* track the segments per cylinder and their pressure/time integral */
|
Fix overly complicated and fragile "same_cylinder" logic
The plot-info per-event 'same_cylinder' logic was fragile, and caused
us to not print the beginning pressure of the first cylinder.
In particular, there was a nasty interaction with not all plot entries
having pressures, and the whole logic that avoid some of the early
plot entries because they are fake entries that are just there to make
sure that we don't step off the edge of the world. When we then only
do certain things on the particular entries that don't have the same
cylinder as the last plot entry, things don't always happen like they
should.
Fix this by:
- get rid of the computed "same_cylinder" state entirely. All the
cases where we use it, we might as well just look at what the last
cylinder we used was, and thus "same_cylinder" is just about testing
the current cylinder index against that last index.
- get rid of some of the edge conditions by just writing the loops
more clearly, so that they simply don't have special cases. For
example, instead of setting some "last_pressure" for a cylinder at
cylinder changes, just set the damn thing on every single sample. The
last pressure will automatically be the pressure we set last! The code
is simpler and more straightforward.
So this simplifies the code and just makes it less fragile - it
doesn't matter if the cylinder change happens to happen at a sample
that doesn't have a pressure reading, for example, because we no
longer care so deeply about exactly which sample the cylinder change
happens at. As a result, the bug Mika noticed just goes away.
Reported-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-25 01:55:48 +00:00
|
|
|
if (entry->cylinderindex != cylinderindex) {
|
|
|
|
cylinderindex = entry->cylinderindex;
|
2013-03-28 19:03:00 +00:00
|
|
|
current = pr_track_alloc(pressure, entry->sec);
|
2011-10-22 02:04:44 +00:00
|
|
|
track_pr[cylinderindex] = list_add(track_pr[cylinderindex], current);
|
2013-03-28 19:03:00 +00:00
|
|
|
continue;
|
2013-01-07 00:09:48 +00:00
|
|
|
}
|
|
|
|
|
2013-03-28 19:03:00 +00:00
|
|
|
if (!pressure) {
|
|
|
|
missing_pr = 1;
|
|
|
|
continue;
|
2013-01-07 00:09:48 +00:00
|
|
|
}
|
2013-03-28 19:03:00 +00:00
|
|
|
|
|
|
|
current->end = pressure;
|
|
|
|
|
|
|
|
/* Was it continuous? */
|
2014-02-28 04:09:57 +00:00
|
|
|
if (SENSOR_PRESSURE(entry - 1))
|
2013-03-28 19:03:00 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* transmitter changed its working status */
|
|
|
|
current = pr_track_alloc(pressure, entry->sec);
|
|
|
|
track_pr[cylinderindex] = list_add(track_pr[cylinderindex], current);
|
2013-01-07 00:09:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (missing_pr) {
|
2013-01-07 02:20:12 +00:00
|
|
|
fill_missing_tank_pressures(dive, pi, track_pr);
|
2013-01-07 00:09:48 +00:00
|
|
|
}
|
|
|
|
for (i = 0; i < MAX_CYLINDERS; i++)
|
|
|
|
list_free(track_pr[i]);
|
|
|
|
}
|
|
|
|
|
2013-11-12 22:09:59 +00:00
|
|
|
/* calculate DECO STOP / TTS / NDL */
|
2014-02-28 04:09:57 +00:00
|
|
|
static void calculate_ndl_tts(double tissue_tolerance, struct plot_data *entry, struct dive *dive, double surface_pressure)
|
|
|
|
{
|
2013-11-12 22:09:59 +00:00
|
|
|
/* FIXME: This should be configurable */
|
|
|
|
/* ascent speed up to first deco stop */
|
|
|
|
const int ascent_s_per_step = 1;
|
|
|
|
const int ascent_mm_per_step = 200; /* 12 m/min */
|
|
|
|
/* ascent speed between deco stops */
|
|
|
|
const int ascent_s_per_deco_step = 1;
|
|
|
|
const int ascent_mm_per_deco_step = 16; /* 1 m/min */
|
|
|
|
/* how long time steps in deco calculations? */
|
|
|
|
const int time_stepsize = 10;
|
|
|
|
const int deco_stepsize = 3000;
|
|
|
|
/* at what depth is the current deco-step? */
|
|
|
|
int next_stop = ROUND_UP(deco_allowed_depth(tissue_tolerance, surface_pressure, dive, 1), deco_stepsize);
|
|
|
|
int ascent_depth = entry->depth;
|
|
|
|
/* at what time should we give up and say that we got enuff NDL? */
|
|
|
|
const int max_ndl = 7200;
|
|
|
|
int cylinderindex = entry->cylinderindex;
|
|
|
|
|
|
|
|
/* If we don't have a ceiling yet, calculate ndl. Don't try to calculate
|
|
|
|
* a ndl for lower values than 3m it would take forever */
|
|
|
|
if (next_stop == 0) {
|
2014-01-16 04:50:56 +00:00
|
|
|
if (entry->depth < 3000) {
|
2013-11-12 22:09:59 +00:00
|
|
|
entry->ndl = max_ndl;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
/* stop if the ndl is above max_ndl seconds, and call it plenty of time */
|
2013-11-13 18:20:09 +00:00
|
|
|
while (entry->ndl_calc < max_ndl && deco_allowed_depth(tissue_tolerance, surface_pressure, dive, 1) <= 0) {
|
|
|
|
entry->ndl_calc += time_stepsize;
|
2013-11-12 22:09:59 +00:00
|
|
|
tissue_tolerance = add_segment(depth_to_mbar(entry->depth, dive) / 1000.0,
|
2014-02-28 04:09:57 +00:00
|
|
|
&dive->cylinder[cylinderindex].gasmix, time_stepsize, entry->po2 * 1000, dive);
|
2013-11-12 22:09:59 +00:00
|
|
|
}
|
|
|
|
/* we don't need to calculate anything else */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-11-13 18:20:09 +00:00
|
|
|
/* We are in deco */
|
2014-01-15 18:54:41 +00:00
|
|
|
entry->in_deco_calc = true;
|
2013-11-13 18:20:09 +00:00
|
|
|
|
2013-11-12 22:09:59 +00:00
|
|
|
/* Add segments for movement to stopdepth */
|
2013-11-13 18:20:09 +00:00
|
|
|
for (; ascent_depth > next_stop; ascent_depth -= ascent_mm_per_step, entry->tts_calc += ascent_s_per_step) {
|
2013-11-12 22:09:59 +00:00
|
|
|
tissue_tolerance = add_segment(depth_to_mbar(ascent_depth, dive) / 1000.0,
|
2014-02-28 04:09:57 +00:00
|
|
|
&dive->cylinder[cylinderindex].gasmix, ascent_s_per_step, entry->po2 * 1000, dive);
|
2013-11-12 22:09:59 +00:00
|
|
|
next_stop = ROUND_UP(deco_allowed_depth(tissue_tolerance, surface_pressure, dive, 1), deco_stepsize);
|
|
|
|
}
|
|
|
|
ascent_depth = next_stop;
|
|
|
|
|
|
|
|
/* And how long is the current deco-step? */
|
2013-11-13 18:20:09 +00:00
|
|
|
entry->stoptime_calc = 0;
|
|
|
|
entry->stopdepth_calc = next_stop;
|
2013-11-12 22:09:59 +00:00
|
|
|
next_stop -= deco_stepsize;
|
|
|
|
|
|
|
|
/* And how long is the total TTS */
|
2014-02-28 04:09:57 +00:00
|
|
|
while (next_stop >= 0) {
|
2013-11-12 22:09:59 +00:00
|
|
|
/* save the time for the first stop to show in the graph */
|
2013-11-13 18:20:09 +00:00
|
|
|
if (ascent_depth == entry->stopdepth_calc)
|
|
|
|
entry->stoptime_calc += time_stepsize;
|
2013-11-12 22:09:59 +00:00
|
|
|
|
2013-11-13 18:20:09 +00:00
|
|
|
entry->tts_calc += time_stepsize;
|
2013-11-12 22:09:59 +00:00
|
|
|
tissue_tolerance = add_segment(depth_to_mbar(ascent_depth, dive) / 1000.0,
|
2014-02-28 04:09:57 +00:00
|
|
|
&dive->cylinder[cylinderindex].gasmix, time_stepsize, entry->po2 * 1000, dive);
|
2013-11-12 22:09:59 +00:00
|
|
|
|
|
|
|
if (deco_allowed_depth(tissue_tolerance, surface_pressure, dive, 1) <= next_stop) {
|
|
|
|
/* move to the next stop and add the travel between stops */
|
2014-02-28 04:09:57 +00:00
|
|
|
for (; ascent_depth > next_stop; ascent_depth -= ascent_mm_per_deco_step, entry->tts_calc += ascent_s_per_deco_step)
|
2014-03-04 05:24:52 +00:00
|
|
|
add_segment(depth_to_mbar(ascent_depth, dive) / 1000.0,
|
|
|
|
&dive->cylinder[cylinderindex].gasmix, ascent_s_per_deco_step, entry->po2 * 1000, dive);
|
2013-11-12 22:09:59 +00:00
|
|
|
ascent_depth = next_stop;
|
|
|
|
next_stop -= deco_stepsize;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Let's try to do some deco calculations.
|
|
|
|
* Needs to be run before calculate_gas_information so we know that if we have a po2, where in ccr-mode.
|
|
|
|
*/
|
2014-02-04 19:34:16 +00:00
|
|
|
void calculate_deco_information(struct dive *dive, struct divecomputer *dc, struct plot_info *pi, bool print_mode)
|
2013-01-07 00:09:48 +00:00
|
|
|
{
|
|
|
|
int i;
|
2014-01-15 18:54:41 +00:00
|
|
|
double surface_pressure = (dc->surface_pressure.mbar ? dc->surface_pressure.mbar : get_surface_pressure_in_mbar(dive, true)) / 1000.0;
|
2013-11-12 22:09:59 +00:00
|
|
|
double tissue_tolerance = 0;
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
struct plot_data *entry = pi->entry + i;
|
|
|
|
int j, t0 = (entry - 1)->sec, t1 = entry->sec;
|
2014-02-28 04:09:57 +00:00
|
|
|
for (j = t0 + 1; j <= t1; j++) {
|
2013-11-12 22:09:59 +00:00
|
|
|
int depth = interpolate(entry[-1].depth, entry[0].depth, j - t0, t1 - t0);
|
|
|
|
double min_pressure = add_segment(depth_to_mbar(depth, dive) / 1000.0,
|
2014-02-28 04:09:57 +00:00
|
|
|
&dive->cylinder[entry->cylinderindex].gasmix, 1, entry->po2 * 1000, dive);
|
2013-11-12 22:09:59 +00:00
|
|
|
tissue_tolerance = min_pressure;
|
|
|
|
}
|
|
|
|
if (t0 == t1)
|
|
|
|
entry->ceiling = (entry - 1)->ceiling;
|
|
|
|
else
|
2014-04-16 20:03:44 +00:00
|
|
|
entry->ceiling = deco_allowed_depth(tissue_tolerance, surface_pressure, dive, !prefs.calcceiling3m);
|
2014-02-28 04:09:57 +00:00
|
|
|
for (j = 0; j < 16; j++)
|
2013-11-12 22:09:59 +00:00
|
|
|
entry->ceilings[j] = deco_allowed_depth(tolerated_by_tissue[j], surface_pressure, dive, 1);
|
|
|
|
|
2013-12-03 23:12:01 +00:00
|
|
|
/* should we do more calculations?
|
|
|
|
* We don't for print-mode because this info doesn't show up there */
|
2014-04-16 20:03:44 +00:00
|
|
|
if (prefs.calcndltts && !print_mode) {
|
2013-11-12 22:09:59 +00:00
|
|
|
/* We are going to mess up deco state, so store it for later restore */
|
|
|
|
char *cache_data = NULL;
|
|
|
|
cache_deco_state(tissue_tolerance, &cache_data);
|
|
|
|
calculate_ndl_tts(tissue_tolerance, entry, dive, surface_pressure);
|
|
|
|
/* Restore "real" deco state for next real time step */
|
|
|
|
tissue_tolerance = restore_deco_state(cache_data);
|
|
|
|
free(cache_data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#if DECO_CALC_DEBUG & 1
|
|
|
|
dump_tissues();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
static void calculate_gas_information_new(struct dive *dive, struct plot_info *pi)
|
2014-01-27 17:14:42 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
double amb_pressure;
|
|
|
|
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
int fo2, fhe;
|
|
|
|
struct plot_data *entry = pi->entry + i;
|
|
|
|
int cylinderindex = entry->cylinderindex;
|
|
|
|
|
|
|
|
amb_pressure = depth_to_mbar(entry->depth, dive) / 1000.0;
|
|
|
|
fo2 = get_o2(&dive->cylinder[cylinderindex].gasmix);
|
|
|
|
fhe = get_he(&dive->cylinder[cylinderindex].gasmix);
|
|
|
|
|
|
|
|
if (entry->po2) {
|
|
|
|
/* we have an O2 partial pressure in the sample - so this
|
|
|
|
* is likely a CC dive... use that instead of the value
|
|
|
|
* from the cylinder info */
|
2014-03-18 08:28:30 +00:00
|
|
|
if (entry->po2 >= amb_pressure || fo2 == 1000) {
|
|
|
|
entry->po2 = amb_pressure;
|
|
|
|
entry->phe = 0;
|
|
|
|
entry->pn2 = 0;
|
|
|
|
} else {
|
|
|
|
entry->phe = (amb_pressure - entry->po2) * (double)fhe / (1000 - fo2);
|
|
|
|
entry->pn2 = amb_pressure - entry->po2 - entry->phe;
|
|
|
|
}
|
2014-01-27 17:14:42 +00:00
|
|
|
} else {
|
|
|
|
entry->po2 = fo2 / 1000.0 * amb_pressure;
|
|
|
|
entry->phe = fhe / 1000.0 * amb_pressure;
|
|
|
|
entry->pn2 = (1000 - fo2 - fhe) / 1000.0 * amb_pressure;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Calculate MOD, EAD, END and EADD based on partial pressures calculated before
|
|
|
|
* so there is no difference in calculating between OC and CC
|
2014-03-31 10:52:46 +00:00
|
|
|
* END takes O2 + N2 (air) into account ("Narcotic" for trimix dives)
|
|
|
|
* EAD just uses N2 ("Air" for nitrox dives) */
|
2014-04-16 20:03:44 +00:00
|
|
|
entry->mod = (prefs.modppO2 / fo2 * 1000 - 1) * 10000;
|
2014-03-31 10:52:46 +00:00
|
|
|
entry->end = (entry->depth + 10000) * (1000 - fhe) / 1000.0 - 10000;
|
|
|
|
entry->ead = (entry->depth + 10000) * (1000 - fo2 - fhe) / (double)N2_IN_AIR - 10000;
|
2014-01-27 17:14:42 +00:00
|
|
|
entry->eadd = (entry->depth + 10000) *
|
2014-02-28 04:09:57 +00:00
|
|
|
(entry->po2 / amb_pressure * O2_DENSITY + entry->pn2 / amb_pressure *
|
|
|
|
N2_DENSITY +
|
|
|
|
entry->phe / amb_pressure * HE_DENSITY) /
|
2014-03-03 21:25:55 +00:00
|
|
|
(O2_IN_AIR * O2_DENSITY + N2_IN_AIR * N2_DENSITY) * 1000 - 10000;
|
2014-01-27 17:14:42 +00:00
|
|
|
if (entry->mod < 0)
|
|
|
|
entry->mod = 0;
|
|
|
|
if (entry->ead < 0)
|
|
|
|
entry->ead = 0;
|
|
|
|
if (entry->end < 0)
|
|
|
|
entry->end = 0;
|
|
|
|
if (entry->eadd < 0)
|
|
|
|
entry->eadd = 0;
|
|
|
|
}
|
|
|
|
}
|
2013-01-07 00:09:48 +00:00
|
|
|
/*
|
|
|
|
* Create a plot-info with smoothing and ranged min/max
|
|
|
|
*
|
|
|
|
* This also makes sure that we have extra empty events on both
|
|
|
|
* sides, so that you can do end-points without having to worry
|
|
|
|
* about it.
|
|
|
|
*/
|
2014-01-17 16:43:25 +00:00
|
|
|
void create_plot_info_new(struct dive *dive, struct divecomputer *dc, struct plot_info *pi)
|
|
|
|
{
|
2014-03-31 10:48:22 +00:00
|
|
|
int o2, he, o2low;
|
2014-01-28 23:11:14 +00:00
|
|
|
init_decompression(dive);
|
2014-02-28 04:09:57 +00:00
|
|
|
if (last_pi_entry_new) /* Create the new plot data */
|
2014-02-18 03:50:19 +00:00
|
|
|
free((void *)last_pi_entry_new);
|
2014-03-31 10:48:22 +00:00
|
|
|
get_dive_gas(dive, &o2, &he, &o2low);
|
|
|
|
if (he > 0) {
|
|
|
|
pi->dive_type = TRIMIX;
|
|
|
|
} else {
|
|
|
|
if (o2)
|
|
|
|
pi->dive_type = NITROX;
|
|
|
|
else
|
|
|
|
pi->dive_type = AIR;
|
|
|
|
}
|
2014-02-18 03:50:19 +00:00
|
|
|
last_pi_entry_new = populate_plot_entries(dive, dc, pi);
|
2014-02-28 04:09:57 +00:00
|
|
|
check_gas_change_events(dive, dc, pi); /* Populate the gas index from the gas change events */
|
|
|
|
setup_gas_sensor_pressure(dive, dc, pi); /* Try to populate our gas pressure knowledge */
|
|
|
|
populate_pressure_information(dive, dc, pi); /* .. calculate missing pressure entries */
|
|
|
|
calculate_sac(dive, pi); /* Calculate sac */
|
2014-01-28 23:11:14 +00:00
|
|
|
calculate_deco_information(dive, dc, pi, false);
|
2014-02-28 04:09:57 +00:00
|
|
|
calculate_gas_information_new(dive, pi); /* And finaly calculate gas partial pressures */
|
2014-01-17 16:43:25 +00:00
|
|
|
pi->meandepth = dive->dc.meandepth.mm;
|
|
|
|
analyze_plot_info(pi);
|
|
|
|
}
|
|
|
|
|
2014-03-17 15:19:09 +00:00
|
|
|
struct divecomputer *select_dc(struct dive *dive)
|
2013-01-01 18:20:22 +00:00
|
|
|
{
|
2014-03-17 15:19:09 +00:00
|
|
|
unsigned int max = number_of_computers(dive);
|
|
|
|
unsigned int i = dc_number;
|
2013-01-01 18:20:22 +00:00
|
|
|
|
2014-03-17 15:19:09 +00:00
|
|
|
/* Reset 'dc_number' if we've switched dives and it is now out of range */
|
|
|
|
if (i >= max)
|
|
|
|
dc_number = i = 0;
|
Add a "View next dive computer" menu item
This adds the capability to actually view all your dive computers, by
adding a menu item under "Log"->"View"->"Next DC" to show the next dive
computer.
Realistically, if you actually commonly use this, you'd use the
accelerator shortcut. Which right now is Ctrl-C ("C for Computer"),
which is probably a horrible choice.
I really would want to have nice "next/prev dive" accelerators too,
because the cursor keys don't work very well with the gtk focus issues.
Being able to switch between dives would also make the "just the dive
profile, maam" view (ctrl-2) much more useful.
The prev/next dive in the profile view should probably be done with a
keyboard action callback, which also avoids some of the limitations of
accelerators (ie you can make any key do the action). Some gtk person,
please?
Anyway, this commit only does the dive computer choice thing, and only
using the accelerators.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-17 17:37:07 +00:00
|
|
|
|
2014-03-17 15:19:09 +00:00
|
|
|
return get_dive_dc(dive, i);
|
Add a "View next dive computer" menu item
This adds the capability to actually view all your dive computers, by
adding a menu item under "Log"->"View"->"Next DC" to show the next dive
computer.
Realistically, if you actually commonly use this, you'd use the
accelerator shortcut. Which right now is Ctrl-C ("C for Computer"),
which is probably a horrible choice.
I really would want to have nice "next/prev dive" accelerators too,
because the cursor keys don't work very well with the gtk focus issues.
Being able to switch between dives would also make the "just the dive
profile, maam" view (ctrl-2) much more useful.
The prev/next dive in the profile view should probably be done with a
keyboard action callback, which also avoids some of the limitations of
accelerators (ie you can make any key do the action). Some gtk person,
please?
Anyway, this commit only does the dive computer choice thing, and only
using the accelerators.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2012-12-17 17:37:07 +00:00
|
|
|
}
|
|
|
|
|
2014-03-31 10:48:22 +00:00
|
|
|
static void plot_string(struct plot_info *pi, struct plot_data *entry, struct membuffer *b, bool has_ndl)
|
2012-11-11 12:20:32 +00:00
|
|
|
{
|
2013-01-14 00:24:58 +00:00
|
|
|
int pressurevalue, mod, ead, end, eadd;
|
2013-10-04 05:57:48 +00:00
|
|
|
const char *depth_unit, *pressure_unit, *temp_unit, *vertical_speed_unit;
|
2013-09-25 00:07:07 +00:00
|
|
|
double depthvalue, tempvalue, speedvalue;
|
2012-11-11 16:12:09 +00:00
|
|
|
|
2013-10-11 16:53:29 +00:00
|
|
|
depthvalue = get_depth_units(entry->depth, NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "@: %d:%02d\nD: %.1f%s\n"), FRACTION(entry->sec, 60), depthvalue, depth_unit);
|
2013-10-11 16:53:29 +00:00
|
|
|
if (GET_PRESSURE(entry)) {
|
|
|
|
pressurevalue = get_pressure_units(GET_PRESSURE(entry), &pressure_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "P: %d%s\n"), pressurevalue, pressure_unit);
|
2012-11-11 16:12:09 +00:00
|
|
|
}
|
2013-10-11 16:53:29 +00:00
|
|
|
if (entry->temperature) {
|
|
|
|
tempvalue = get_temp_units(entry->temperature, &temp_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "T: %.1f%s\n"), tempvalue, temp_unit);
|
2012-11-11 16:12:09 +00:00
|
|
|
}
|
2013-10-04 05:57:48 +00:00
|
|
|
speedvalue = get_vertical_speed_units(abs(entry->speed), NULL, &vertical_speed_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
/* Ascending speeds are positive, descending are negative */
|
|
|
|
if (entry->speed > 0)
|
|
|
|
speedvalue *= -1;
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "V: %.1f%s\n"), speedvalue, vertical_speed_unit);
|
2014-01-19 00:21:13 +00:00
|
|
|
|
|
|
|
if (entry->sac && prefs.show_sac)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "SAC: %2.1fl/min\n"), entry->sac / 1000.0);
|
2014-01-19 00:21:13 +00:00
|
|
|
if (entry->cns)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "CNS: %u%%\n"), entry->cns);
|
2014-01-19 00:21:13 +00:00
|
|
|
if (prefs.pp_graphs.po2)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "pO%s: %.2fbar\n"), UTF8_SUBSCRIPT_2, entry->po2);
|
2014-01-19 00:21:13 +00:00
|
|
|
if (prefs.pp_graphs.pn2)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "pN%s: %.2fbar\n"), UTF8_SUBSCRIPT_2, entry->pn2);
|
2014-01-19 00:21:13 +00:00
|
|
|
if (prefs.pp_graphs.phe)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "pHe: %.2fbar\n"), entry->phe);
|
2013-11-12 22:10:01 +00:00
|
|
|
if (prefs.mod) {
|
|
|
|
mod = (int)get_depth_units(entry->mod, NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "MOD: %d%s\n"), mod, depth_unit);
|
2013-11-12 22:10:01 +00:00
|
|
|
}
|
2014-03-31 10:48:22 +00:00
|
|
|
eadd = (int)get_depth_units(entry->eadd, NULL, &depth_unit);
|
2013-11-12 22:10:01 +00:00
|
|
|
if (prefs.ead) {
|
2014-03-31 10:48:22 +00:00
|
|
|
switch (pi->dive_type) {
|
|
|
|
case NITROX:
|
2014-03-31 10:52:46 +00:00
|
|
|
ead = (int)get_depth_units(entry->ead, NULL, &depth_unit);
|
|
|
|
put_format(b, translate("gettextFromC", "EAD: %d%s\nEADD: %d%s\n"), ead, depth_unit, eadd, depth_unit);
|
|
|
|
break;
|
|
|
|
case TRIMIX:
|
2014-03-31 10:48:22 +00:00
|
|
|
end = (int)get_depth_units(entry->end, NULL, &depth_unit);
|
|
|
|
put_format(b, translate("gettextFromC", "END: %d%s\nEADD: %d%s\n"), end, depth_unit, eadd, depth_unit);
|
|
|
|
break;
|
2014-03-31 10:52:46 +00:00
|
|
|
case AIR:
|
|
|
|
/* nothing */
|
2014-03-31 10:48:22 +00:00
|
|
|
break;
|
|
|
|
}
|
2013-01-03 05:21:36 +00:00
|
|
|
}
|
2012-12-01 21:02:30 +00:00
|
|
|
if (entry->stopdepth) {
|
|
|
|
depthvalue = get_depth_units(entry->stopdepth, NULL, &depth_unit);
|
|
|
|
if (entry->ndl) {
|
|
|
|
/* this is a safety stop as we still have ndl */
|
|
|
|
if (entry->stoptime)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "Safetystop: %umin @ %.0f%s\n"), DIV_UP(entry->stoptime, 60),
|
|
|
|
depthvalue, depth_unit);
|
2012-12-01 21:02:30 +00:00
|
|
|
else
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "Safetystop: unkn time @ %.0f%s\n"),
|
|
|
|
depthvalue, depth_unit);
|
2012-12-01 21:02:30 +00:00
|
|
|
} else {
|
|
|
|
/* actual deco stop */
|
|
|
|
if (entry->stoptime)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "Deco: %umin @ %.0f%s\n"), DIV_UP(entry->stoptime, 60),
|
|
|
|
depthvalue, depth_unit);
|
2012-12-01 21:02:30 +00:00
|
|
|
else
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "Deco: unkn time @ %.0f%s\n"),
|
|
|
|
depthvalue, depth_unit);
|
2012-12-01 21:02:30 +00:00
|
|
|
}
|
2012-12-31 02:11:01 +00:00
|
|
|
} else if (entry->in_deco) {
|
2014-02-28 04:09:57 +00:00
|
|
|
put_string(b, translate("gettextFromC", "In deco\n"));
|
2012-12-01 21:02:30 +00:00
|
|
|
} else if (has_ndl) {
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "NDL: %umin\n"), DIV_UP(entry->ndl, 60));
|
2013-07-05 13:19:41 +00:00
|
|
|
}
|
2013-11-13 18:20:09 +00:00
|
|
|
if (entry->stopdepth_calc && entry->stoptime_calc) {
|
|
|
|
depthvalue = get_depth_units(entry->stopdepth_calc, NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "Deco: %umin @ %.0f%s (calc)\n"), DIV_UP(entry->stoptime_calc, 60),
|
|
|
|
depthvalue, depth_unit);
|
2013-11-13 18:20:09 +00:00
|
|
|
} else if (entry->in_deco_calc) {
|
|
|
|
/* This means that we have no NDL left,
|
|
|
|
* and we have no deco stop,
|
|
|
|
* so if we just accend to the surface slowly
|
|
|
|
* (ascent_mm_per_step / ascent_s_per_step)
|
|
|
|
* everything will be ok. */
|
2014-02-28 04:09:57 +00:00
|
|
|
put_string(b, translate("gettextFromC", "In deco (calc)\n"));
|
2014-04-16 20:03:44 +00:00
|
|
|
} else if (prefs.calcndltts && entry->ndl_calc != 0) {
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "NDL: %umin (calc)\n"), DIV_UP(entry->ndl_calc, 60));
|
2012-12-01 21:02:30 +00:00
|
|
|
}
|
2014-01-19 00:21:13 +00:00
|
|
|
if (entry->tts_calc)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "TTS: %umin (calc)\n"), DIV_UP(entry->tts_calc, 60));
|
2013-11-12 22:10:01 +00:00
|
|
|
if (entry->ceiling) {
|
|
|
|
depthvalue = get_depth_units(entry->ceiling, NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "Calculated ceiling %.0f%s\n"), depthvalue, depth_unit);
|
2014-04-16 20:03:44 +00:00
|
|
|
if (prefs.calcalltissues) {
|
2013-11-12 22:10:01 +00:00
|
|
|
int k;
|
2014-02-28 04:09:57 +00:00
|
|
|
for (k = 0; k < 16; k++) {
|
2014-01-16 04:50:56 +00:00
|
|
|
if (entry->ceilings[k]) {
|
2013-11-12 22:10:01 +00:00
|
|
|
depthvalue = get_depth_units(entry->ceilings[k], NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "Tissue %.0fmin: %.0f%s\n"), buehlmann_N2_t_halflife[k], depthvalue, depth_unit);
|
2013-11-12 22:10:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-01-14 00:24:58 +00:00
|
|
|
}
|
2014-04-16 20:03:44 +00:00
|
|
|
if (entry->heartbeat && prefs.hrgraph)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "heartbeat: %d\n"), entry->heartbeat);
|
2014-01-19 00:21:13 +00:00
|
|
|
if (entry->bearing)
|
2014-02-28 04:09:57 +00:00
|
|
|
put_format(b, translate("gettextFromC", "bearing: %d\n"), entry->bearing);
|
2014-01-19 00:21:13 +00:00
|
|
|
strip_mb(b);
|
2012-11-11 12:20:32 +00:00
|
|
|
}
|
|
|
|
|
2014-01-19 00:21:13 +00:00
|
|
|
void get_plot_details_new(struct plot_info *pi, int time, struct membuffer *mb)
|
2014-02-05 16:53:57 +00:00
|
|
|
{
|
|
|
|
struct plot_data *entry = NULL;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < pi->nr; i++) {
|
|
|
|
entry = pi->entry + i;
|
|
|
|
if (entry->sec >= time)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (entry)
|
2014-03-31 10:48:22 +00:00
|
|
|
plot_string(pi, entry, mb, pi->has_ndl);
|
2014-02-05 16:53:57 +00:00
|
|
|
}
|
|
|
|
|
2013-09-25 00:07:07 +00:00
|
|
|
/* Compare two plot_data entries and writes the results into a string */
|
|
|
|
void compare_samples(struct plot_data *e1, struct plot_data *e2, char *buf, int bufsize, int sum)
|
|
|
|
{
|
|
|
|
struct plot_data *start, *stop, *data;
|
2013-10-18 17:30:51 +00:00
|
|
|
const char *depth_unit, *pressure_unit, *vertical_speed_unit;
|
2013-09-25 00:07:07 +00:00
|
|
|
char *buf2 = malloc(bufsize);
|
2013-11-30 08:13:27 +00:00
|
|
|
int avg_speed, max_asc_speed, max_desc_speed;
|
2013-09-25 00:07:07 +00:00
|
|
|
int delta_depth, avg_depth, max_depth, min_depth;
|
|
|
|
int bar_used, last_pressure, pressurevalue;
|
|
|
|
int count, last_sec, delta_time;
|
|
|
|
|
|
|
|
double depthvalue, speedvalue;
|
|
|
|
|
|
|
|
if (bufsize > 0)
|
|
|
|
buf[0] = '\0';
|
2013-12-10 23:53:28 +00:00
|
|
|
if (e1 == NULL || e2 == NULL) {
|
|
|
|
free(buf2);
|
2013-09-25 00:07:07 +00:00
|
|
|
return;
|
2013-12-10 23:53:28 +00:00
|
|
|
}
|
2013-09-25 00:07:07 +00:00
|
|
|
|
|
|
|
if (e1->sec < e2->sec) {
|
|
|
|
start = e1;
|
|
|
|
stop = e2;
|
|
|
|
} else if (e1->sec > e2->sec) {
|
|
|
|
start = e2;
|
|
|
|
stop = e1;
|
|
|
|
} else {
|
2013-12-10 23:53:28 +00:00
|
|
|
free(buf2);
|
2013-09-25 00:07:07 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
count = 0;
|
2013-10-03 18:36:46 +00:00
|
|
|
avg_speed = 0;
|
2013-11-30 08:13:27 +00:00
|
|
|
max_asc_speed = 0;
|
|
|
|
max_desc_speed = 0;
|
2013-09-25 00:07:07 +00:00
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
delta_depth = abs(start->depth - stop->depth);
|
|
|
|
delta_time = abs(start->sec - stop->sec);
|
2013-09-25 00:07:07 +00:00
|
|
|
avg_depth = 0;
|
|
|
|
max_depth = 0;
|
|
|
|
min_depth = INT_MAX;
|
|
|
|
bar_used = 0;
|
|
|
|
|
|
|
|
last_sec = start->sec;
|
|
|
|
last_pressure = GET_PRESSURE(start);
|
|
|
|
|
2013-10-03 18:36:46 +00:00
|
|
|
data = start;
|
2013-09-25 00:07:07 +00:00
|
|
|
while (data != stop) {
|
2014-02-28 04:09:57 +00:00
|
|
|
data = start + count;
|
2013-09-25 00:07:07 +00:00
|
|
|
if (sum)
|
2014-02-28 04:09:57 +00:00
|
|
|
avg_speed += abs(data->speed) * (data->sec - last_sec);
|
2013-09-25 00:07:07 +00:00
|
|
|
else
|
2014-02-28 04:09:57 +00:00
|
|
|
avg_speed += data->speed * (data->sec - last_sec);
|
|
|
|
avg_depth += data->depth * (data->sec - last_sec);
|
2013-09-25 00:07:07 +00:00
|
|
|
|
2013-11-30 08:13:27 +00:00
|
|
|
if (data->speed > max_desc_speed)
|
|
|
|
max_desc_speed = data->speed;
|
|
|
|
if (data->speed < max_asc_speed)
|
|
|
|
max_asc_speed = data->speed;
|
2013-09-25 00:07:07 +00:00
|
|
|
|
|
|
|
if (data->depth < min_depth)
|
|
|
|
min_depth = data->depth;
|
|
|
|
if (data->depth > max_depth)
|
|
|
|
max_depth = data->depth;
|
|
|
|
/* Try to detect gas changes */
|
2014-02-28 04:09:57 +00:00
|
|
|
if (GET_PRESSURE(data) < last_pressure + 2000)
|
|
|
|
bar_used += last_pressure - GET_PRESSURE(data);
|
2013-09-25 00:07:07 +00:00
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
count += 1;
|
2013-09-25 00:07:07 +00:00
|
|
|
last_sec = data->sec;
|
|
|
|
last_pressure = GET_PRESSURE(data);
|
|
|
|
}
|
2014-02-28 04:09:57 +00:00
|
|
|
avg_depth /= stop->sec - start->sec;
|
|
|
|
avg_speed /= stop->sec - start->sec;
|
2013-09-25 00:07:07 +00:00
|
|
|
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%sT: %d:%02d min"), UTF8_DELTA, delta_time / 60, delta_time % 60);
|
2013-09-25 00:07:07 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
|
|
|
|
depthvalue = get_depth_units(delta_depth, NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%s %sD:%.1f%s"), buf2, UTF8_DELTA, depthvalue, depth_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
|
|
|
|
depthvalue = get_depth_units(min_depth, NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%s %sD:%.1f%s"), buf2, UTF8_DOWNWARDS_ARROW, depthvalue, depth_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
|
|
|
|
depthvalue = get_depth_units(max_depth, NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%s %sD:%.1f%s"), buf2, UTF8_UPWARDS_ARROW, depthvalue, depth_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
|
|
|
|
depthvalue = get_depth_units(avg_depth, NULL, &depth_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%s %sD:%.1f%s\n"), buf2, UTF8_AVERAGE, depthvalue, depth_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
|
2013-11-30 08:13:27 +00:00
|
|
|
speedvalue = get_vertical_speed_units(abs(max_desc_speed), NULL, &vertical_speed_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%s%sV:%.2f%s"), buf2, UTF8_DOWNWARDS_ARROW, speedvalue, vertical_speed_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
|
2013-11-30 08:13:27 +00:00
|
|
|
speedvalue = get_vertical_speed_units(abs(max_asc_speed), NULL, &vertical_speed_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%s %sV:%.2f%s"), buf2, UTF8_UPWARDS_ARROW, speedvalue, vertical_speed_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
|
2013-10-18 17:30:51 +00:00
|
|
|
speedvalue = get_vertical_speed_units(abs(avg_speed), NULL, &vertical_speed_unit);
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%s %sV:%.2f%s"), buf2, UTF8_AVERAGE, speedvalue, vertical_speed_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
|
|
|
|
/* Only print if gas has been used */
|
|
|
|
if (bar_used) {
|
|
|
|
pressurevalue = get_pressure_units(bar_used, &pressure_unit);
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2014-02-28 04:09:57 +00:00
|
|
|
snprintf(buf, bufsize, translate("gettextFromC", "%s %sP:%d %s"), buf2, UTF8_DELTA, pressurevalue, pressure_unit);
|
2013-09-25 00:07:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
free(buf2);
|
|
|
|
}
|