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
|
|
|
* uses cairo to draw it
|
|
|
|
*/
|
2012-10-11 00:42:59 +00:00
|
|
|
#include <glib/gi18n.h>
|
2011-08-31 17:20:46 +00:00
|
|
|
|
|
|
|
#include "dive.h"
|
|
|
|
#include "display.h"
|
2013-05-03 20:32:23 +00:00
|
|
|
#if USE_GTK_UI
|
2012-11-01 18:11:05 +00:00
|
|
|
#include "display-gtk.h"
|
2013-05-03 20:32:23 +00:00
|
|
|
#endif
|
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"
|
2012-11-10 10:40:35 +00:00
|
|
|
#include "libdivecomputer/parser.h"
|
2012-11-29 04:13:21 +00:00
|
|
|
#include "libdivecomputer/version.h"
|
2011-08-31 17:20:46 +00:00
|
|
|
|
2011-08-31 18:07:31 +00:00
|
|
|
int selected_dive = 0;
|
2012-06-11 00:45:36 +00:00
|
|
|
char zoomed_plot = 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
|
|
|
char dc_number = 0;
|
2011-08-31 18:07:31 +00:00
|
|
|
|
2013-05-03 21:16:09 +00:00
|
|
|
|
2012-12-17 00:37:44 +00:00
|
|
|
static struct plot_data *last_pi_entry = NULL;
|
2012-09-11 08:16:34 +00:00
|
|
|
|
|
|
|
#define cairo_set_line_width_scaled(cr, w) \
|
|
|
|
cairo_set_line_width((cr), (w) * plot_scale);
|
|
|
|
|
2013-05-03 18:04:51 +00:00
|
|
|
#if USE_GTK_UI
|
|
|
|
|
2013-03-17 23:13:02 +00:00
|
|
|
/* keep the last used gc around so we can invert the SCALEX calculation in
|
|
|
|
* order to calculate a time value for an x coordinate */
|
|
|
|
static struct graphics_context last_gc;
|
|
|
|
int x_to_time(double x)
|
|
|
|
{
|
|
|
|
int seconds = (x - last_gc.drawing_area.x) / last_gc.maxx * (last_gc.rightx - last_gc.leftx) + last_gc.leftx;
|
|
|
|
return (seconds > 0) ? seconds : 0;
|
|
|
|
}
|
|
|
|
|
2013-03-19 02:39:57 +00:00
|
|
|
/* x offset into the drawing area */
|
|
|
|
int x_abs(double x)
|
|
|
|
{
|
|
|
|
return x - last_gc.drawing_area.x;
|
|
|
|
}
|
|
|
|
|
Fix up horribly broken cairo scaling
The way cairo does scaling is really really inconvenient, and one of the
things in cairo that is fundamentally mis-designed.
Cairo scaling always affects both coordinates and object sizes, and the
two can apparently never be split apart. Which is very much not what we
want: we want just coordinate scaling.
So we cannot use 'cairo_scale()' to scale our canvas, because that
screws up lines and text size too. And no, you cannot "fix" that by
de-scaling the line size etc - because line size is one-dimensional, so
you can't undo the (different) scaling in X/Y.
Sad. I realize that often you do want to scale object size with
coordinate transformation, but quite often you *don't* want to.
Yeah, we could do random context save/restore in odd places etc, but
that's just a sign of the bad design of cairo scaling.
Work around it by introducing our own graphics context with scaling,
which does it right. I don't like this, but it seems to be better than
the alternatives.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-09-07 21:37:47 +00:00
|
|
|
static void move_to(struct graphics_context *gc, double x, double y)
|
|
|
|
{
|
|
|
|
cairo_move_to(gc->cr, SCALE(gc, x, y));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void line_to(struct graphics_context *gc, double x, double y)
|
|
|
|
{
|
|
|
|
cairo_line_to(gc->cr, SCALE(gc, x, y));
|
|
|
|
}
|
|
|
|
|
2011-12-01 11:14:21 +00:00
|
|
|
static void set_source_rgba(struct graphics_context *gc, color_indice_t c)
|
2011-09-14 02:49:48 +00:00
|
|
|
{
|
2011-12-01 11:14:21 +00:00
|
|
|
const color_t *col = &profile_color[c];
|
|
|
|
struct rgba rgb = col->media[gc->printer];
|
|
|
|
double r = rgb.r;
|
|
|
|
double g = rgb.g;
|
|
|
|
double b = rgb.b;
|
|
|
|
double a = rgb.a;
|
2011-09-14 02:49:48 +00:00
|
|
|
|
2011-12-01 11:14:21 +00:00
|
|
|
cairo_set_source_rgba(gc->cr, r, g, b, a);
|
2011-11-28 17:17:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void init_profile_background(struct graphics_context *gc)
|
2011-11-19 15:17:19 +00:00
|
|
|
{
|
2011-12-01 11:14:21 +00:00
|
|
|
set_source_rgba(gc, BACKGROUND);
|
2011-11-19 15:17:19 +00:00
|
|
|
}
|
|
|
|
|
2013-01-29 21:10:46 +00:00
|
|
|
static void pattern_add_color_stop_rgba(struct graphics_context *gc, cairo_pattern_t *pat, double o, color_indice_t c)
|
2011-09-14 02:49:48 +00:00
|
|
|
{
|
2011-12-01 11:14:21 +00:00
|
|
|
const color_t *col = &profile_color[c];
|
|
|
|
struct rgba rgb = col->media[gc->printer];
|
|
|
|
cairo_pattern_add_color_stop_rgba(pat, o, rgb.r, rgb.g, rgb.b, rgb.a);
|
2011-09-14 02:49:48 +00:00
|
|
|
}
|
2013-05-03 18:04:51 +00:00
|
|
|
#endif /* USE_GTK_UI */
|
2011-08-31 21:15:50 +00:00
|
|
|
|
2011-11-04 21:32:15 +00:00
|
|
|
/* debugging tool - not normally used */
|
|
|
|
static void dump_pi (struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
printf("pi:{nr:%d maxtime:%d meandepth:%d maxdepth:%d \n"
|
2011-11-10 00:37:18 +00:00
|
|
|
" maxpressure:%d mintemp:%d maxtemp:%d\n",
|
2011-11-04 21:32:15 +00:00
|
|
|
pi->nr, pi->maxtime, pi->meandepth, pi->maxdepth,
|
2011-11-10 00:37:18 +00:00
|
|
|
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"
|
2012-12-01 21:02:30 +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",
|
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
|
|
|
i, entry->cylinderindex, entry->sec,
|
2012-12-01 21:02:30 +00:00
|
|
|
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);
|
|
|
|
}
|
2011-11-04 21:32:15 +00:00
|
|
|
printf(" }\n");
|
|
|
|
}
|
|
|
|
|
2013-05-03 18:04:51 +00:00
|
|
|
#define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
|
|
|
|
|
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;
|
2012-06-11 00:45:36 +00:00
|
|
|
if (zoomed_plot) {
|
|
|
|
/* 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)
|
2012-06-11 00:45:36 +00:00
|
|
|
return ROUND_UP(seconds+seconds/4, 60);
|
|
|
|
else
|
|
|
|
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 */
|
|
|
|
return MAX(30*60, ROUND_UP(seconds+150, 60*5));
|
|
|
|
}
|
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
|
|
|
|
* take into account the additional verical space needed to plot
|
|
|
|
* 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;
|
|
|
|
|
2012-06-11 00:45:36 +00:00
|
|
|
if (zoomed_plot) {
|
|
|
|
/* Rounded up to 10m, with at least 3m to spare */
|
2012-11-01 18:44:18 +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 */
|
2012-11-01 18:44:18 +00:00
|
|
|
md = MAX(30000, ROUND_UP(mm+3000, 10000));
|
|
|
|
}
|
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-02-25 21:38:01 +00:00
|
|
|
int evn_foreach(void (*callback)(const char *, int *, 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 */
|
|
|
|
callback(_(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-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));
|
|
|
|
if (! ev_namelist)
|
|
|
|
/* we are screwed, but let's just bail out */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ev_namelist[evn_used].ev_name = strdup(eventname);
|
|
|
|
ev_namelist[evn_used].plot_ev = TRUE;
|
|
|
|
evn_used++;
|
|
|
|
}
|
|
|
|
|
2013-05-08 20:46:28 +00:00
|
|
|
int setup_temperature_limits(struct graphics_context *gc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int maxtime, mintemp, maxtemp, delta;
|
|
|
|
|
|
|
|
/* Get plot scaling limits */
|
|
|
|
maxtime = get_maxtime(pi);
|
|
|
|
mintemp = pi->mintemp;
|
|
|
|
maxtemp = pi->maxtemp;
|
|
|
|
|
|
|
|
gc->leftx = 0; gc->rightx = maxtime;
|
|
|
|
/* Show temperatures in roughly the lower third, but make sure the scale
|
|
|
|
is at least somewhat reasonable */
|
|
|
|
delta = maxtemp - mintemp;
|
|
|
|
if (delta < 3000) /* less than 3K in fluctuation */
|
|
|
|
delta = 3000;
|
|
|
|
gc->topy = maxtemp + delta*2;
|
|
|
|
|
|
|
|
if (PP_GRAPHS_ENABLED)
|
|
|
|
gc->bottomy = mintemp - delta * 2;
|
|
|
|
else
|
|
|
|
gc->bottomy = mintemp - delta / 3;
|
|
|
|
|
|
|
|
pi->endtempcoord = SCALEY(gc, pi->mintemp);
|
|
|
|
return maxtemp && maxtemp >= mintemp;
|
|
|
|
}
|
|
|
|
|
2013-05-06 21:58:18 +00:00
|
|
|
#if 0
|
2011-09-08 23:01:41 +00:00
|
|
|
static void render_depth_sample(struct graphics_context *gc, struct plot_data *entry, const text_render_options_t *tro)
|
2011-09-08 01:57:04 +00:00
|
|
|
{
|
2011-09-21 19:12:54 +00:00
|
|
|
int sec = entry->sec, decimals;
|
2011-09-08 01:57:04 +00:00
|
|
|
double d;
|
|
|
|
|
2011-10-23 05:40:53 +00:00
|
|
|
d = get_depth_units(entry->depth, &decimals, NULL);
|
2011-09-21 19:12:54 +00:00
|
|
|
|
2011-10-23 05:40:53 +00:00
|
|
|
plot_text(gc, tro, sec, entry->depth, "%.*f", decimals, d);
|
2011-09-08 01:57:04 +00:00
|
|
|
}
|
|
|
|
|
2011-09-08 23:01:41 +00:00
|
|
|
static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi)
|
2011-09-07 20:51:35 +00:00
|
|
|
{
|
2011-11-28 17:17:33 +00:00
|
|
|
static const text_render_options_t deep = {14, SAMPLE_DEEP, CENTER, TOP};
|
|
|
|
static const text_render_options_t shallow = {14, SAMPLE_SHALLOW, CENTER, BOTTOM};
|
2011-09-08 23:01:41 +00:00
|
|
|
int i;
|
2011-11-04 21:25:20 +00:00
|
|
|
int last = -1;
|
2011-09-08 03:55:22 +00:00
|
|
|
|
2011-09-08 23:01:41 +00:00
|
|
|
for (i = 0; i < pi->nr; i++) {
|
|
|
|
struct plot_data *entry = pi->entry + i;
|
|
|
|
|
2011-10-23 05:40:53 +00:00
|
|
|
if (entry->depth < 2000)
|
2011-09-08 03:55:22 +00:00
|
|
|
continue;
|
2011-09-08 23:01:41 +00:00
|
|
|
|
2011-11-04 21:25:20 +00:00
|
|
|
if ((entry == entry->max[2]) && entry->depth != last) {
|
2011-09-08 23:01:41 +00:00
|
|
|
render_depth_sample(gc, entry, &deep);
|
2011-11-04 21:25:20 +00:00
|
|
|
last = entry->depth;
|
|
|
|
}
|
2011-09-08 23:01:41 +00:00
|
|
|
|
2011-11-04 21:25:20 +00:00
|
|
|
if ((entry == entry->min[2]) && entry->depth != last) {
|
2011-09-08 23:01:41 +00:00
|
|
|
render_depth_sample(gc, entry, &shallow);
|
2011-11-04 21:25:20 +00:00
|
|
|
last = entry->depth;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (entry->depth != last)
|
|
|
|
last = -1;
|
2011-09-07 20:51:35 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-16 16:10:13 +00:00
|
|
|
static void plot_depth_text(struct graphics_context *gc, struct plot_info *pi)
|
2011-09-06 19:36:52 +00:00
|
|
|
{
|
|
|
|
int maxtime, maxdepth;
|
|
|
|
|
|
|
|
/* Get plot scaling limits */
|
2011-09-16 15:20:06 +00:00
|
|
|
maxtime = get_maxtime(pi);
|
2011-09-16 16:10:13 +00:00
|
|
|
maxdepth = get_maxdepth(pi);
|
2011-09-06 19:36:52 +00:00
|
|
|
|
2011-09-13 03:37:32 +00:00
|
|
|
gc->leftx = 0; gc->rightx = maxtime;
|
|
|
|
gc->topy = 0; gc->bottomy = maxdepth;
|
2011-09-06 19:36:52 +00:00
|
|
|
|
2011-09-08 23:01:41 +00:00
|
|
|
plot_text_samples(gc, pi);
|
2011-09-06 19:36:52 +00:00
|
|
|
}
|
|
|
|
|
2011-09-08 16:32:08 +00:00
|
|
|
static void plot_smoothed_profile(struct graphics_context *gc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct plot_data *entry = pi->entry;
|
|
|
|
|
2011-12-01 11:14:21 +00:00
|
|
|
set_source_rgba(gc, SMOOTHED);
|
2011-09-08 16:32:08 +00:00
|
|
|
move_to(gc, entry->sec, entry->smoothed);
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
entry++;
|
|
|
|
line_to(gc, entry->sec, entry->smoothed);
|
|
|
|
}
|
|
|
|
cairo_stroke(gc->cr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_info *pi,
|
2011-12-01 11:14:21 +00:00
|
|
|
int index)
|
2011-09-08 16:32:08 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct plot_data *entry = pi->entry;
|
|
|
|
|
2011-12-01 11:14:21 +00:00
|
|
|
set_source_rgba(gc, MINUTE);
|
2011-10-23 05:40:53 +00:00
|
|
|
move_to(gc, entry->sec, entry->min[index]->depth);
|
2011-09-08 16:32:08 +00:00
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
entry++;
|
2011-10-23 05:40:53 +00:00
|
|
|
line_to(gc, entry->sec, entry->min[index]->depth);
|
2011-09-08 16:32:08 +00:00
|
|
|
}
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
2011-10-23 05:40:53 +00:00
|
|
|
line_to(gc, entry->sec, entry->max[index]->depth);
|
2011-09-08 16:32:08 +00:00
|
|
|
entry--;
|
|
|
|
}
|
|
|
|
cairo_close_path(gc->cr);
|
|
|
|
cairo_fill(gc->cr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *pi)
|
|
|
|
{
|
2011-09-14 02:49:48 +00:00
|
|
|
if (gc->printer)
|
|
|
|
return;
|
2011-12-01 11:14:21 +00:00
|
|
|
plot_minmax_profile_minute(gc, pi, 2);
|
|
|
|
plot_minmax_profile_minute(gc, pi, 1);
|
|
|
|
plot_minmax_profile_minute(gc, pi, 0);
|
2011-09-08 16:32:08 +00:00
|
|
|
}
|
|
|
|
|
2012-10-29 17:56:20 +00:00
|
|
|
static void plot_depth_scale(struct graphics_context *gc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int i, maxdepth, marker;
|
2013-03-25 23:48:20 +00:00
|
|
|
static const text_render_options_t tro = {DEPTH_TEXT_SIZE, SAMPLE_DEEP, RIGHT, MIDDLE};
|
2012-10-29 17:56:20 +00:00
|
|
|
|
|
|
|
/* Depth markers: every 30 ft or 10 m*/
|
|
|
|
maxdepth = get_maxdepth(pi);
|
|
|
|
gc->topy = 0; gc->bottomy = maxdepth;
|
|
|
|
|
2013-01-11 01:26:10 +00:00
|
|
|
switch (prefs.units.length) {
|
2012-10-29 17:56:20 +00:00
|
|
|
case METERS: marker = 10000; break;
|
|
|
|
case FEET: marker = 9144; break; /* 30 ft */
|
|
|
|
}
|
|
|
|
set_source_rgba(gc, DEPTH_GRID);
|
2012-12-11 23:58:37 +00:00
|
|
|
/* don't write depth labels all the way to the bottom as
|
|
|
|
* there may be other graphs below the depth plot (like
|
|
|
|
* partial pressure graphs) where this would look out
|
|
|
|
* of place - so we only make sure that we print the next
|
|
|
|
* marker below the actual maxdepth of the dive */
|
|
|
|
for (i = marker; i <= pi->maxdepth + marker; i += marker) {
|
2012-10-29 17:56:20 +00:00
|
|
|
double d = get_depth_units(i, NULL, NULL);
|
|
|
|
plot_text(gc, &tro, -0.002, i, "%.0f", d);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-05 16:56:18 +00:00
|
|
|
static void setup_pp_limits(struct graphics_context *gc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int maxdepth;
|
|
|
|
|
|
|
|
gc->leftx = 0;
|
|
|
|
gc->rightx = get_maxtime(pi);
|
|
|
|
|
|
|
|
/* the maxdepth already includes extra vertical space - and if
|
2012-11-06 04:44:51 +00:00
|
|
|
* we use 1.5 times the corresponding pressure as maximum partial
|
2012-11-05 16:56:18 +00:00
|
|
|
* pressure the graph seems to look fine*/
|
|
|
|
maxdepth = get_maxdepth(pi);
|
2013-01-14 22:53:38 +00:00
|
|
|
gc->topy = 1.5 * (maxdepth + 10000) / 10000.0 * SURFACE_PRESSURE / 1000;
|
2012-12-07 18:49:02 +00:00
|
|
|
gc->bottomy = -gc->topy / 20;
|
2012-11-05 16:56:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void plot_pp_text(struct graphics_context *gc, struct plot_info *pi)
|
|
|
|
{
|
2012-12-09 22:34:41 +00:00
|
|
|
double pp, dpp, m;
|
2012-11-06 05:41:34 +00:00
|
|
|
int hpos;
|
2013-03-25 23:48:20 +00:00
|
|
|
static const text_render_options_t tro = {PP_TEXT_SIZE, PP_LINES, LEFT, MIDDLE};
|
2012-11-06 05:41:34 +00:00
|
|
|
|
2012-11-05 16:56:18 +00:00
|
|
|
setup_pp_limits(gc, pi);
|
2012-12-09 22:34:41 +00:00
|
|
|
pp = floor(pi->maxpp * 10.0) / 10.0 + 0.2;
|
2012-12-17 08:02:42 +00:00
|
|
|
dpp = pp > 4 ? 1.0 : 0.5;
|
2012-12-09 22:34:41 +00:00
|
|
|
hpos = pi->entry[pi->nr - 1].sec;
|
|
|
|
set_source_rgba(gc, PP_LINES);
|
|
|
|
for (m = 0.0; m <= pp; m += dpp) {
|
|
|
|
move_to(gc, 0, m);
|
|
|
|
line_to(gc, hpos, m);
|
|
|
|
cairo_stroke(gc->cr);
|
|
|
|
plot_text(gc, &tro, hpos + 30, m, "%.1f", m);
|
2012-11-05 16:56:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-01 22:39:15 +00:00
|
|
|
static void plot_pp_gas_profile(struct graphics_context *gc, struct plot_info *pi)
|
2012-11-01 17:04:12 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct plot_data *entry;
|
|
|
|
|
2012-11-06 04:44:51 +00:00
|
|
|
setup_pp_limits(gc, pi);
|
2012-11-01 17:04:12 +00:00
|
|
|
|
2012-12-10 17:20:57 +00:00
|
|
|
if (prefs.pp_graphs.pn2) {
|
2012-11-01 22:39:15 +00:00
|
|
|
set_source_rgba(gc, PN2);
|
2012-11-10 16:58:42 +00:00
|
|
|
entry = pi->entry;
|
|
|
|
move_to(gc, entry->sec, entry->pn2);
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
entry++;
|
2012-12-10 17:20:57 +00:00
|
|
|
if (entry->pn2 < prefs.pp_graphs.pn2_threshold)
|
2012-11-10 16:58:42 +00:00
|
|
|
line_to(gc, entry->sec, entry->pn2);
|
|
|
|
else
|
|
|
|
move_to(gc, entry->sec, entry->pn2);
|
|
|
|
}
|
|
|
|
cairo_stroke(gc->cr);
|
2012-11-01 22:39:15 +00:00
|
|
|
|
2012-11-10 16:58:42 +00:00
|
|
|
set_source_rgba(gc, PN2_ALERT);
|
2012-11-01 22:39:15 +00:00
|
|
|
entry = pi->entry;
|
|
|
|
move_to(gc, entry->sec, entry->pn2);
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
entry++;
|
2012-12-10 17:20:57 +00:00
|
|
|
if (entry->pn2 >= prefs.pp_graphs.pn2_threshold)
|
2012-11-10 16:58:42 +00:00
|
|
|
line_to(gc, entry->sec, entry->pn2);
|
|
|
|
else
|
|
|
|
move_to(gc, entry->sec, entry->pn2);
|
2012-11-01 22:39:15 +00:00
|
|
|
}
|
|
|
|
cairo_stroke(gc->cr);
|
|
|
|
}
|
2012-12-10 17:20:57 +00:00
|
|
|
if (prefs.pp_graphs.phe) {
|
2012-11-01 22:39:15 +00:00
|
|
|
set_source_rgba(gc, PHE);
|
2012-11-10 16:58:42 +00:00
|
|
|
entry = pi->entry;
|
|
|
|
move_to(gc, entry->sec, entry->phe);
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
entry++;
|
2012-12-10 17:20:57 +00:00
|
|
|
if (entry->phe < prefs.pp_graphs.phe_threshold)
|
2012-11-10 16:58:42 +00:00
|
|
|
line_to(gc, entry->sec, entry->phe);
|
|
|
|
else
|
|
|
|
move_to(gc, entry->sec, entry->phe);
|
|
|
|
}
|
|
|
|
cairo_stroke(gc->cr);
|
2012-11-01 22:39:15 +00:00
|
|
|
|
2012-11-10 16:58:42 +00:00
|
|
|
set_source_rgba(gc, PHE_ALERT);
|
2012-11-01 22:39:15 +00:00
|
|
|
entry = pi->entry;
|
|
|
|
move_to(gc, entry->sec, entry->phe);
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
entry++;
|
2012-12-10 17:20:57 +00:00
|
|
|
if (entry->phe >= prefs.pp_graphs.phe_threshold)
|
2012-11-10 16:58:42 +00:00
|
|
|
line_to(gc, entry->sec, entry->phe);
|
|
|
|
else
|
|
|
|
move_to(gc, entry->sec, entry->phe);
|
2012-11-01 22:39:15 +00:00
|
|
|
}
|
|
|
|
cairo_stroke(gc->cr);
|
2012-11-01 17:04:12 +00:00
|
|
|
}
|
2012-12-11 21:09:48 +00:00
|
|
|
if (prefs.pp_graphs.po2) {
|
2012-12-08 22:07:10 +00:00
|
|
|
set_source_rgba(gc, PO2);
|
|
|
|
entry = pi->entry;
|
|
|
|
move_to(gc, entry->sec, entry->po2);
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
entry++;
|
2012-12-11 21:09:48 +00:00
|
|
|
if (entry->po2 < prefs.pp_graphs.po2_threshold)
|
2012-12-08 22:07:10 +00:00
|
|
|
line_to(gc, entry->sec, entry->po2);
|
|
|
|
else
|
|
|
|
move_to(gc, entry->sec, entry->po2);
|
|
|
|
}
|
|
|
|
cairo_stroke(gc->cr);
|
|
|
|
|
|
|
|
set_source_rgba(gc, PO2_ALERT);
|
|
|
|
entry = pi->entry;
|
|
|
|
move_to(gc, entry->sec, entry->po2);
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
|
|
|
entry++;
|
2012-12-11 21:09:48 +00:00
|
|
|
if (entry->po2 >= prefs.pp_graphs.po2_threshold)
|
2012-12-08 22:07:10 +00:00
|
|
|
line_to(gc, entry->sec, entry->po2);
|
|
|
|
else
|
|
|
|
move_to(gc, entry->sec, entry->po2);
|
|
|
|
}
|
|
|
|
cairo_stroke(gc->cr);
|
|
|
|
}
|
2012-11-01 17:04:12 +00:00
|
|
|
}
|
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
2011-09-13 03:37:32 +00:00
|
|
|
|
2011-09-13 15:16:29 +00:00
|
|
|
|
2011-09-16 15:42:27 +00:00
|
|
|
static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkelvin)
|
2011-09-13 15:16:29 +00:00
|
|
|
{
|
2011-11-01 18:39:52 +00:00
|
|
|
double deg;
|
2011-09-15 16:10:08 +00:00
|
|
|
const char *unit;
|
2013-03-25 23:48:20 +00:00
|
|
|
static const text_render_options_t tro = {TEMP_TEXT_SIZE, TEMP_TEXT, LEFT, TOP};
|
2011-09-13 15:16:29 +00:00
|
|
|
|
2011-11-01 18:39:52 +00:00
|
|
|
deg = get_temp_units(mkelvin, &unit);
|
|
|
|
|
2013-01-23 20:33:26 +00:00
|
|
|
plot_text(gc, &tro, sec, mkelvin, "%.2g%s", deg, unit);
|
2011-09-15 16:10:08 +00:00
|
|
|
}
|
|
|
|
|
2011-09-16 15:42:27 +00:00
|
|
|
static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
|
2011-09-15 16:10:08 +00:00
|
|
|
{
|
|
|
|
int i;
|
2011-11-09 21:01:11 +00:00
|
|
|
int last = -300, sec = 0;
|
2011-09-16 15:42:27 +00:00
|
|
|
int last_temperature = 0, last_printed_temp = 0;
|
2011-09-13 15:16:29 +00:00
|
|
|
|
2011-09-16 15:42:27 +00:00
|
|
|
if (!setup_temperature_limits(gc, pi))
|
2011-09-13 15:16:29 +00:00
|
|
|
return;
|
|
|
|
|
2011-09-16 15:42:27 +00:00
|
|
|
for (i = 0; i < pi->nr; i++) {
|
|
|
|
struct plot_data *entry = pi->entry+i;
|
|
|
|
int mkelvin = entry->temperature;
|
2013-02-05 08:28:24 +00:00
|
|
|
sec = entry->sec;
|
2011-09-16 15:42:27 +00:00
|
|
|
|
2011-09-13 03:37:32 +00:00
|
|
|
if (!mkelvin)
|
2011-09-13 15:16:29 +00:00
|
|
|
continue;
|
2011-09-16 15:42:27 +00:00
|
|
|
last_temperature = mkelvin;
|
2011-11-09 21:01:11 +00:00
|
|
|
/* don't print a temperature
|
|
|
|
* if it's been less than 5min and less than a 2K change OR
|
|
|
|
* if it's been less than 2min OR if the change from the
|
|
|
|
* last print is less than .4K (and therefore less than 1F */
|
|
|
|
if (((sec < last + 300) && (abs(mkelvin - last_printed_temp) < 2000)) ||
|
|
|
|
(sec < last + 120) ||
|
|
|
|
(abs(mkelvin - last_printed_temp) < 400))
|
2011-09-13 15:16:29 +00:00
|
|
|
continue;
|
2011-09-16 15:42:27 +00:00
|
|
|
last = sec;
|
|
|
|
plot_single_temp_text(gc,sec,mkelvin);
|
|
|
|
last_printed_temp = mkelvin;
|
2011-09-15 16:10:08 +00:00
|
|
|
}
|
2011-11-09 21:01:11 +00:00
|
|
|
/* it would be nice to print the end temperature, if it's
|
|
|
|
* different or if the last temperature print has been more
|
|
|
|
* than a quarter of the dive back */
|
|
|
|
if ((abs(last_temperature - last_printed_temp) > 500) ||
|
|
|
|
((double)last / (double)sec < 0.75))
|
2011-09-16 16:51:38 +00:00
|
|
|
plot_single_temp_text(gc, sec, last_temperature);
|
2011-09-13 15:16:29 +00:00
|
|
|
}
|
|
|
|
|
2011-09-06 22:00:56 +00:00
|
|
|
/* gets both the actual start and end pressure as well as the scaling factors */
|
2013-05-09 03:24:03 +00:00
|
|
|
|
|
|
|
#endif /* USE_GTK_UI */
|
|
|
|
|
|
|
|
int get_cylinder_pressure_range(struct graphics_context *gc)
|
2011-09-03 20:19:26 +00:00
|
|
|
{
|
2011-09-16 15:20:06 +00:00
|
|
|
gc->leftx = 0;
|
2013-05-09 03:24:03 +00:00
|
|
|
gc->rightx = get_maxtime(&gc->pi);
|
2011-09-03 20:19:26 +00:00
|
|
|
|
2012-12-10 17:20:57 +00:00
|
|
|
if (PP_GRAPHS_ENABLED)
|
2013-05-09 03:24:03 +00:00
|
|
|
gc->bottomy = -gc->pi.maxpressure * 0.75;
|
2012-11-06 04:44:51 +00:00
|
|
|
else
|
|
|
|
gc->bottomy = 0;
|
2013-05-09 03:24:03 +00:00
|
|
|
gc->topy = gc->pi.maxpressure * 1.5;
|
|
|
|
if (!gc->pi.maxpressure)
|
2012-11-13 02:46:14 +00:00
|
|
|
return FALSE;
|
|
|
|
|
2013-05-09 03:24:03 +00:00
|
|
|
while (gc->pi.endtempcoord <= SCALEY(gc, gc->pi.minpressure - (gc->topy) * 0.1))
|
2012-11-13 02:46:14 +00:00
|
|
|
gc->bottomy -= gc->topy * 0.1;
|
|
|
|
|
|
|
|
return TRUE;
|
2011-09-03 20:19:26 +00:00
|
|
|
}
|
|
|
|
|
2011-11-17 02:34:50 +00:00
|
|
|
|
2013-02-25 23:23:16 +00:00
|
|
|
/* Get local sac-rate (in ml/min) between entry1 and entry2 */
|
2013-05-03 21:16:09 +00:00
|
|
|
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);
|
|
|
|
if (!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;
|
|
|
|
atm = (double) depth_to_mbar(depth, dive) / SURFACE_PRESSURE;
|
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
|
|
|
}
|
|
|
|
|
2013-05-03 18:04:51 +00:00
|
|
|
#if USE_GTK_UI
|
2011-11-17 02:34:50 +00:00
|
|
|
|
2011-09-03 20:19:26 +00:00
|
|
|
|
2011-10-22 02:04:44 +00:00
|
|
|
static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
|
|
|
|
int xalign, int yalign)
|
|
|
|
{
|
|
|
|
int pressure;
|
|
|
|
const char *unit;
|
|
|
|
|
2011-11-02 03:13:14 +00:00
|
|
|
pressure = get_pressure_units(mbar, &unit);
|
2013-03-25 23:48:20 +00:00
|
|
|
text_render_options_t tro = {PRESSURE_TEXT_SIZE, PRESSURE_TEXT, xalign, yalign};
|
2011-10-22 02:04:44 +00:00
|
|
|
plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
|
|
|
|
}
|
|
|
|
|
2011-11-20 18:27:19 +00:00
|
|
|
static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi)
|
2011-09-16 16:10:13 +00:00
|
|
|
{
|
2011-10-22 02:04:44 +00:00
|
|
|
int i;
|
|
|
|
int mbar, cyl;
|
|
|
|
int seen_cyl[MAX_CYLINDERS] = { FALSE, };
|
|
|
|
int last_pressure[MAX_CYLINDERS] = { 0, };
|
|
|
|
int last_time[MAX_CYLINDERS] = { 0, };
|
|
|
|
struct plot_data *entry;
|
2011-09-07 02:28:31 +00:00
|
|
|
|
2011-10-22 02:04:44 +00:00
|
|
|
if (!get_cylinder_pressure_range(gc, pi))
|
|
|
|
return;
|
|
|
|
|
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
|
|
|
cyl = -1;
|
|
|
|
for (i = 0; i < pi->nr; i++) {
|
2011-10-22 02:04:44 +00:00
|
|
|
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
|
|
|
mbar = GET_PRESSURE(entry);
|
2011-10-22 02:04:44 +00:00
|
|
|
|
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 (!mbar)
|
|
|
|
continue;
|
|
|
|
if (cyl != entry->cylinderindex) {
|
2011-10-22 02:04:44 +00:00
|
|
|
cyl = entry->cylinderindex;
|
|
|
|
if (!seen_cyl[cyl]) {
|
|
|
|
plot_pressure_value(gc, mbar, entry->sec, LEFT, BOTTOM);
|
|
|
|
seen_cyl[cyl] = TRUE;
|
|
|
|
}
|
2011-09-07 02:28:31 +00:00
|
|
|
}
|
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
|
|
|
last_pressure[cyl] = mbar;
|
|
|
|
last_time[cyl] = entry->sec;
|
2011-10-22 02:04:44 +00:00
|
|
|
}
|
2011-09-07 02:28:31 +00:00
|
|
|
|
2011-10-22 02:04:44 +00:00
|
|
|
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
|
|
|
|
if (last_time[cyl]) {
|
2011-11-20 18:27:19 +00:00
|
|
|
plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP);
|
2011-10-22 02:04:44 +00:00
|
|
|
}
|
2011-09-06 21:46:46 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-29 19:22:35 +00:00
|
|
|
static void plot_deco_text(struct graphics_context *gc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
if (prefs.profile_calc_ceiling) {
|
2013-01-31 03:55:37 +00:00
|
|
|
float x = gc->leftx + (gc->rightx - gc->leftx) / 2;
|
2013-02-03 01:19:53 +00:00
|
|
|
float y = gc->topy = 1.0;
|
2013-03-25 23:48:20 +00:00
|
|
|
text_render_options_t tro = {PRESSURE_TEXT_SIZE, PRESSURE_TEXT, CENTER, -0.2};
|
2013-02-03 01:19:53 +00:00
|
|
|
gc->bottomy = 0.0;
|
2013-01-31 03:55:37 +00:00
|
|
|
plot_text(gc, &tro, x, y, "GF %.0f/%.0f", prefs.gflow * 100, prefs.gfhigh * 100);
|
2013-01-29 19:22:35 +00:00
|
|
|
}
|
|
|
|
}
|
2013-05-03 18:04:51 +00:00
|
|
|
#endif /* USE_GTK_UI */
|
2013-01-29 19:22:35 +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;
|
2011-09-08 22:59:04 +00:00
|
|
|
int seconds = 90*(index+1);
|
|
|
|
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;
|
2011-09-08 15:33:02 +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;
|
|
|
|
entry->avg[index] = (avg + nr/2) / nr;
|
|
|
|
}
|
|
|
|
|
|
|
|
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
|
|
|
|
2011-09-08 15:33:02 +00:00
|
|
|
static struct plot_info *analyze_plot_info(struct plot_info *pi)
|
|
|
|
{
|
|
|
|
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++) {
|
2011-09-08 15:33:02 +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
|
|
|
|
2011-09-16 23:22:00 +00:00
|
|
|
if (i < nr-2) {
|
2011-10-23 05:40:53 +00:00
|
|
|
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) {
|
2011-10-23 05:40:53 +00:00
|
|
|
entry->velocity = velocity((entry[0].depth - entry[-1].depth) / (entry[0].sec - entry[-1].sec));
|
2011-09-17 04:45:32 +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;
|
2011-09-30 05:49:12 +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) /
|
2011-09-17 04:45:32 +00:00
|
|
|
(entry[0].sec - entry[past].sec));
|
|
|
|
}
|
2013-01-29 21:10:46 +00:00
|
|
|
} else {
|
2011-09-16 23:22:00 +00:00
|
|
|
entry->velocity = STABLE;
|
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++) {
|
|
|
|
struct plot_data *entry = pi->entry +i;
|
|
|
|
analyze_plot_info_minmax(entry, pi->entry, pi->entry+nr);
|
|
|
|
}
|
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;
|
|
|
|
};
|
|
|
|
|
|
|
|
static pr_track_t *pr_track_alloc(int start, int t_start) {
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
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,
|
2011-11-21 20:29:16 +00:00
|
|
|
list->start, list->end, list->t_start, list->t_end, list->pressure_time);
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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)
|
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
|
|
|
pressure -= (start-end)*(double)pt/pt_sum;
|
2013-01-07 02:20:12 +00:00
|
|
|
list->end = pressure;
|
|
|
|
if (list == tmp)
|
|
|
|
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;
|
|
|
|
int depth = (a->depth + b->depth)/2;
|
|
|
|
|
2013-02-09 00:15:18 +00:00
|
|
|
return depth_to_mbar(depth, dive) * time;
|
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];
|
|
|
|
|
2011-11-21 20:29:16 +00:00
|
|
|
if (0) {
|
|
|
|
/* another great debugging tool */
|
|
|
|
dump_pr_track(track_pr);
|
|
|
|
}
|
2011-10-22 02:04:44 +00:00
|
|
|
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
|
2013-03-28 19:03:00 +00:00
|
|
|
if (!track_pr[cyl])
|
|
|
|
continue;
|
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-01-07 02:20:12 +00:00
|
|
|
double magic, cur_pt;
|
|
|
|
pr_track_t *segment;
|
|
|
|
int pressure;
|
|
|
|
|
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
|
|
|
|
|
|
|
/* Find the right pressure segment for this entry.. */
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Overall pressure change over total pressure-time for this segment*/
|
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
|
|
|
magic = (segment->end - segment->start) / (double) segment->pressure_time;
|
2013-01-07 02:20:12 +00:00
|
|
|
|
|
|
|
/* Use that overall pressure change to update the current pressure */
|
2013-02-08 20:49:12 +00:00
|
|
|
cur_pt = pressure_time(dive, &dive->dc, entry-1, entry);
|
2013-01-07 02:20:12 +00:00
|
|
|
pressure = cur_pr[cyl] + cur_pt * magic + 0.5;
|
|
|
|
INTERPOLATED_PRESSURE(entry) = pressure;
|
|
|
|
cur_pr[cyl] = pressure;
|
2011-10-22 02:04:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-10-23 14:52:45 +00:00
|
|
|
static int get_cylinder_index(struct dive *dive, struct event *ev)
|
|
|
|
{
|
|
|
|
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++) {
|
|
|
|
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;
|
|
|
|
distance = delta_o2 * delta_o2 + delta_he * delta_he;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int set_cylinder_index(struct plot_info *pi, int i, int cylinderindex, unsigned int end)
|
|
|
|
{
|
|
|
|
while (i < pi->nr) {
|
|
|
|
struct plot_data *entry = pi->entry+i;
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2013-05-03 21:16:09 +00:00
|
|
|
void calculate_max_limits(struct dive *dive, struct divecomputer *dc, struct graphics_context *gc)
|
2012-12-10 00:54:16 +00:00
|
|
|
{
|
|
|
|
struct plot_info *pi;
|
2013-01-26 00:17:55 +00:00
|
|
|
int maxdepth;
|
2012-12-10 00:54:16 +00:00
|
|
|
int maxtime = 0;
|
|
|
|
int maxpressure = 0, minpressure = INT_MAX;
|
2013-01-26 00:17:55 +00:00
|
|
|
int mintemp, maxtemp;
|
2012-12-10 00:54:16 +00:00
|
|
|
int cyl;
|
|
|
|
|
|
|
|
/* The plot-info is embedded in the graphics context */
|
|
|
|
pi = &gc->pi;
|
|
|
|
memset(pi, 0, sizeof(*pi));
|
|
|
|
|
2013-02-09 04:44:04 +00:00
|
|
|
maxdepth = dive->maxdepth.mm;
|
|
|
|
mintemp = dive->mintemp.mkelvin;
|
|
|
|
maxtemp = dive->maxtemp.mkelvin;
|
2012-12-10 00:54:16 +00:00
|
|
|
|
|
|
|
/* 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;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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;
|
|
|
|
|
|
|
|
if (!mintemp && temperature < mintemp)
|
|
|
|
mintemp = temperature;
|
|
|
|
if (temperature > maxtemp)
|
|
|
|
maxtemp = temperature;
|
|
|
|
|
|
|
|
if (pressure && pressure < minpressure)
|
|
|
|
minpressure = pressure;
|
|
|
|
if (pressure > maxpressure)
|
|
|
|
maxpressure = pressure;
|
|
|
|
|
|
|
|
if (depth > maxdepth)
|
|
|
|
maxdepth = s->depth.mm;
|
2013-02-04 05:21:33 +00:00
|
|
|
if ((depth > SURFACE_THRESHOLD || lastdepth > SURFACE_THRESHOLD) &&
|
|
|
|
s->time.seconds > maxtime)
|
2012-12-10 00:54:16 +00:00
|
|
|
maxtime = s->time.seconds;
|
|
|
|
lastdepth = depth;
|
|
|
|
s++;
|
|
|
|
}
|
|
|
|
} while ((dc = dc->next) != NULL);
|
|
|
|
|
|
|
|
if (minpressure > maxpressure)
|
|
|
|
minpressure = 0;
|
|
|
|
|
|
|
|
pi->maxdepth = maxdepth;
|
|
|
|
pi->maxtime = maxtime;
|
|
|
|
pi->maxpressure = maxpressure;
|
|
|
|
pi->minpressure = minpressure;
|
|
|
|
pi->mintemp = mintemp;
|
|
|
|
pi->maxtemp = maxtemp;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
static struct plot_data *populate_plot_entries(struct dive *dive, struct divecomputer *dc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int idx, maxtime, nr, i;
|
|
|
|
int lastdepth, lasttime;
|
|
|
|
struct plot_data *plot_data;
|
|
|
|
|
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"),
|
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
|
|
|
* but samples could be more dense than that (so add in dc->samples), and
|
|
|
|
* additionally we want two surface events around the whole thing (thus the
|
|
|
|
* additional 4).
|
|
|
|
*/
|
2013-01-07 02:20:12 +00:00
|
|
|
nr = dc->samples + 5 + maxtime / 10;
|
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;
|
|
|
|
for (i = 0; i < dc->samples; i++) {
|
|
|
|
struct plot_data *entry = plot_data + idx;
|
|
|
|
struct sample *sample = dc->sample+i;
|
|
|
|
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;
|
|
|
|
|
|
|
|
/* Use the data from the previous plot entry */
|
|
|
|
*entry = entry[-1];
|
|
|
|
|
|
|
|
/* .. but update depth and time, obviously */
|
|
|
|
entry->sec = lasttime + offset;
|
2013-01-08 23:48:23 +00:00
|
|
|
entry->depth = 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
|
|
|
|
|
|
|
/* And clear out the sensor pressure, since we'll interpolate */
|
|
|
|
SENSOR_PRESSURE(entry) = 0;
|
|
|
|
|
|
|
|
idx++; entry++;
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
entry->temperature = sample->temperature.mkelvin;
|
|
|
|
|
|
|
|
lasttime = time;
|
|
|
|
lastdepth = depth;
|
|
|
|
idx++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add two final surface events */
|
|
|
|
plot_data[idx++].sec = lasttime+10;
|
|
|
|
plot_data[idx++].sec = lasttime+20;
|
|
|
|
pi->nr = idx;
|
|
|
|
|
|
|
|
return plot_data;
|
|
|
|
}
|
|
|
|
|
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++) {
|
|
|
|
struct plot_data *entry = pi->entry+i;
|
|
|
|
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++) {
|
|
|
|
struct plot_data *entry = pi->entry+i;
|
|
|
|
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 */) {
|
2013-01-07 00:09:48 +00:00
|
|
|
struct plot_data *entry = pi->entry+i;
|
|
|
|
if (entry->cylinderindex != idx)
|
|
|
|
continue;
|
|
|
|
SENSOR_PRESSURE(entry) = end;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2011-10-23 14:18:30 +00:00
|
|
|
|
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++) {
|
|
|
|
cylinder_t *cyl = dive->cylinder+i;
|
|
|
|
int start = cyl->start.mbar ? : cyl->sample_start.mbar;
|
|
|
|
int end = cyl->end.mbar ? : cyl->sample_end.mbar;
|
|
|
|
|
|
|
|
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;
|
|
|
|
pr_track_t *track_pr[MAX_CYLINDERS] = {NULL, };
|
|
|
|
pr_track_t *current;
|
|
|
|
gboolean missing_pr = FALSE;
|
|
|
|
|
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) {
|
|
|
|
current->pressure_time += pressure_time(dive, dc, entry-1, entry);
|
|
|
|
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? */
|
|
|
|
if (SENSOR_PRESSURE(entry-1))
|
|
|
|
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]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void calculate_deco_information(struct dive *dive, struct divecomputer *dc, struct plot_info *pi)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
double amb_pressure;
|
2013-02-08 20:49:12 +00:00
|
|
|
double surface_pressure = (dc->surface_pressure.mbar ? dc->surface_pressure.mbar : get_surface_pressure_in_mbar(dive, TRUE)) / 1000.0;
|
2013-01-07 00:09:48 +00:00
|
|
|
|
|
|
|
for (i = 1; i < pi->nr; i++) {
|
2013-01-08 21:47:01 +00:00
|
|
|
int fo2, fhe, j, t0, t1;
|
|
|
|
double tissue_tolerance;
|
2013-01-07 00:09:48 +00:00
|
|
|
struct plot_data *entry = pi->entry + i;
|
|
|
|
int cylinderindex = entry->cylinderindex;
|
|
|
|
|
2013-02-09 00:15:18 +00:00
|
|
|
amb_pressure = depth_to_mbar(entry->depth, dive) / 1000.0;
|
2013-03-28 17:06:43 +00:00
|
|
|
fo2 = get_o2(&dive->cylinder[cylinderindex].gasmix);
|
|
|
|
fhe = get_he(&dive->cylinder[cylinderindex].gasmix);
|
2013-01-14 22:53:38 +00:00
|
|
|
double ratio = (double)fhe / (1000.0 - fo2);
|
2012-11-07 14:06:18 +00:00
|
|
|
|
2012-12-08 05:05:21 +00:00
|
|
|
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 */
|
2012-12-09 05:14:00 +00:00
|
|
|
double po2 = entry->po2 > amb_pressure ? amb_pressure : entry->po2;
|
2013-01-14 22:53:38 +00:00
|
|
|
entry->po2 = po2;
|
2012-12-09 05:14:00 +00:00
|
|
|
entry->phe = (amb_pressure - po2) * ratio;
|
|
|
|
entry->pn2 = amb_pressure - po2 - entry->phe;
|
2012-12-08 05:05:21 +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;
|
|
|
|
}
|
2013-01-14 22:53:38 +00:00
|
|
|
|
|
|
|
/* Calculate MOD, EAD, END and EADD based on partial pressures calculated before
|
|
|
|
* so there is no difference in calculating between OC and CC
|
|
|
|
* EAD takes O2 + N2 (air) into account
|
|
|
|
* END just uses N2 */
|
|
|
|
entry->mod = (prefs.mod_ppO2 / fo2 * 1000 - 1) * 10000;
|
|
|
|
entry->ead = (entry->depth + 10000) *
|
|
|
|
(entry->po2 + (amb_pressure - entry->po2) * (1 - ratio)) / amb_pressure - 10000;
|
|
|
|
entry->end = (entry->depth + 10000) *
|
|
|
|
(amb_pressure - entry->po2) * (1 - ratio) / amb_pressure / N2_IN_AIR * 1000 - 10000;
|
|
|
|
entry->eadd = (entry->depth + 10000) *
|
|
|
|
(entry->po2 / amb_pressure * O2_DENSITY + entry->pn2 / amb_pressure *
|
|
|
|
N2_DENSITY + entry->phe / amb_pressure * HE_DENSITY) /
|
|
|
|
(O2_IN_AIR * O2_DENSITY + N2_IN_AIR * N2_DENSITY) * 1000 -10000;
|
2013-01-29 21:10:46 +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-14 22:53:38 +00:00
|
|
|
|
2013-01-13 12:02:37 +00:00
|
|
|
if (entry->po2 > pi->maxpp && prefs.pp_graphs.po2)
|
2012-12-09 22:34:41 +00:00
|
|
|
pi->maxpp = entry->po2;
|
2013-01-13 12:02:37 +00:00
|
|
|
if (entry->phe > pi->maxpp && prefs.pp_graphs.phe)
|
2012-12-09 22:34:41 +00:00
|
|
|
pi->maxpp = entry->phe;
|
2013-01-13 12:02:37 +00:00
|
|
|
if (entry->pn2 > pi->maxpp && prefs.pp_graphs.pn2)
|
2012-12-09 22:34:41 +00:00
|
|
|
pi->maxpp = entry->pn2;
|
2013-01-07 00:09:48 +00:00
|
|
|
|
2013-01-03 05:21:36 +00:00
|
|
|
/* and now let's try to do some deco calculations */
|
2013-01-08 21:47:01 +00:00
|
|
|
t0 = (entry - 1)->sec;
|
|
|
|
t1 = entry->sec;
|
|
|
|
tissue_tolerance = 0;
|
Fix odd calculated deco "ripples"
Previously we calculate the ceiling at every single second, using the
interpolated depth but then only *save* the ceiling at the points where we
have a profile event (the whole deco_allowed_depth() function doesn't
change any state, so we can just drop it entirely at points that we aren't
going to save)
Why is it incorrect? I'll try to walk through my understanding of it, by
switching things around a bit.
- the whole "minimum tissue tolerance" thing could equally well be
rewritten to be about "maximum ceiling". And that's easier to think
about (since it's what we actually show), so let's do that.
- so turning "min_pressure" into "max_ceiling", doing the whole
comparison inside the loop means is that we are calculating the
maximum ceiling value for the duration of the last sample. And then
instead of visualizing the ceiling AT THE TIME OF MAXIMUM CEILING, we
visualize that maximal ceiling value AT THE TIME OF THE SAMPLE.
End result: we visualize the ceiling at the wrong time. We visualize
what was *a* ceiling somewhere in between that sample and the previous
one, but we then assign that value to the time of the sample itself.
So it ends up having random odd effects.
And that also explains why you only see the effect during the ascent.
During the descent, the max ceiling will be at the end of our
linearization of the sampling, which is - surprise surprise - the position
of the sample itself. So we end up seeing the right ceiling at the right
time while descending. So the visualization matches the math.
But during desaturation, the maximum ceiling is not at the end of the
sample period, it's at the beginning. So the whole "max ceiling" thing has
basically turned what should be a smooth graph into something that
approaches being a step-wise graph at each sample. Ergo: a ripple.
And doing the "max_ceiling during the sample interval" thing may sound
like the safe thing to do, but the thing is, that really *is* a false
sense of safety. The ceiling value is *not* what we compute. The ceiling
value is just a visualization of what we computed. Playing games with it
can only make the visualization of the real data worse, not better.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-14 16:26:40 +00:00
|
|
|
for (j = t0+1; j <= t1; j++) {
|
2013-01-08 23:48:23 +00:00
|
|
|
int depth = interpolate(entry[-1].depth, entry[0].depth, j - t0, t1 - t0);
|
2013-02-09 00:15:18 +00:00
|
|
|
double min_pressure = add_segment(depth_to_mbar(depth, dive) / 1000.0,
|
2013-02-02 18:38:51 +00:00
|
|
|
&dive->cylinder[cylinderindex].gasmix, 1, entry->po2 * 1000, dive);
|
Fix odd calculated deco "ripples"
Previously we calculate the ceiling at every single second, using the
interpolated depth but then only *save* the ceiling at the points where we
have a profile event (the whole deco_allowed_depth() function doesn't
change any state, so we can just drop it entirely at points that we aren't
going to save)
Why is it incorrect? I'll try to walk through my understanding of it, by
switching things around a bit.
- the whole "minimum tissue tolerance" thing could equally well be
rewritten to be about "maximum ceiling". And that's easier to think
about (since it's what we actually show), so let's do that.
- so turning "min_pressure" into "max_ceiling", doing the whole
comparison inside the loop means is that we are calculating the
maximum ceiling value for the duration of the last sample. And then
instead of visualizing the ceiling AT THE TIME OF MAXIMUM CEILING, we
visualize that maximal ceiling value AT THE TIME OF THE SAMPLE.
End result: we visualize the ceiling at the wrong time. We visualize
what was *a* ceiling somewhere in between that sample and the previous
one, but we then assign that value to the time of the sample itself.
So it ends up having random odd effects.
And that also explains why you only see the effect during the ascent.
During the descent, the max ceiling will be at the end of our
linearization of the sampling, which is - surprise surprise - the position
of the sample itself. So we end up seeing the right ceiling at the right
time while descending. So the visualization matches the math.
But during desaturation, the maximum ceiling is not at the end of the
sample period, it's at the beginning. So the whole "max ceiling" thing has
basically turned what should be a smooth graph into something that
approaches being a step-wise graph at each sample. Ergo: a ripple.
And doing the "max_ceiling during the sample interval" thing may sound
like the safe thing to do, but the thing is, that really *is* a false
sense of safety. The ceiling value is *not* what we compute. The ceiling
value is just a visualization of what we computed. Playing games with it
can only make the visualization of the real data worse, not better.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2013-01-14 16:26:40 +00:00
|
|
|
tissue_tolerance = min_pressure;
|
2013-01-03 05:21:36 +00:00
|
|
|
}
|
2013-01-08 21:47:01 +00:00
|
|
|
if (t0 == t1)
|
|
|
|
entry->ceiling = (entry - 1)->ceiling;
|
|
|
|
else
|
|
|
|
entry->ceiling = deco_allowed_depth(tissue_tolerance, surface_pressure, dive, !prefs.calc_ceiling_3m_incr);
|
2011-09-08 15:33:02 +00:00
|
|
|
}
|
2013-01-07 00:09:48 +00:00
|
|
|
|
2013-01-04 19:56:43 +00:00
|
|
|
#if DECO_CALC_DEBUG & 1
|
2013-01-04 04:45:20 +00:00
|
|
|
dump_tissues();
|
|
|
|
#endif
|
2013-01-07 00:09:48 +00:00
|
|
|
}
|
2011-10-23 14:18:30 +00:00
|
|
|
|
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.
|
|
|
|
*/
|
2013-05-03 21:16:09 +00:00
|
|
|
struct plot_info *create_plot_info(struct dive *dive, struct divecomputer *dc, struct graphics_context *gc)
|
2013-01-07 00:09:48 +00:00
|
|
|
{
|
|
|
|
struct plot_info *pi;
|
2011-10-29 20:24:56 +00:00
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
/* The plot-info is embedded in the graphics context */
|
|
|
|
pi = &gc->pi;
|
2012-11-01 22:39:15 +00:00
|
|
|
|
2013-01-07 00:09:48 +00:00
|
|
|
/* reset deco information to start the calculation */
|
|
|
|
init_decompression(dive);
|
|
|
|
|
|
|
|
/* Create the new plot data */
|
|
|
|
if (last_pi_entry)
|
|
|
|
free((void *)last_pi_entry);
|
|
|
|
last_pi_entry = populate_plot_entries(dive, dc, pi);
|
|
|
|
|
|
|
|
/* Populate the gas index from the gas change events */
|
|
|
|
check_gas_change_events(dive, dc, pi);
|
|
|
|
|
|
|
|
/* Try to populate our gas pressure knowledge */
|
|
|
|
setup_gas_sensor_pressure(dive, dc, pi);
|
|
|
|
|
|
|
|
/* .. calculate missing pressure entries */
|
|
|
|
populate_pressure_information(dive, dc, pi);
|
|
|
|
|
|
|
|
/* Then, calculate partial pressures and deco information */
|
|
|
|
calculate_deco_information(dive, dc, pi);
|
2013-01-23 18:25:31 +00:00
|
|
|
pi->meandepth = dive->dc.meandepth.mm;
|
2011-09-16 16:10:13 +00:00
|
|
|
|
2011-11-04 21:32:15 +00:00
|
|
|
if (0) /* awesome for debugging - not useful otherwise */
|
|
|
|
dump_pi(pi);
|
2011-09-08 15:33:02 +00:00
|
|
|
return analyze_plot_info(pi);
|
|
|
|
}
|
|
|
|
|
2013-05-03 18:04:51 +00:00
|
|
|
#if USE_GTK_UI
|
2012-09-11 08:16:34 +00:00
|
|
|
static void plot_set_scale(scale_mode_t scale)
|
|
|
|
{
|
|
|
|
switch (scale) {
|
|
|
|
default:
|
|
|
|
case SC_SCREEN:
|
|
|
|
plot_scale = SCALE_SCREEN;
|
|
|
|
break;
|
|
|
|
case SC_PRINT:
|
|
|
|
plot_scale = SCALE_PRINT;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2013-05-03 18:04:51 +00:00
|
|
|
#endif
|
2012-09-11 08:16:34 +00:00
|
|
|
|
2013-01-01 18:20:22 +00:00
|
|
|
/* make sure you pass this the FIRST dc - it just walks the list */
|
|
|
|
static int nr_dcs(struct divecomputer *main)
|
|
|
|
{
|
|
|
|
int i = 1;
|
|
|
|
struct divecomputer *dc = main;
|
|
|
|
|
|
|
|
while ((dc = dc->next) != NULL)
|
|
|
|
i++;
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
2013-02-09 14:17:25 +00:00
|
|
|
struct divecomputer *select_dc(struct divecomputer *main)
|
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
|
|
|
{
|
|
|
|
int i = dc_number;
|
|
|
|
struct divecomputer *dc = main;
|
|
|
|
|
2013-01-01 18:20:22 +00:00
|
|
|
while (i < 0)
|
|
|
|
i += nr_dcs(main);
|
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
|
|
|
do {
|
|
|
|
if (--i < 0)
|
|
|
|
return dc;
|
|
|
|
} while ((dc = dc->next) != NULL);
|
|
|
|
|
|
|
|
/* If we switched dives to one with fewer DC's, reset the dive computer counter */
|
|
|
|
dc_number = 0;
|
|
|
|
return main;
|
|
|
|
}
|
|
|
|
|
2013-05-08 21:56:06 +00:00
|
|
|
static void plot_string(struct plot_data *entry, char *buf, int bufsize,
|
2012-12-01 21:02:30 +00:00
|
|
|
int depth, int pressure, int temp, gboolean has_ndl)
|
2012-11-11 12:20:32 +00:00
|
|
|
{
|
2013-01-14 00:24:58 +00:00
|
|
|
int pressurevalue, mod, ead, end, eadd;
|
2012-11-11 16:12:09 +00:00
|
|
|
const char *depth_unit, *pressure_unit, *temp_unit;
|
|
|
|
char *buf2 = malloc(bufsize);
|
|
|
|
double depthvalue, tempvalue;
|
|
|
|
|
|
|
|
depthvalue = get_depth_units(depth, NULL, &depth_unit);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("D:%.1f %s"), depthvalue, depth_unit);
|
2012-11-11 16:12:09 +00:00
|
|
|
if (pressure) {
|
|
|
|
pressurevalue = get_pressure_units(pressure, &pressure_unit);
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nP:%d %s"), buf2, pressurevalue, pressure_unit);
|
2012-11-11 16:12:09 +00:00
|
|
|
}
|
|
|
|
if (temp) {
|
|
|
|
tempvalue = get_temp_units(temp, &temp_unit);
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nT:%.1f %s"), buf2, tempvalue, temp_unit);
|
2012-11-11 16:12:09 +00:00
|
|
|
}
|
2013-01-03 05:21:36 +00:00
|
|
|
if (entry->ceiling) {
|
|
|
|
depthvalue = get_depth_units(entry->ceiling, NULL, &depth_unit);
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nCalculated ceiling %.0f %s"), buf2, depthvalue, depth_unit);
|
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);
|
|
|
|
memcpy(buf2, buf, bufsize);
|
|
|
|
if (entry->ndl) {
|
|
|
|
/* this is a safety stop as we still have ndl */
|
|
|
|
if (entry->stoptime)
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nSafetystop:%umin @ %.0f %s"), buf2, entry->stoptime / 60,
|
2012-12-01 21:02:30 +00:00
|
|
|
depthvalue, depth_unit);
|
|
|
|
else
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nSafetystop:unkn time @ %.0f %s"), buf2,
|
2012-12-01 21:02:30 +00:00
|
|
|
depthvalue, depth_unit);
|
|
|
|
} else {
|
|
|
|
/* actual deco stop */
|
|
|
|
if (entry->stoptime)
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nDeco:%umin @ %.0f %s"), buf2, entry->stoptime / 60,
|
2012-12-01 21:02:30 +00:00
|
|
|
depthvalue, depth_unit);
|
|
|
|
else
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nDeco:unkn time @ %.0f %s"), buf2,
|
2012-12-01 21:02:30 +00:00
|
|
|
depthvalue, depth_unit);
|
|
|
|
}
|
2012-12-31 02:11:01 +00:00
|
|
|
} else if (entry->in_deco) {
|
|
|
|
/* this means we had in_deco set but don't have a stop depth */
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nIn deco"), buf2);
|
2012-12-01 21:02:30 +00:00
|
|
|
} else if (has_ndl) {
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nNDL:%umin"), buf2, entry->ndl / 60);
|
2012-12-01 21:02:30 +00:00
|
|
|
}
|
2012-12-11 20:22:56 +00:00
|
|
|
if (entry->cns) {
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nCNS:%u%%"), buf2, entry->cns);
|
2012-12-11 20:22:56 +00:00
|
|
|
}
|
2012-12-10 17:20:57 +00:00
|
|
|
if (prefs.pp_graphs.po2) {
|
2012-11-11 16:12:09 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\npO%s:%.2fbar"), buf2, UTF8_SUBSCRIPT_2, entry->po2);
|
2012-11-11 16:12:09 +00:00
|
|
|
}
|
2012-12-10 17:20:57 +00:00
|
|
|
if (prefs.pp_graphs.pn2) {
|
2012-11-11 16:12:09 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\npN%s:%.2fbar"), buf2, UTF8_SUBSCRIPT_2, entry->pn2);
|
2012-11-11 16:12:09 +00:00
|
|
|
}
|
2012-12-10 17:20:57 +00:00
|
|
|
if (prefs.pp_graphs.phe) {
|
2012-11-11 16:12:09 +00:00
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\npHe:%.2fbar"), buf2, entry->phe);
|
2012-11-11 16:12:09 +00:00
|
|
|
}
|
2013-01-14 00:24:58 +00:00
|
|
|
if (prefs.mod) {
|
|
|
|
mod = (int)get_depth_units(entry->mod, NULL, &depth_unit);
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nMOD:%d%s"), buf2, mod, depth_unit);
|
2013-01-14 00:24:58 +00:00
|
|
|
}
|
|
|
|
if (prefs.ead) {
|
|
|
|
ead = (int)get_depth_units(entry->ead, NULL, &depth_unit);
|
|
|
|
end = (int)get_depth_units(entry->end, NULL, &depth_unit);
|
|
|
|
eadd = (int)get_depth_units(entry->eadd, NULL, &depth_unit);
|
|
|
|
memcpy(buf2, buf, bufsize);
|
2013-01-29 09:27:36 +00:00
|
|
|
snprintf(buf, bufsize, _("%s\nEAD:%d%s\nEND:%d%s\nEADD:%d%s"), buf2, ead, depth_unit, end, depth_unit, eadd, depth_unit);
|
2013-01-14 00:24:58 +00:00
|
|
|
}
|
2012-11-11 16:12:09 +00:00
|
|
|
free(buf2);
|
2012-11-11 12:20:32 +00:00
|
|
|
}
|
|
|
|
|
2013-05-08 21:56:06 +00:00
|
|
|
void get_plot_details(struct graphics_context *gc, int time, char *buf, int bufsize)
|
2012-11-11 12:20:32 +00:00
|
|
|
{
|
2012-12-06 18:01:16 +00:00
|
|
|
struct plot_info *pi = &gc->pi;
|
2012-11-11 16:12:09 +00:00
|
|
|
int pressure = 0, temp = 0;
|
2012-12-10 19:02:33 +00:00
|
|
|
struct plot_data *entry = NULL;
|
2012-12-06 18:01:16 +00:00
|
|
|
int i;
|
2012-11-11 12:20:32 +00:00
|
|
|
|
2012-12-06 18:01:16 +00:00
|
|
|
for (i = 0; i < pi->nr; i++) {
|
|
|
|
entry = pi->entry + i;
|
|
|
|
if (entry->temperature)
|
|
|
|
temp = entry->temperature;
|
|
|
|
if (GET_PRESSURE(entry))
|
|
|
|
pressure = GET_PRESSURE(entry);
|
|
|
|
if (entry->sec >= time)
|
|
|
|
break;
|
2012-11-11 12:20:32 +00:00
|
|
|
}
|
2012-12-10 19:02:33 +00:00
|
|
|
if (entry)
|
|
|
|
plot_string(entry, buf, bufsize, entry->depth, pressure, temp, pi->has_ndl);
|
2011-08-31 21:15:50 +00:00
|
|
|
}
|