struct plot_info {
int nr;
int maxtime;
+ int maxdepth;
+ int minpressure, maxpressure;
+ int mintemp, maxtemp;
struct plot_data {
int sec;
+ int pressure, temperature;
+ /* Depth info */
int val;
int smoothed;
struct plot_data *min[3];
cairo_line_to(gc->cr, SCALE(gc, x, y));
}
+static void set_source_rgba(struct graphics_context *gc, double r, double g, double b, double a)
+{
+ if (gc->printer) {
+ /* Black is white and white is black */
+ double sum = r+g+b;
+ if (sum > 2)
+ r = g = b = 0;
+ else if (sum < 1)
+ r = g = b = 1;
+ }
+ cairo_set_source_rgba(gc->cr, r, g, b, a);
+}
+
+static void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
+{
+ set_source_rgba(gc, r, g, b, 1);
+}
+
#define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
/*
* 30 minutes or 90 ft, just so that small dives show
* up as such.
*/
-static int round_seconds_up(int seconds)
+static int get_maxtime(struct plot_info *pi)
{
+ int seconds = pi->maxtime;
return MAX(30*60, ROUND_UP(seconds, 60*10));
}
cairo_rel_move_to(cr, dx, dy);
cairo_text_path(cr, buffer);
- cairo_set_source_rgb(cr, 0, 0, 0);
+ set_source_rgb(gc, 0, 0, 0);
cairo_stroke(cr);
move_to(gc, x, y);
cairo_rel_move_to(cr, dx, dy);
- cairo_set_source_rgb(cr, tro->r, tro->g, tro->b);
+ set_source_rgb(gc, tro->r, tro->g, tro->b);
cairo_show_text(cr, buffer);
}
int maxtime, maxdepth;
/* Get plot scaling limits */
- maxtime = round_seconds_up(dive->duration.seconds);
+ maxtime = get_maxtime(pi);
maxdepth = round_depth_up(dive->maxdepth);
gc->leftx = 0; gc->rightx = maxtime;
static void plot_minmax_profile(struct graphics_context *gc, struct plot_info *pi)
{
+ if (gc->printer)
+ return;
plot_minmax_profile_minute(gc, pi, 2, 0.1);
plot_minmax_profile_minute(gc, pi, 1, 0.1);
plot_minmax_profile_minute(gc, pi, 0, 0.1);
int maxtime, maxdepth, marker;
/* Get plot scaling limits */
- maxtime = round_seconds_up(dive->duration.seconds);
+ maxtime = get_maxtime(pi);
maxdepth = round_depth_up(dive->maxdepth);
/* Time markers: every 5 min */
case FEET: marker = 9144; break; /* 30 ft */
}
- cairo_set_source_rgba(cr, 1, 1, 1, 0.5);
+ set_source_rgba(gc, 1, 1, 1, 0.5);
for (i = marker; i < maxdepth; i += marker) {
move_to(gc, 0, i);
line_to(gc, 1, i);
cairo_stroke(cr);
/* Show mean depth */
- cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.40);
+ set_source_rgba(gc, 1, 0.2, 0.2, 0.40);
move_to(gc, 0, dive->meandepth.mm);
line_to(gc, 1, dive->meandepth.mm);
cairo_stroke(cr);
plot_minmax_profile(gc, pi);
entry = pi->entry;
- cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
+ set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
begins = entry->sec;
move_to(gc, entry->sec, entry->val);
for (i = 1; i < pi->nr; i++) {
line_to(gc, MIN(sec,maxtime), 0);
line_to(gc, begins, 0);
cairo_close_path(cr);
- cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.20);
+ set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
cairo_fill_preserve(cr);
- cairo_set_source_rgba(cr, 1, 0.2, 0.2, 0.80);
+ set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
cairo_stroke(cr);
}
-static int setup_temperature_limits(struct dive *dive, struct graphics_context *gc)
+static int setup_temperature_limits(struct graphics_context *gc, struct plot_info *pi)
{
- int i;
int maxtime, mintemp, maxtemp;
/* Get plot scaling limits */
- maxtime = round_seconds_up(dive->duration.seconds);
- mintemp = INT_MAX;
- maxtemp = 0;
- for (i = 0; i < dive->samples; i++) {
- struct sample *sample = dive->sample+i;
- int mkelvin = sample->temperature.mkelvin;
- if (!mkelvin)
- continue;
- if (mkelvin > maxtemp)
- maxtemp = mkelvin;
- if (mkelvin < mintemp)
- mintemp = mkelvin;
- }
+ maxtime = get_maxtime(pi);
+ mintemp = pi->mintemp;
+ maxtemp = pi->maxtemp;
gc->leftx = 0; gc->rightx = maxtime;
/* Show temperatures in roughly the lower third */
return maxtemp > mintemp;
}
-static void plot_temperature_text(struct dive *dive, struct graphics_context *gc)
+static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkelvin)
{
- int i;
+ int deg;
+ const char *unit;
static const text_render_options_t tro = {12, 0.2, 0.2, 1.0, LEFT, TOP};
+ temperature_t temperature = { mkelvin };
+
+ if (output_units.temperature == FAHRENHEIT) {
+ deg = to_F(temperature);
+ unit = "F";
+ } else {
+ deg = to_C(temperature);
+ unit = "C";
+ }
+ plot_text(gc, &tro, sec, temperature.mkelvin, "%d %s", deg, unit);
+}
+static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
+{
+ int i;
int last = 0;
+ int last_temperature = 0, last_printed_temp = 0;
- if (!setup_temperature_limits(dive, gc))
+ if (!setup_temperature_limits(gc, pi))
return;
- for (i = 0; i < dive->samples; i++) {
- const char *unit;
- struct sample *sample = dive->sample+i;
- int mkelvin = sample->temperature.mkelvin;
- int sec, deg;
+ for (i = 0; i < pi->nr; i++) {
+ int sec;
+ struct plot_data *entry = pi->entry+i;
+ int mkelvin = entry->temperature;
+
if (!mkelvin)
continue;
- sec = sample->time.seconds;
- if (sec < last)
+ last_temperature = mkelvin;
+ sec = entry->sec;
+ if (sec < last + 300)
continue;
- last = sec + 300;
- if (output_units.temperature == FAHRENHEIT) {
- deg = to_F(sample->temperature);
- unit = "F";
- } else {
- deg = to_C(sample->temperature);
- unit = "C";
- }
- plot_text(gc, &tro, sec, mkelvin, "%d %s", deg, unit);
+ last = sec;
+ plot_single_temp_text(gc,sec,mkelvin);
+ last_printed_temp = mkelvin;
}
+ /* it would be nice to print the end temperature, if it's different */
+ if (last_temperature != last_printed_temp)
+ plot_single_temp_text(gc, last, last_temperature);
}
-static void plot_temperature_profile(struct dive *dive, struct graphics_context *gc)
+static void plot_temperature_profile(struct dive *dive, struct graphics_context *gc,
+ struct plot_info *pi)
{
int i;
cairo_t *cr = gc->cr;
int last = 0;
- if (!setup_temperature_limits(dive, gc))
+ if (!setup_temperature_limits(gc, pi))
return;
- cairo_set_source_rgba(cr, 0.2, 0.2, 1.0, 0.8);
+ set_source_rgba(gc, 0.2, 0.2, 1.0, 0.8);
for (i = 0; i < dive->samples; i++) {
struct sample *sample = dive->sample+i;
+ if (sample->time.seconds > dive->duration.seconds)
+ break; /* let's not plot surface temp events */
int mkelvin = sample->temperature.mkelvin;
if (!mkelvin) {
if (!last)
/* gets both the actual start and end pressure as well as the scaling factors */
static int get_cylinder_pressure_range(struct dive *dive, struct graphics_context *gc,
+ struct plot_info *pi,
pressure_t *startp, pressure_t *endp)
{
int i;
int min, max;
- gc->leftx = 0; gc->rightx = round_seconds_up(dive->duration.seconds);
+ gc->leftx = 0;
+ gc->rightx = get_maxtime(pi);
max = 0;
min = 5000000;
return 1;
}
-static void plot_cylinder_pressure(struct dive *dive, struct graphics_context *gc)
+static void plot_cylinder_pressure(struct dive *dive, struct graphics_context *gc,
+ struct plot_info *pi)
{
int i, sec = -1;
- if (!get_cylinder_pressure_range(dive, gc, NULL, NULL))
+ if (!get_cylinder_pressure_range(dive, gc, pi, NULL, NULL))
return;
cairo_set_source_rgba(gc->cr, 0.2, 1.0, 0.2, 0.80);
}
}
-static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc)
+static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc,
+ struct plot_info *pi)
{
pressure_t startp, endp;
- if (get_cylinder_pressure_range(dive, gc, &startp, &endp)) {
+ if (get_cylinder_pressure_range(dive, gc, pi, &startp, &endp)) {
int start, end;
const char *unit = "bar";
int i;
int nr = pi->nr;
+ /* Do pressure min/max based on the non-surface data */
+ for (i = 0; i < nr; i++) {
+ struct plot_data *entry = pi->entry+i;
+ int pressure = entry->pressure;
+ int temperature = entry->temperature;
+
+ if (pressure) {
+ if (!pi->minpressure || pressure < pi->minpressure)
+ pi->minpressure = pressure;
+ if (pressure > pi->maxpressure)
+ pi->maxpressure = pressure;
+ }
+
+ if (temperature) {
+ if (!pi->mintemp || temperature < pi->mintemp)
+ pi->mintemp = temperature;
+ if (temperature > pi->maxtemp)
+ pi->maxtemp = temperature;
+ }
+ }
+
/* Smoothing function: 5-point triangular smooth */
for (i = 2; i < nr-2; i++) {
struct plot_data *entry = pi->entry+i;
* sides, so that you can do end-points without having to worry
* about it.
*/
-static struct plot_info *depth_plot_info(struct dive *dive)
+static struct plot_info *create_plot_info(struct dive *dive)
{
+ int lastdepth, lastindex;
int i, nr = dive->samples + 4, sec;
size_t alloc_size = plot_info_size(nr);
struct plot_info *pi;
memset(pi, 0, alloc_size);
pi->nr = nr;
sec = 0;
+ lastindex = 0;
+ lastdepth = -1;
for (i = 0; i < dive->samples; i++) {
+ int depth;
struct sample *sample = dive->sample+i;
struct plot_data *entry = pi->entry + i + 2;
sec = entry->sec = sample->time.seconds;
- entry->val = sample->depth.mm;
+ depth = entry->val = sample->depth.mm;
+ entry->pressure = sample->cylinderpressure.mbar;
+ entry->temperature = sample->temperature.mkelvin;
+
+ if (depth || lastdepth)
+ lastindex = i+2;
+
+ lastdepth = depth;
+ if (depth > pi->maxdepth)
+ pi->maxdepth = depth;
}
+ if (lastdepth)
+ lastindex = i + 2;
/* Fill in the last two entries with empty values but valid times */
i = dive->samples + 2;
pi->entry[i].sec = sec + 20;
pi->entry[i+1].sec = sec + 40;
+ pi->nr = lastindex+1;
+ pi->maxtime = pi->entry[lastindex].sec;
+
return analyze_plot_info(pi);
}
void plot(struct graphics_context *gc, int w, int h, struct dive *dive)
{
double topx, topy;
- struct plot_info *pi = depth_plot_info(dive);
+ struct plot_info *pi = create_plot_info(dive);
topx = w / 20.0;
topy = h / 20.0;
gc->maxy = (h - 2*topy);
/* Temperature profile */
- plot_temperature_profile(dive, gc);
+ plot_temperature_profile(dive, gc, pi);
/* Cylinder pressure plot */
- plot_cylinder_pressure(dive, gc);
+ plot_cylinder_pressure(dive, gc, pi);
/* Depth profile */
plot_depth_profile(dive, gc, pi);
/* Text on top of all graphs.. */
- plot_temperature_text(dive, gc);
+ plot_temperature_text(gc, pi);
plot_depth_text(dive, gc, pi);
- plot_cylinder_pressure_text(dive, gc);
+ plot_cylinder_pressure_text(dive, gc, pi);
/* And info box in the lower right corner.. */
gc->leftx = 0; gc->rightx = 1.0;
plot_info(dive, gc);
/* Bounding box last */
- cairo_set_source_rgb(gc->cr, 1, 1, 1);
+ set_source_rgb(gc, 1, 1, 1);
move_to(gc, 0, 0);
line_to(gc, 0, 1);
line_to(gc, 1, 1);
static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
{
struct dive *dive = current_dive;
- struct graphics_context gc;
+ struct graphics_context gc = { .printer = 0 };
int w,h;
w = widget->allocation.width;
h = widget->allocation.height;
gc.cr = gdk_cairo_create(widget->window);
- cairo_set_source_rgb(gc.cr, 0, 0, 0);
+ set_source_rgb(&gc, 0, 0, 0);
cairo_paint(gc.cr);
if (dive)