Prettier profile colors

[ext/subsurface.git] / profile.c

diff --git a/profile.c b/profile.c
index 9fab8b2e89f5ae72cf4732f91e48d4a3cb73de00..a49dbb801fe31a7212e77d033e60f4d2d8fc57df 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -179,7 +179,7 @@ static void plot_text(struct graphics_context *gc, const text_render_options_t *
        cairo_rel_move_to(cr, dx, dy);
 
        cairo_text_path(cr, buffer);
-       set_source_rgb(gc, 0, 0, 0);
+       set_source_rgba(gc, 0.95, 0.95, 0.95, 0.95);
        cairo_stroke(cr);
 
        move_to(gc, x, y);
@@ -296,8 +296,8 @@ static void render_depth_sample(struct graphics_context *gc, struct plot_data *e
 
 static void plot_text_samples(struct graphics_context *gc, struct plot_info *pi)
 {
-       static const text_render_options_t deep = {14, 1.0, 0.2, 0.2, CENTER, TOP};
-       static const text_render_options_t shallow = {14, 1.0, 0.2, 0.2, CENTER, BOTTOM};
+       static const text_render_options_t deep = {14, 0.8, 0.2, 0.2, CENTER, TOP};
+       static const text_render_options_t shallow = {14, 0.8, 0.2, 0.2, CENTER, BOTTOM};
        int i;
        int last = -1;
 
@@ -356,7 +356,7 @@ static void plot_minmax_profile_minute(struct graphics_context *gc, struct plot_
        int i;
        struct plot_data *entry = pi->entry;
 
-       set_source_rgba(gc, 1, 0.2, 1, a);
+       set_source_rgba(gc, 0.7, 0.2, 0.7, a);
        move_to(gc, entry->sec, entry->min[index]->depth);
        for (i = 1; i < pi->nr; i++) {
                entry++;
@@ -408,6 +408,8 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
        gc->leftx = 0; gc->rightx = maxtime;
        gc->topy = 0; gc->bottomy = 1.0;
        set_source_rgba(gc, 1, 1, 1, 0.5);
+       cairo_set_line_width(gc->cr, 1);
+
        for (i = incr; i < maxtime; i += incr) {
                move_to(gc, i, 0);
                line_to(gc, i, 1);
@@ -415,7 +417,7 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
        cairo_stroke(cr);
 
        /* now the text on every second time marker */
-       text_render_options_t tro = {10, 0.2, 1.0, 0.2, CENTER, TOP};
+       text_render_options_t tro = {10, 0.1, 0.5, 0.1, CENTER, TOP};
        for (i = incr; i < maxtime; i += 2 * incr)
                plot_text(gc, &tro, i, 1, "%d", i/60);
 
@@ -457,7 +459,15 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
 
        /* Do the depth profile for the neat fill */
        gc->topy = 0; gc->bottomy = maxdepth;
-       set_source_rgba(gc, 1, 0.2, 0.2, 0.20);
+
+       cairo_pattern_t *pat;
+       pat = cairo_pattern_create_linear (0.0, 0.0,  0.0, 256.0);
+       cairo_pattern_add_color_stop_rgba (pat, 1, 0.2, 0.2, 0.8, 0.6);
+       cairo_pattern_add_color_stop_rgba (pat, 0, 0.9, 0.9, 0.9, 0.6);
+
+       cairo_set_source(gc->cr, pat);
+       cairo_pattern_destroy(pat);
+       cairo_set_line_width(gc->cr, 2);
 
        entry = pi->entry;
        move_to(gc, 0, 0);
@@ -517,7 +527,7 @@ static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkel
 {
        double deg;
        const char *unit;
-       static const text_render_options_t tro = {12, 0.6, 0.6, 1.0, LEFT, TOP};
+       static const text_render_options_t tro = {12, 0.2, 0.2, 0.7, LEFT, TOP};
 
        deg = get_temp_units(mkelvin, &unit);
 
@@ -570,7 +580,8 @@ static void plot_temperature_profile(struct graphics_context *gc, struct plot_in
        if (!setup_temperature_limits(gc, pi))
                return;
 
-       set_source_rgba(gc, 0.2, 0.2, 1.0, 0.8);
+       cairo_set_line_width(gc->cr, 2);
+       set_source_rgba(gc, 0.2, 0.2, 0.9, 0.8);
        for (i = 0; i < pi->nr; i++) {
                struct plot_data *entry = pi->entry + i;
                int mkelvin = entry->temperature;
@@ -622,12 +633,16 @@ static void set_sac_color(struct graphics_context *gc, int sac, int avg_sac)
        int sac_index = 0;
        int delta = sac - avg_sac + 7000;
 
-       sac_index = delta / 2000;
-       if (sac_index < 0)
-               sac_index = 0;
-       if (sac_index > SAC_COLORS - 1)
-               sac_index = SAC_COLORS - 1;
-       set_source_rgb_struct(gc, &sac_color[sac_index]);
+       if (!gc->printer) {
+               sac_index = delta / 2000;
+               if (sac_index < 0)
+                       sac_index = 0;
+               if (sac_index > SAC_COLORS - 1)
+                       sac_index = SAC_COLORS - 1;
+               set_source_rgb_struct(gc, &sac_color[sac_index]);
+       } else {
+               set_source_rgb(gc, 1.0, 1.0, 1.0);
+       }
 }
 
 /* calculate the current SAC in ml/min and convert to int */
@@ -653,6 +668,8 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
        if (!get_cylinder_pressure_range(gc, pi))
                return;
 
+       cairo_set_line_width(gc->cr, 2);
+
        for (i = 0; i < pi->nr; i++) {
                int mbar;
                struct plot_data *entry = pi->entry + i;
@@ -669,10 +686,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
                if (!last_entry) {
                        last = i;
                        last_entry = entry;
-                       if (first_plot) {
-                               /* don't start with a sac of 0, so just calculate the first one */
-                               sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive);
-                       }
+                       sac = GET_LOCAL_SAC(entry, pi->entry + i + 1, dive);
                } else {
                        int j;
                        sac = 0;
@@ -713,7 +727,7 @@ static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
        const char *unit;
 
        pressure = get_pressure_units(mbar, &unit);
-       text_render_options_t tro = {10, 0.2, 1.0, 0.2, xalign, yalign};
+       text_render_options_t tro = {10, 0.2, 0.6, 0.2, xalign, yalign};
        plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
 }
 
@@ -949,6 +963,21 @@ static void list_free(pr_track_t *list)
        free(list);
 }
 
+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) {
+                       printf("cyl%d: start %d end %d t_start %d t_end %d pt %6.3f\n", cyl,
+                               list->start, list->end, list->t_start, list->t_end, list->pressure_time);
+                       list = list->next;
+               }
+       }
+}
+
 static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
                                        pr_track_t **track_pr)
 {
@@ -959,6 +988,10 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
        struct plot_data *entry;
        int cur_pr[MAX_CYLINDERS];
 
+       if (0) {
+               /* another great debugging tool */
+               dump_pr_track(track_pr);
+       }
        for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
                cur_pr[cyl] = track_pr[cyl]->start;
        }
@@ -1004,7 +1037,7 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
                                double cur_pt = (entry->sec - (entry-1)->sec) *
                                        (1 + (entry->depth + (entry-1)->depth) / 20000.0);
                                INTERPOLATED_PRESSURE(entry) =
-                                       cur_pr[entry->cylinderindex] + cur_pt * magic;
+                                       cur_pr[entry->cylinderindex] + cur_pt * magic + 0.5;
                                cur_pr[entry->cylinderindex] = INTERPOLATED_PRESSURE(entry);
                        } else
                                INTERPOLATED_PRESSURE(entry) = cur_pr[entry->cylinderindex];
@@ -1141,8 +1174,13 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
                while (ev && ev->time.seconds < sample->time.seconds) {
                        /* insert two fake plot info structures for the end of
                         * the old tank and the start of the new tank */
-                       entry->sec = ev->time.seconds;
-                       (entry+1)->sec = ev->time.seconds + 1;
+                       if (ev->time.seconds == sample->time.seconds - 1) {
+                               entry->sec = ev->time.seconds - 1;
+                               (entry+1)->sec = ev->time.seconds;
+                       } else {
+                               entry->sec = ev->time.seconds;
+                               (entry+1)->sec = ev->time.seconds + 1;
+                       }
                        /* we need a fake depth - let's interpolate */
                        if (i) {
                                entry->depth = sample->depth.mm -
@@ -1295,7 +1333,7 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
        pi = create_plot_info(dive, nr, sample);
 
        cairo_translate(gc->cr, drawing_area->x, drawing_area->y);
-       cairo_set_line_width(gc->cr, 2);
+       cairo_set_line_width(gc->cr, 1);
        cairo_set_line_cap(gc->cr, CAIRO_LINE_CAP_ROUND);
        cairo_set_line_join(gc->cr, CAIRO_LINE_JOIN_ROUND);
 
@@ -1309,6 +1347,9 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
        gc->maxx = (drawing_area->width - 2*drawing_area->x);
        gc->maxy = (drawing_area->height - 2*drawing_area->y);
 
+       cairo_set_source_rgba(gc->cr, 0.95, 0.95, 0.90, 0.95);
+       cairo_paint(gc->cr);
+
        /* Temperature profile */
        plot_temperature_profile(gc, pi);
 
@@ -1329,6 +1370,7 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
        gc->topy = 0; gc->bottomy = 1.0;
 
        set_source_rgb(gc, 1, 1, 1);
+       cairo_set_line_width(gc->cr, 1);
        move_to(gc, 0, 0);
        line_to(gc, 0, 1);
        line_to(gc, 1, 1);