/* profile.c */
-/* creates all the necessary data for drawing the dive profile
+/* creates all the necessary data for drawing the dive profile
* uses cairo to draw it
*/
#include <stdio.h>
#include "dive.h"
#include "display.h"
#include "divelist.h"
+#include "color.h"
int selected_dive = 0;
+char zoomed_plot = 0;
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 avg[3];
} entry[];
};
+
#define SENSOR_PR 0
#define INTERPOLATED_PR 1
#define SENSOR_PRESSURE(_entry) (_entry)->pressure[SENSOR_PR]
#define INTERPOLATED_PRESSURE(_entry) (_entry)->pressure[INTERPOLATED_PR]
#define GET_PRESSURE(_entry) (SENSOR_PRESSURE(_entry) ? : INTERPOLATED_PRESSURE(_entry))
-typedef enum { TEXT_BACKGROUND, TRIANGULAR_BG, TRIANGULAR_FG, EVENTS, SAMPLE_DEEP, SAMPLE_SHALLOW,
- SMOOTHED, MINUTE, TIME_MARKER, TIME_TEXT, DEPTH_MARKER, MEAN_DEPTH, DEPTH_TOP,
- DEPTH_BOTTOM, DEPTH_FILL_PRINTER, DEPTH_STROKE_PRINTER, TEMP_TEXT, TEMP_PLOT, SAC_DEFAULT,
- BOUNDING_BOX, PRESSURE_TEXT, VELO_STABLE, VELO_SLOW, VELO_MODERATE, VELO_FAST, VELO_CRAZY,
- SAC_1, SAC_2, SAC_3, SAC_4, SAC_5, SAC_6, SAC_7, SAC_8, SAC_9, BACKGROUND } color_t;
-
-/* convert velocity to colors */
-typedef struct { double r, g, b; } rgb_t;
-static const color_t velocity_color[] = {
- [STABLE] = VELO_STABLE,
- [SLOW] = VELO_SLOW,
- [MODERATE] = VELO_MODERATE,
- [FAST] = VELO_FAST,
- [CRAZY] = VELO_CRAZY,
-};
+#define SAC_COLORS_START_IDX SAC_1
+#define SAC_COLORS 9
+#define VELOCITY_COLORS_START_IDX VELO_STABLE
+#define VELOCITY_COLORS 5
-static const rgb_t profile_color[] = {
- [TEXT_BACKGROUND] = {0.95, 0.95, 0.95},
- [TRIANGULAR_BG] = {1.0, 1.0, 0.1},
- [TRIANGULAR_FG] = {0.0, 0.0, 0.0},
- [EVENTS] = {1.0, 0.2, 0.2},
- [SAMPLE_DEEP] = {0.8, 0.2, 0.2},
- [SAMPLE_SHALLOW] = {0.8, 0.2, 0.2},
- [SMOOTHED] = {1.0, 0.2, 0.2},
- [MINUTE] = {0.7, 0.2, 0.7},
- [TIME_MARKER] = {1.0, 1.0, 1.0},
- [TIME_TEXT] = {0.1, 0.5, 0.1},
- [DEPTH_MARKER] = {1.0, 1.0, 1.0},
- [MEAN_DEPTH] = {1.0, 0.2, 0.2},
- [DEPTH_TOP] = {0.2, 0.2, 0.8},
- [DEPTH_BOTTOM] = {0.9, 0.9, 0.9},
- [DEPTH_FILL_PRINTER] = {1.0, 1.0, 1.0},
- [DEPTH_STROKE_PRINTER] = {1.0, 1.0, 1.0},
- [TEMP_TEXT] = {0.2, 0.2, 0.7},
- [TEMP_PLOT] = {0.2, 0.2, 0.9},
- [SAC_DEFAULT] = {1.0, 1.0, 1.0},
- [BOUNDING_BOX] = {1.0, 1.0, 1.0},
- [PRESSURE_TEXT] = {0.2, 0.4, 0.2},
- [VELO_STABLE] = {0.0, 0.4, 0.0},
- [VELO_SLOW] = {0.4, 0.8, 0.0},
- [VELO_MODERATE] = {0.8, 0.8, 0.0},
- [VELO_FAST] = {0.8, 0.5, 0.0},
- [VELO_CRAZY] = {1.0, 0.0, 0.0},
- [SAC_1] = {0.0, 0.4, 0.2},
- [SAC_2] = {0.2, 0.6, 0.2},
- [SAC_3] = {0.4, 0.8, 0.2},
- [SAC_4] = {0.6, 0.8, 0.2},
- [SAC_5] = {0.8, 0.8, 0.2},
- [SAC_6] = {0.8, 0.6, 0.2},
- [SAC_7] = {0.8, 0.4, 0.2},
- [SAC_8] = {0.9, 0.3, 0.2},
- [SAC_9] = {1.0, 0.2, 0.2},
- [BACKGROUND] = {0.95, 0.95, 0.9},
-};
+typedef enum {
+ /* SAC colors. Order is important, the SAC_COLORS_START_IDX define above. */
+ SAC_1, SAC_2, SAC_3, SAC_4, SAC_5, SAC_6, SAC_7, SAC_8, SAC_9,
-#define SAC_COLORS 9
-static const color_t sac_color[SAC_COLORS] = {
- SAC_1, SAC_2, SAC_3, SAC_4, SAC_5, SAC_6, SAC_7, SAC_8, SAC_9
+ /* Velocity colors. Order is still important, ref VELOCITY_COLORS_START_IDX. */
+ VELO_STABLE, VELO_SLOW, VELO_MODERATE, VELO_FAST, VELO_CRAZY,
+
+ /* Other colors */
+ TEXT_BACKGROUND, ALERT_BG, ALERT_FG, EVENTS, SAMPLE_DEEP, SAMPLE_SHALLOW,
+ SMOOTHED, MINUTE, TIME_GRID, TIME_TEXT, DEPTH_GRID, MEAN_DEPTH, DEPTH_TOP,
+ DEPTH_BOTTOM, TEMP_TEXT, TEMP_PLOT, SAC_DEFAULT, BOUNDING_BOX, PRESSURE_TEXT, BACKGROUND
+} color_indice_t;
+
+typedef struct {
+ /* media[0] is screen, and media[1] is printer */
+ struct rgba {
+ double r,g,b,a;
+ } media[2];
+} color_t;
+
+/* [color indice] = {{screen color, printer color}} */
+static const color_t profile_color[] = {
+ [SAC_1] = {{FUNGREEN1, BLACK1_LOW_TRANS}},
+ [SAC_2] = {{APPLE1, BLACK1_LOW_TRANS}},
+ [SAC_3] = {{ATLANTIS1, BLACK1_LOW_TRANS}},
+ [SAC_4] = {{ATLANTIS2, BLACK1_LOW_TRANS}},
+ [SAC_5] = {{EARLSGREEN1, BLACK1_LOW_TRANS}},
+ [SAC_6] = {{HOKEYPOKEY1, BLACK1_LOW_TRANS}},
+ [SAC_7] = {{TUSCANY1, BLACK1_LOW_TRANS}},
+ [SAC_8] = {{CINNABAR1, BLACK1_LOW_TRANS}},
+ [SAC_9] = {{REDORANGE1, BLACK1_LOW_TRANS}},
+
+ [VELO_STABLE] = {{CAMARONE1, BLACK1_LOW_TRANS}},
+ [VELO_SLOW] = {{LIMENADE1, BLACK1_LOW_TRANS}},
+ [VELO_MODERATE] = {{RIOGRANDE1, BLACK1_LOW_TRANS}},
+ [VELO_FAST] = {{PIRATEGOLD1, BLACK1_LOW_TRANS}},
+ [VELO_CRAZY] = {{RED1, BLACK1_LOW_TRANS}},
+
+ [TEXT_BACKGROUND] = {{CONCRETE1_LOWER_TRANS, WHITE1}},
+ [ALERT_BG] = {{BROOM1_LOWER_TRANS, BLACK1_LOW_TRANS}},
+ [ALERT_FG] = {{BLACK1_LOW_TRANS, BLACK1_LOW_TRANS}},
+ [EVENTS] = {{REDORANGE1, BLACK1_LOW_TRANS}},
+ [SAMPLE_DEEP] = {{PERSIANRED1, BLACK1_LOW_TRANS}},
+ [SAMPLE_SHALLOW] = {{PERSIANRED1, BLACK1_LOW_TRANS}},
+ [SMOOTHED] = {{REDORANGE1_HIGH_TRANS, BLACK1_LOW_TRANS}},
+ [MINUTE] = {{MEDIUMREDVIOLET1_HIGHER_TRANS, BLACK1_LOW_TRANS}},
+ [TIME_GRID] = {{WHITE1, TUNDORA1_MED_TRANS}},
+ [TIME_TEXT] = {{FORESTGREEN1, BLACK1_LOW_TRANS}},
+ [DEPTH_GRID] = {{WHITE1, TUNDORA1_MED_TRANS}},
+ [MEAN_DEPTH] = {{REDORANGE1_MED_TRANS, BLACK1_LOW_TRANS}},
+ [DEPTH_BOTTOM] = {{GOVERNORBAY1_MED_TRANS, TUNDORA1_MED_TRANS}},
+ [DEPTH_TOP] = {{MERCURY1_MED_TRANS, WHITE1_MED_TRANS}},
+ [TEMP_TEXT] = {{GOVERNORBAY2, BLACK1_LOW_TRANS}},
+ [TEMP_PLOT] = {{ROYALBLUE2_LOW_TRANS, BLACK1_LOW_TRANS}},
+ [SAC_DEFAULT] = {{WHITE1, BLACK1_LOW_TRANS}},
+ [BOUNDING_BOX] = {{WHITE1, BLACK1_LOW_TRANS}},
+ [PRESSURE_TEXT] = {{KILLARNEY1, BLACK1_LOW_TRANS}},
+ [BACKGROUND] = {{SPRINGWOOD1, BLACK1_LOW_TRANS}},
};
#define plot_info_size(nr) (sizeof(struct plot_info) + (nr)*sizeof(struct plot_data))
cairo_line_to(gc->cr, SCALE(gc, x, y));
}
-static void set_source_rgba(struct graphics_context *gc, color_t c, double a)
+static void set_source_rgba(struct graphics_context *gc, color_indice_t c)
{
- const rgb_t *rgb = &profile_color[c];
- double r = rgb->r;
- double g = rgb->g;
- double b = rgb->b;
- /*
- * For printers, we still honor 'a', but ignore colors
- * for now. Black is white and white is black
- */
- if (gc->printer) {
- double sum = r+g+b;
- if (sum > 0.8)
- r = g = b = 0;
- else
- r = g = b = 1;
- }
- cairo_set_source_rgba(gc->cr, r, g, b, a);
-}
+ 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;
-static void set_source_rgb(struct graphics_context *gc, color_t c)
-{
- set_source_rgba(gc, c, 1);
+ cairo_set_source_rgba(gc->cr, r, g, b, a);
}
void init_profile_background(struct graphics_context *gc)
{
- set_source_rgb(gc, BACKGROUND);
+ set_source_rgba(gc, BACKGROUND);
}
-void pattern_add_color_stop_rgba(cairo_pattern_t *pat, double o, color_t c, double a)
+void pattern_add_color_stop_rgba(struct graphics_context *gc, cairo_pattern_t *pat, double o, color_indice_t c)
{
- const rgb_t *rgb = &profile_color[c];
- cairo_pattern_add_color_stop_rgba (pat, o, rgb->r, rgb->g, rgb->b, a);
+ 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);
}
#define ROUND_UP(x,y) ((((x)+(y)-1)/(y))*(y))
pi->maxpressure, pi->mintemp, pi->maxtemp);
for (i = 0; i < pi->nr; i++)
printf(" entry[%d]:{same_cylinder:%d cylinderindex:%d sec:%d pressure:{%d,%d}\n"
- " temperature:%d depth:%d smoothed:%d}\n",
+ " time:%d:%02d temperature:%d depth:%d smoothed:%d}\n",
i, pi->entry[i].same_cylinder, pi->entry[i].cylinderindex, pi->entry[i].sec,
pi->entry[i].pressure[0], pi->entry[i].pressure[1],
+ pi->entry[i].sec / 60, pi->entry[i].sec % 60,
pi->entry[i].temperature, pi->entry[i].depth, pi->entry[i].smoothed);
printf(" }\n");
}
* 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
- * up as such.
- * we also need to add 180 seconds at the end so the min/max
+ * up as such unless zoom is enabled.
+ * We also need to add 180 seconds at the end so the min/max
* plots correctly
*/
static int get_maxtime(struct plot_info *pi)
{
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));
+ 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.
+ */
+ if ( seconds < 600 )
+ return ROUND_UP(seconds+seconds/4, 60);
+ else
+ return ROUND_UP(seconds+150, 60);
+ } 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));
+ }
}
static int get_maxdepth(struct plot_info *pi)
{
unsigned mm = pi->maxdepth;
- /* Minimum 30m, rounded up to 10m, with at least 3m to spare */
- return MAX(30000, ROUND_UP(mm+3000, 10000));
+ if (zoomed_plot) {
+ /* Rounded up to 10m, with at least 3m to spare */
+ return ROUND_UP(mm+3000, 10000);
+ } else {
+ /* Minimum 30m, rounded up to 10m, with at least 3m to spare */
+ return MAX(30000, ROUND_UP(mm+3000, 10000));
+ }
}
typedef struct {
int size;
- color_t color;
+ color_indice_t color;
double hpos, vpos;
} text_render_options_t;
cairo_rel_move_to(cr, dx, dy);
cairo_text_path(cr, buffer);
- set_source_rgba(gc, TEXT_BACKGROUND, 0.95);
+ set_source_rgba(gc, TEXT_BACKGROUND);
cairo_stroke(cr);
move_to(gc, x, y);
cairo_rel_move_to(cr, dx, dy);
- set_source_rgb(gc, tro->color);
+ set_source_rgba(gc, tro->color);
cairo_show_text(cr, buffer);
}
/* draw a little tirangular marker and attach tooltip */
x = SCALEX(gc, event->time.seconds);
y = SCALEY(gc, depth);
- set_source_rgba(gc, TRIANGULAR_BG, 0.8);
+ set_source_rgba(gc, ALERT_BG);
cairo_move_to(gc->cr, x-15, y+6);
cairo_line_to(gc->cr, x-3 , y+6);
cairo_line_to(gc->cr, x-9, y-6);
cairo_line_to(gc->cr, x-15, y+6);
cairo_stroke_preserve(gc->cr);
cairo_fill(gc->cr);
- set_source_rgba(gc, TRIANGULAR_FG, 0.8);
+ set_source_rgba(gc, ALERT_FG);
cairo_move_to(gc->cr, x-9, y-3);
cairo_line_to(gc->cr, x-9, y+1);
cairo_move_to(gc->cr, x-9, y+4);
int i;
struct plot_data *entry = pi->entry;
- set_source_rgba(gc, SMOOTHED, 0.20);
+ set_source_rgba(gc, SMOOTHED);
move_to(gc, entry->sec, entry->smoothed);
for (i = 1; i < pi->nr; i++) {
entry++;
}
static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_info *pi,
- int index, double a)
+ int index)
{
int i;
struct plot_data *entry = pi->entry;
- set_source_rgba(gc, MINUTE, a);
+ set_source_rgba(gc, MINUTE);
move_to(gc, entry->sec, entry->min[index]->depth);
for (i = 1; i < pi->nr; i++) {
entry++;
{
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);
+ plot_minmax_profile_minute(gc, pi, 2);
+ plot_minmax_profile_minute(gc, pi, 1);
+ plot_minmax_profile_minute(gc, pi, 0);
}
static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi)
int sec, depth;
struct plot_data *entry;
int maxtime, maxdepth, marker;
- int increments[4] = { 5*60, 10*60, 15*60, 30*60 };
+ int increments[8] = { 10, 20, 30, 60, 5*60, 10*60, 15*60, 30*60 };
/* Get plot scaling limits */
maxtime = get_maxtime(pi);
maxdepth = get_maxdepth(pi);
- /* Time markers: at most every 5 min, but no more than 12 markers
- * and for convenience we do 5, 10, 15 or 30 min intervals.
+ /* Time markers: at most every 10 seconds, but no more than 12 markers.
+ * We start out with 10 seconds and increment up to 30 minutes,
+ * depending on the dive time.
* This allows for 6h dives - enough (I hope) for even the craziest
* divers - but just in case, for those 8h depth-record-breaking dives,
* we double the interval if this still doesn't get us to 12 or fewer
* time markers */
i = 0;
- while (maxtime / increments[i] > 12 && i < 4)
+ while (maxtime / increments[i] > 12 && i < 8)
i++;
incr = increments[i];
while (maxtime / incr > 12)
gc->leftx = 0; gc->rightx = maxtime;
gc->topy = 0; gc->bottomy = 1.0;
- set_source_rgba(gc, TIME_MARKER, 0.5);
- cairo_set_line_width(gc->cr, 1);
+ set_source_rgba(gc, TIME_GRID);
+ cairo_set_line_width(gc->cr, 2);
for (i = incr; i < maxtime; i += incr) {
move_to(gc, i, 0);
}
cairo_stroke(cr);
- /* now the text on every second time marker */
+ /* now the text on the time markers */
text_render_options_t tro = {10, TIME_TEXT, CENTER, TOP};
- for (i = incr; i < maxtime; i += 2 * incr)
- plot_text(gc, &tro, i, 1, "%d", i/60);
-
+ if (maxtime < 600) {
+ /* Be a bit more verbose with shorter dives */
+ for (i = incr; i < maxtime; i += incr)
+ plot_text(gc, &tro, i, 1, "%02d:%02d", i/60, i%60);
+ } else {
+ /* Only render the time on every second marker for normal dives */
+ for (i = incr; i < maxtime; i += 2 * incr)
+ plot_text(gc, &tro, i, 1, "%d", i/60);
+ }
/* Depth markers: every 30 ft or 10 m*/
gc->leftx = 0; gc->rightx = 1.0;
gc->topy = 0; gc->bottomy = maxdepth;
case FEET: marker = 9144; break; /* 30 ft */
}
- set_source_rgba(gc, DEPTH_MARKER, 0.5);
+ set_source_rgba(gc, DEPTH_GRID);
for (i = marker; i < maxdepth; i += marker) {
move_to(gc, 0, i);
line_to(gc, 1, i);
/* Show mean depth */
if (! gc->printer) {
- set_source_rgba(gc, MEAN_DEPTH, 0.40);
+ set_source_rgba(gc, MEAN_DEPTH);
move_to(gc, 0, pi->meandepth);
line_to(gc, 1, pi->meandepth);
cairo_stroke(cr);
cairo_pattern_t *pat;
pat = cairo_pattern_create_linear (0.0, 0.0, 0.0, 256.0);
- pattern_add_color_stop_rgba (pat, 1, DEPTH_TOP, 0.6);
- pattern_add_color_stop_rgba (pat, 0, DEPTH_BOTTOM, 0.6);
+ pattern_add_color_stop_rgba (gc, pat, 1, DEPTH_BOTTOM);
+ pattern_add_color_stop_rgba (gc, pat, 0, DEPTH_TOP);
cairo_set_source(gc->cr, pat);
cairo_pattern_destroy(pat);
for (i = 0; i < pi->nr; i++, entry++)
line_to(gc, entry->sec, entry->depth);
cairo_close_path(gc->cr);
- if (gc->printer) {
- set_source_rgba(gc, DEPTH_FILL_PRINTER, 0.2);
- cairo_fill_preserve(cr);
- set_source_rgb(gc, DEPTH_STROKE_PRINTER);
- cairo_stroke(cr);
- return;
- }
+
cairo_fill(gc->cr);
/* Now do it again for the velocity colors */
* representing the vertical velocity, so we need to
* chop this into short segments */
depth = entry->depth;
- set_source_rgb(gc, velocity_color[entry->velocity]);
+ set_source_rgba(gc, VELOCITY_COLORS_START_IDX + entry->velocity);
move_to(gc, entry[-1].sec, entry[-1].depth);
line_to(gc, sec, depth);
cairo_stroke(cr);
return;
cairo_set_line_width(gc->cr, 2);
- set_source_rgba(gc, TEMP_PLOT, 0.8);
+ set_source_rgba(gc, TEMP_PLOT);
for (i = 0; i < pi->nr; i++) {
struct plot_data *entry = pi->entry + i;
int mkelvin = entry->temperature;
sac_index = 0;
if (sac_index > SAC_COLORS - 1)
sac_index = SAC_COLORS - 1;
- set_source_rgb(gc, sac_color[sac_index]);
+ set_source_rgba(gc, SAC_COLORS_START_IDX + sac_index);
} else {
- set_source_rgb(gc, SAC_DEFAULT);
+ set_source_rgba(gc, SAC_DEFAULT);
}
}
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
+ 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 */
int past = -2;
while (i+past > 0 && entry[0].sec - entry[past].sec < 15)
past--;
- entry->velocity = velocity((entry[0].depth - entry[past].depth) /
+ entry->velocity = velocity((entry[0].depth - entry[past].depth) /
(entry[0].sec - entry[past].sec));
}
} else
struct plot_data *entry = pi->entry +i;
analyze_plot_info_minmax(entry, pi->entry, pi->entry+nr);
}
-
+
return pi;
}
}
}
-static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
- pr_track_t **track_pr)
+static void fill_missing_tank_pressures(struct plot_info *pi, pr_track_t **track_pr)
{
pr_track_t *list = NULL;
pr_track_t *nlist = NULL;
/* there may be multiple segments - so
* let's assemble the length */
nlist = list;
- pt = list->pressure_time;
- while (!nlist->end) {
- nlist = nlist->next;
- if (!nlist) {
- /* oops - we have no end pressure,
- * so this means this is a tank without
- * gas consumption information */
- break;
+ if (list) {
+ pt = list->pressure_time;
+ while (!nlist->end) {
+ nlist = nlist->next;
+ if (!nlist) {
+ /* oops - we have no end pressure,
+ * so this means this is a tank without
+ * gas consumption information */
+ break;
+ }
+ pt += nlist->pressure_time;
}
- pt += nlist->pressure_time;
}
if (!nlist) {
/* just continue without calculating
pi->meandepth = dive->meandepth.mm;
if (missing_pr) {
- fill_missing_tank_pressures(dive, pi, track_pr);
+ fill_missing_tank_pressures(pi, track_pr);
}
for (cyl = 0; cyl < MAX_CYLINDERS; cyl++)
list_free(track_pr[cyl]);
int nr = dive->samples;
if (!nr) {
+ /* The dive has no samples, so create a few fake ones. This assumes an
+ ascent/descent rate of 9 m/min, which is just below the limit for FAST. */
int duration = dive->duration.seconds;
int maxdepth = dive->maxdepth.mm;
+ int asc_desc_time = dive->maxdepth.mm*60/9000;
+ if (asc_desc_time * 2 >= duration)
+ asc_desc_time = duration / 2;
sample = fake;
- fake[1].time.seconds = duration * 0.05;
+ fake[1].time.seconds = asc_desc_time;
fake[1].depth.mm = maxdepth;
- fake[2].time.seconds = duration * 0.95;
+ fake[2].time.seconds = duration - asc_desc_time;
fake[2].depth.mm = maxdepth;
fake[3].time.seconds = duration * 1.00;
nr = 4;
gc->maxx = (drawing_area->width - 2*drawing_area->x);
gc->maxy = (drawing_area->height - 2*drawing_area->y);
- /* Temperature profile */
- plot_temperature_profile(gc, pi);
-
/* Depth profile */
plot_depth_profile(gc, pi);
plot_events(gc, pi, dive);
+ /* Temperature profile */
+ plot_temperature_profile(gc, pi);
+
/* Cylinder pressure plot */
plot_cylinder_pressure(gc, pi, dive);
gc->leftx = 0; gc->rightx = 1.0;
gc->topy = 0; gc->bottomy = 1.0;
- set_source_rgb(gc, BOUNDING_BOX);
+ set_source_rgba(gc, BOUNDING_BOX);
cairo_set_line_width(gc->cr, 1);
move_to(gc, 0, 0);
line_to(gc, 0, 1);
projects / ext / subsurface.git / blobdiff