+/* profile.c */
+/* creates all the necessary data for drawing the dive profile
+ * uses cairo to draw it
+ */
#include <stdio.h>
#include <stdlib.h>
#include <stdarg.h>
int selected_dive = 0;
-/* Plot info with smoothing and one-, two- and three-minute minimums and maximums */
+typedef enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity_t;
+/* Plot info with smoothing, velocity indication
+ * and one-, two- and three-minute minimums and maximums */
struct plot_info {
int nr;
int maxtime;
+ int meandepth, maxdepth;
+ int minpressure, maxpressure;
+ int mintemp, maxtemp;
struct plot_data {
int sec;
+ int pressure, temperature;
+ /* Depth info */
int val;
int smoothed;
+ velocity_t velocity;
struct plot_data *min[3];
struct plot_data *max[3];
int avg[3];
} entry[];
};
+
+/* convert velocity to colors */
+typedef struct { double r, g, b; } rgb_t;
+static const rgb_t rgb[] = {
+ [STABLE] = {0.0, 0.4, 0.0},
+ [SLOW] = {0.4, 0.8, 0.0},
+ [MODERATE] = {0.8, 0.8, 0.0},
+ [FAST] = {0.8, 0.5, 0.0},
+ [CRAZY] = {1.0, 0.0, 0.0},
+};
+
#define plot_info_size(nr) (sizeof(struct plot_info) + (nr)*sizeof(struct plot_data))
/* Scale to 0,0 -> maxx,maxy */
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)
+void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
{
set_source_rgba(gc, r, g, b, 1);
}
* current dive. However, we don't scale past less than
* 30 minutes or 90 ft, just so that small dives show
* up as such.
+ * we also need to add 180 seconds at the end so the min/max
+ * plots correctly
*/
-static int round_seconds_up(int seconds)
+static int get_maxtime(struct plot_info *pi)
{
- return MAX(30*60, ROUND_UP(seconds, 60*10));
+ int seconds = pi->maxtime;
+ /* 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 round_depth_up(depth_t depth)
+static int get_maxdepth(struct plot_info *pi)
{
- unsigned mm = depth.mm;
- /* Minimum 30m */
+ unsigned mm = pi->maxdepth;
+ /* 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_depth_text(struct dive *dive, struct graphics_context *gc, struct plot_info *pi)
+static void plot_depth_text(struct graphics_context *gc, struct plot_info *pi)
{
int maxtime, maxdepth;
/* Get plot scaling limits */
- maxtime = round_seconds_up(dive->duration.seconds);
- maxdepth = round_depth_up(dive->maxdepth);
+ maxtime = get_maxtime(pi);
+ maxdepth = get_maxdepth(pi);
gc->leftx = 0; gc->rightx = maxtime;
gc->topy = 0; gc->bottomy = maxdepth;
plot_minmax_profile_minute(gc, pi, 0, 0.1);
}
-static void plot_depth_profile(struct dive *dive, struct graphics_context *gc, struct plot_info *pi)
+static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi)
{
int i;
cairo_t *cr = gc->cr;
- int begins, sec, depth;
+ int ends, sec, depth;
+ int *secs;
+ int *depths;
struct plot_data *entry;
int maxtime, maxdepth, marker;
/* Get plot scaling limits */
- maxtime = round_seconds_up(dive->duration.seconds);
- maxdepth = round_depth_up(dive->maxdepth);
+ maxtime = get_maxtime(pi);
+ maxdepth = get_maxdepth(pi);
/* Time markers: every 5 min */
gc->leftx = 0; gc->rightx = maxtime;
/* Show mean depth */
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);
+ move_to(gc, 0, pi->meandepth);
+ line_to(gc, 1, pi->meandepth);
cairo_stroke(cr);
gc->leftx = 0; gc->rightx = maxtime;
entry = pi->entry;
set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
- begins = entry->sec;
- move_to(gc, entry->sec, entry->val);
+ secs = (int *) malloc(sizeof(int) * pi->nr);
+ depths = (int *) malloc(sizeof(int) * pi->nr);
+ secs[0] = entry->sec;
+ depths[0] = entry->val;
for (i = 1; i < pi->nr; i++) {
entry++;
sec = entry->sec;
- if (sec <= maxtime) {
+ if (sec <= maxtime || entry->val > 0) {
+ /* we want to draw the segments in different colors
+ * representing the vertical velocity, so we need to
+ * chop this into short segments */
+ rgb_t color = rgb[entry->velocity];
depth = entry->val;
+ set_source_rgb(gc, color.r, color.g, color.b);
+ move_to(gc, secs[i-1], depths[i-1]);
line_to(gc, sec, depth);
+ cairo_stroke(cr);
+ ends = i;
}
+ secs[i] = sec;
+ depths[i] = depth;
}
+ move_to(gc, secs[ends], depths[ends]);
gc->topy = 0; gc->bottomy = 1.0;
- line_to(gc, MIN(sec,maxtime), 0);
- line_to(gc, begins, 0);
+ line_to(gc, secs[ends], 0);
+ line_to(gc, secs[0], 0);
cairo_close_path(cr);
- set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
- cairo_fill_preserve(cr);
set_source_rgba(gc, 1, 0.2, 0.2, 0.80);
cairo_stroke(cr);
+ /* now do it again for the neat fill */
+ gc->topy = 0; gc->bottomy = maxdepth;
+ set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
+ move_to(gc, secs[0], depths[0]);
+ for (i = 1; i <= ends; i++) {
+ line_to(gc, secs[i],depths[i]);
+ }
+ gc->topy = 0; gc->bottomy = 1.0;
+ line_to(gc, secs[ends], 0);
+ line_to(gc, secs[0], 0);
+ cairo_close_path(gc->cr);
+ cairo_fill(gc->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;
+ int maxtime, mintemp, maxtemp, delta;
/* 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 */
- gc->topy = maxtemp + (maxtemp - mintemp)*2;
- gc->bottomy = mintemp - (maxtemp - mintemp)/2;
+ /* Show temperatures in roughly the lower third, but make sure the scale
+ is at least somewhat reasonable */
+ delta = maxtemp - mintemp;
+ if (delta > 3000) { /* more than 3K in fluctuation */
+ gc->topy = maxtemp + delta*2;
+ gc->bottomy = mintemp - delta/2;
+ } else {
+ gc->topy = maxtemp + 1500 + delta*2;
+ gc->bottomy = mintemp - delta/2;
+ }
return maxtemp > mintemp;
}
-static void plot_single_temp_text(struct graphics_context *gc, int sec, temperature_t temperature)
+static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkelvin)
{
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);
plot_text(gc, &tro, sec, temperature.mkelvin, "%d %s", deg, unit);
}
-static void plot_temperature_text(struct dive *dive, struct graphics_context *gc)
+static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
{
int i;
- int last = 0;
- temperature_t last_temperature, last_printed_temp;
+ int last = 0, sec = 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++) {
- 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;
- int sec;
+ for (i = 0; i < pi->nr; i++) {
+ struct plot_data *entry = pi->entry+i;
+ int mkelvin = entry->temperature;
+
if (!mkelvin)
continue;
- last_temperature = sample->temperature;
- sec = sample->time.seconds;
- if (sec < last)
+ last_temperature = mkelvin;
+ sec = entry->sec;
+ if (sec < last + 300)
continue;
- last = sec + 300;
- plot_single_temp_text(gc,sec,sample->temperature);
- last_printed_temp = last_temperature ;
+ 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.mkelvin != last_printed_temp.mkelvin) {
- plot_single_temp_text(gc,dive->duration.seconds,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)
+static void plot_temperature_profile(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;
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);
}
/* 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,
- pressure_t *startp, pressure_t *endp)
+static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_info *pi)
{
- 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;
- if (startp)
- startp->mbar = endp->mbar = 0;
-
- for (i = 0; i < dive->samples; i++) {
- int mbar;
- struct sample *sample = dive->sample + i;
-
- /* FIXME! We only track cylinder 0 right now */
- if (sample->cylinderindex)
- continue;
- mbar = sample->cylinderpressure.mbar;
- if (!mbar)
- continue;
- if (mbar < min)
- min = mbar;
- if (mbar > max)
- max = mbar;
- }
- if (startp)
- startp->mbar = max;
- if (endp)
- endp->mbar = min;
- if (!max)
- return 0;
- gc->topy = 0; gc->bottomy = max * 1.5;
- return 1;
+ gc->bottomy = 0; gc->topy = pi->maxpressure * 1.5;
+ return pi->maxpressure != 0;
}
-static void plot_cylinder_pressure(struct dive *dive, struct graphics_context *gc)
+static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi)
{
- int i, sec = -1;
+ int i;
- if (!get_cylinder_pressure_range(dive, gc, NULL, NULL))
+ 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);
}
-/*
- * Return air usage (in liters).
- */
-static double calculate_airuse(struct dive *dive)
+static int mbar_to_PSI(int mbar)
{
- double airuse = 0;
- int i;
-
- for (i = 0; i < MAX_CYLINDERS; i++) {
- cylinder_t *cyl = dive->cylinder + i;
- int size = cyl->type.size.mliter;
- double kilo_atm;
-
- if (!size)
- continue;
-
- kilo_atm = (cyl->start.mbar - cyl->end.mbar) / 1013250.0;
-
- /* Liters of air at 1 atm == milliliters at 1k atm*/
- airuse += kilo_atm * size;
- }
- return airuse;
+ pressure_t p = {mbar};
+ return to_PSI(p);
}
-static void plot_info(struct dive *dive, struct graphics_context *gc)
+static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi)
{
- text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
- const double liters_per_cuft = 28.317;
- const char *unit, *desc;
- double airuse;
-
- airuse = calculate_airuse(dive);
- if (!airuse)
- return;
-
- /* I really need to start addign some unit setting thing */
- switch (output_units.volume) {
- case LITER:
- unit = "l";
- break;
- case CUFT:
- unit = "cuft";
- airuse /= liters_per_cuft;
- break;
- }
- plot_text(gc, &tro, 0.8, 0.8, "vol: %4.2f %s", airuse, unit);
- 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);
- }
- desc = dive->cylinder[0].type.description;
- if (desc || dive->cylinder[0].gasmix.o2.permille) {
- int o2 = dive->cylinder[0].gasmix.o2.permille / 10;
- if (!desc)
- desc = "";
- if (!o2)
- o2 = 21;
- plot_text(gc, &tro, 0.8, 0.9, "%s (%d%%)", desc, o2);
- }
-}
-
-static void plot_cylinder_pressure_text(struct dive *dive, struct graphics_context *gc)
-{
- pressure_t startp, endp;
-
- if (get_cylinder_pressure_range(dive, gc, &startp, &endp)) {
+ if (get_cylinder_pressure_range(gc, pi)) {
int start, end;
const char *unit = "bar";
switch (output_units.pressure) {
case PASCAL:
- start = startp.mbar * 100;
- end = startp.mbar * 100;
+ start = pi->maxpressure * 100;
+ end = pi->minpressure * 100;
unit = "pascal";
break;
case BAR:
- start = (startp.mbar + 500) / 1000;
- end = (endp.mbar + 500) / 1000;
+ start = (pi->maxpressure + 500) / 1000;
+ end = (pi->minpressure + 500) / 1000;
unit = "bar";
break;
case PSI:
- start = to_PSI(startp);
- end = to_PSI(endp);
+ start = mbar_to_PSI(pi->maxpressure);
+ end = mbar_to_PSI(pi->minpressure);
unit = "psi";
break;
}
text_render_options_t tro = {10, 0.2, 1.0, 0.2, LEFT, TOP};
- plot_text(gc, &tro, 0, startp.mbar, "%d %s", start, unit);
- plot_text(gc, &tro, dive->duration.seconds, endp.mbar,
+ plot_text(gc, &tro, 0, pi->maxpressure, "%d %s", start, unit);
+ plot_text(gc, &tro, pi->maxtime, pi->minpressure,
"%d %s", end, unit);
}
}
analyze_plot_info_minmax_minute(entry, first, last, 2);
}
+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
+ for descent are usually about 2x ascent rate; still, we want
+ 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;
+}
static struct plot_info *analyze_plot_info(struct plot_info *pi)
{
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++) {
+ for (i = 2; i < nr-1; i++) {
struct plot_data *entry = pi->entry+i;
int val;
- val = entry[-2].val + 2*entry[-1].val + 3*entry[0].val + 2*entry[1].val + entry[2].val;
- entry->smoothed = (val+4) / 9;
+ if (i < nr-2) {
+ val = entry[-2].val + 2*entry[-1].val + 3*entry[0].val + 2*entry[1].val + entry[2].val;
+ entry->smoothed = (val+4) / 9;
+ }
+ /* vertical velocity in mm/sec */
+ /* Linus wants to smooth this - let's at least look at the samples that aren't FAST or CRAZY */
+ if (entry[0].sec - entry[-1].sec) {
+ entry->velocity = velocity((entry[0].val - entry[-1].val) / (entry[0].sec - entry[-1].sec));
+ /* if our samples are short and we aren't too FAST*/
+ if (entry[0].sec - entry[-1].sec < 30 && entry->velocity < FAST) {
+ int past = -2;
+ while (pi->entry <= entry-past && entry[0].sec - entry[past].sec < 30)
+ past--;
+ entry->velocity = velocity((entry[0].val - entry[past].val) /
+ (entry[0].sec - entry[past].sec));
+ }
+ } else
+ entry->velocity = STABLE;
}
/* One-, two- and three-minute minmax data */
* 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;
+
+ pi->minpressure = dive->cylinder[0].end.mbar;
+ pi->maxpressure = dive->cylinder[0].start.mbar;
+
+ pi->meandepth = dive->meandepth.mm;
+
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(gc, pi);
/* Cylinder pressure plot */
- plot_cylinder_pressure(dive, gc);
+ plot_cylinder_pressure(gc, pi);
/* Depth profile */
- plot_depth_profile(dive, gc, pi);
+ plot_depth_profile(gc, pi);
/* Text on top of all graphs.. */
- plot_temperature_text(dive, gc);
- plot_depth_text(dive, gc, pi);
- plot_cylinder_pressure_text(dive, gc);
+ plot_temperature_text(gc, pi);
+ plot_depth_text(gc, pi);
+ plot_cylinder_pressure_text(gc, pi);
- /* And info box in the lower right corner.. */
+ /* Bounding box last */
gc->leftx = 0; gc->rightx = 1.0;
gc->topy = 0; gc->bottomy = 1.0;
- plot_info(dive, gc);
- /* Bounding box last */
set_source_rgb(gc, 1, 1, 1);
move_to(gc, 0, 0);
line_to(gc, 0, 1);
cairo_stroke(gc->cr);
}
-
-static gboolean expose_event(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
- struct dive *dive = current_dive;
- struct graphics_context gc = { .printer = 0 };
- int w,h;
-
- w = widget->allocation.width;
- h = widget->allocation.height;
-
- gc.cr = gdk_cairo_create(widget->window);
- set_source_rgb(&gc, 0, 0, 0);
- cairo_paint(gc.cr);
-
- if (dive)
- plot(&gc, w, h, dive);
-
- cairo_destroy(gc.cr);
-
- return FALSE;
-}
-
-GtkWidget *dive_profile_widget(void)
-{
- GtkWidget *da;
-
- da = gtk_drawing_area_new();
- gtk_widget_set_size_request(da, 350, 250);
- g_signal_connect(da, "expose_event", G_CALLBACK(expose_event), NULL);
-
- return da;
-}
projects / ext / subsurface.git / blobdiff