static int get_maxtime(struct plot_info *pi)
{
int seconds = pi->maxtime;
- return MAX(30*60, ROUND_UP(seconds, 60*10));
+ /* 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));
}
static int get_maxdepth(struct plot_info *pi)
{
unsigned mm = pi->maxdepth;
- /* Minimum 30m */
+ /* Minimum 30m, rounded up to 10m, with at least 3m to spare */
return MAX(30000, ROUND_UP(mm+3000, 10000));
}
typedef struct {
int size;
double r,g,b;
- enum {CENTER,LEFT} halign;
- enum {MIDDLE,TOP,BOTTOM} valign;
+ double hpos, vpos;
} text_render_options_t;
+#define RIGHT (-1.0)
+#define CENTER (-0.5)
+#define LEFT (0.0)
+
+#define TOP (1)
+#define MIDDLE (0)
+#define BOTTOM (-1)
+
static void plot_text(struct graphics_context *gc, const text_render_options_t *tro,
double x, double y, const char *fmt, ...)
{
cairo_t *cr = gc->cr;
+ cairo_font_extents_t fe;
cairo_text_extents_t extents;
double dx, dy;
char buffer[80];
va_end(args);
cairo_set_font_size(cr, tro->size);
+ cairo_font_extents(cr, &fe);
cairo_text_extents(cr, buffer, &extents);
- dx = 0;
- switch (tro->halign) {
- case CENTER:
- dx = -(extents.width/2 + extents.x_bearing);
- break;
- case LEFT:
- dx = 0;
- break;
- }
- switch (tro->valign) {
- case TOP:
- dy = extents.height * 1.2;
- break;
- case BOTTOM:
- dy = -extents.height * 0.8;
- break;
- case MIDDLE:
- dy = 0;
- break;
- }
+ dx = tro->hpos * extents.width + extents.x_bearing;
+ dy = tro->vpos * extents.height + fe.descent;
move_to(gc, x, y);
cairo_rel_move_to(cr, dx, dy);
static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
{
int i;
- int last = 0;
+ int last = 0, sec = 0;
int last_temperature = 0, last_printed_temp = 0;
if (!setup_temperature_limits(gc, pi))
return;
for (i = 0; i < pi->nr; i++) {
- int sec;
struct plot_data *entry = pi->entry+i;
int mkelvin = entry->temperature;
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);
+ if (abs(last_temperature - last_printed_temp) > 500)
+ plot_single_temp_text(gc, sec, last_temperature);
}
-static void plot_temperature_profile(struct dive *dive, struct graphics_context *gc,
- struct plot_info *pi)
+static void plot_temperature_profile(struct graphics_context *gc, struct plot_info *pi)
{
int i;
cairo_t *cr = gc->cr;
return;
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;
+ for (i = 0; i < pi->nr; i++) {
+ struct plot_data *entry = pi->entry + i;
+ int mkelvin = entry->temperature;
+ int sec = entry->sec;
if (!mkelvin) {
if (!last)
continue;
mkelvin = last;
}
if (last)
- line_to(gc, sample->time.seconds, mkelvin);
+ line_to(gc, sec, mkelvin);
else
- move_to(gc, sample->time.seconds, mkelvin);
+ move_to(gc, sec, mkelvin);
last = mkelvin;
}
cairo_stroke(cr);
return pi->maxpressure != 0;
}
-static void plot_cylinder_pressure(struct dive *dive, struct graphics_context *gc, struct plot_info *pi)
+static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi)
{
- int i, sec = -1;
+ int i;
if (!get_cylinder_pressure_range(gc, pi))
return;
cairo_set_source_rgba(gc->cr, 0.2, 1.0, 0.2, 0.80);
- move_to(gc, 0, dive->cylinder[0].start.mbar);
- for (i = 1; i < dive->samples; i++) {
+ move_to(gc, 0, pi->maxpressure);
+ for (i = 1; i < pi->nr; i++) {
int mbar;
- struct sample *sample = dive->sample + i;
+ struct plot_data *entry = pi->entry + i;
- mbar = sample->cylinderpressure.mbar;
+ mbar = entry->pressure;
if (!mbar)
continue;
- sec = sample->time.seconds;
- if (sec <= dive->duration.seconds)
- line_to(gc, sec, mbar);
+ line_to(gc, entry->sec, mbar);
}
- /*
- * We may have "surface time" events, in which case we don't go
- * back to dive duration
- */
- if (sec < dive->duration.seconds)
- line_to(gc, dive->duration.seconds, dive->cylinder[0].end.mbar);
+ line_to(gc, pi->maxtime, pi->minpressure);
cairo_stroke(gc->cr);
}
static void plot_info(struct dive *dive, struct graphics_context *gc)
{
- text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
+ text_render_options_t tro = {10, 0.2, 1.0, 0.2, RIGHT, BOTTOM};
const double liters_per_cuft = 28.317;
const char *unit, *desc;
double airuse;
airuse /= liters_per_cuft;
break;
}
- plot_text(gc, &tro, 0.8, 0.8, "vol: %4.2f %s", airuse, unit);
+ tro.vpos = -1.0;
+ plot_text(gc, &tro, 0.98, 0.98, "vol: %4.2f %s", airuse, unit);
+
+ tro.vpos = -2.2;
if (dive->duration.seconds) {
double pressure = 1 + (dive->meandepth.mm / 10000.0);
double sac = airuse / pressure * 60 / dive->duration.seconds;
- plot_text(gc, &tro, 0.8, 0.85, "SAC: %4.2f %s/min", sac, unit);
+ plot_text(gc, &tro, 0.98, 0.98, "SAC: %4.2f %s/min", sac, unit);
}
+
+ tro.vpos = -3.4;
desc = dive->cylinder[0].type.description;
if (desc || dive->cylinder[0].gasmix.o2.permille) {
int o2 = dive->cylinder[0].gasmix.o2.permille / 10;
desc = "";
if (!o2)
o2 = 21;
- plot_text(gc, &tro, 0.8, 0.9, "%s (%d%%)", desc, o2);
+ plot_text(gc, &tro, 0.98, 0.98, "%s (%d%%)", desc, o2);
}
}
gc->maxy = (h - 2*topy);
/* Temperature profile */
- plot_temperature_profile(dive, gc, pi);
+ plot_temperature_profile(gc, pi);
/* Cylinder pressure plot */
- plot_cylinder_pressure(dive, gc, pi);
+ plot_cylinder_pressure(gc, pi);
/* Depth profile */
plot_depth_profile(gc, pi);
projects / ext / subsurface.git / blobdiff