]> git.tdb.fi Git - ext/subsurface.git/blobdiff - profile.c
Correctly plot the tank end pressure if it was set manually
[ext/subsurface.git] / profile.c
index f0ae0c9311c5eba3c3bc24130c01d8b02c36eb59..df1b22b30caeedad3cd81220ed4d6529a00d277d 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -44,10 +44,11 @@ struct plot_info {
 #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))
 
 /* convert velocity to colors */
 typedef struct { double r, g, b; } rgb_t;
-static const rgb_t rgb[] = {
+static const rgb_t velocity_color[] = {
        [STABLE]   = {0.0, 0.4, 0.0},
        [SLOW]     = {0.4, 0.8, 0.0},
        [MODERATE] = {0.8, 0.8, 0.0},
@@ -88,6 +89,11 @@ static void set_source_rgba(struct graphics_context *gc, double r, double g, dou
        cairo_set_source_rgba(gc->cr, r, g, b, a);
 }
 
+static void set_source_rgb_struct(struct graphics_context *gc, const rgb_t *rgb)
+{
+       set_source_rgba(gc, rgb->r, rgb->g, rgb->b, 1);
+}
+
 void set_source_rgb(struct graphics_context *gc, double r, double g, double b)
 {
        set_source_rgba(gc, r, g, b, 1);
@@ -475,9 +481,8 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
                /* 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->depth;
-               set_source_rgb(gc, color.r, color.g, color.b);
+               set_source_rgb_struct(gc, &velocity_color[entry->velocity]);
                move_to(gc, entry[-1].sec, entry[-1].depth);
                line_to(gc, sec, depth);
                cairo_stroke(cr);
@@ -594,55 +599,111 @@ static int get_cylinder_pressure_range(struct graphics_context *gc, struct plot_
        return pi->maxpressure != 0;
 }
 
-static void plot_pressure_helper(struct graphics_context *gc, struct plot_info *pi, int type)
+#define SAC_COLORS 9
+static const rgb_t sac_color[SAC_COLORS] = {
+       { 0.0, 0.4, 0.2},
+       { 0.2, 0.6, 0.2},
+       { 0.4, 0.8, 0.2},
+       { 0.6, 0.8, 0.2},
+       { 0.8, 0.8, 0.2},
+       { 0.8, 0.6, 0.2},
+       { 0.8, 0.4, 0.2},
+       { 0.9, 0.3, 0.2},
+       { 1.0, 0.2, 0.2},
+};
+
+/* set the color for the pressure plot according to temporary sac rate
+ * as compared to avg_sac; the calculation simply maps the delta between
+ * sac and avg_sac to indexes 0 .. (SAC_COLORS - 1) with everything
+ * more than 6000 ml/min below avg_sac mapped to 0 */
+
+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]);
+}
+
+/* calculate the current SAC in ml/min and convert to int */
+#define GET_LOCAL_SAC(_entry1, _entry2, _dive) (int)                           \
+       ((GET_PRESSURE((_entry1)) - GET_PRESSURE((_entry2))) *                  \
+               (_dive)->cylinder[(_entry1)->cylinderindex].type.size.mliter /  \
+               (((_entry2)->sec - (_entry1)->sec) / 60.0) /                    \
+               (1 + ((_entry1)->depth + (_entry2)->depth) / 20000.0) /         \
+               1000.0)
+
+#define SAC_WINDOW 45  /* sliding window in seconds for current SAC calculation */
+
+static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi,
+                               struct dive *dive)
 {
        int i;
+       int last = -1;
        int lift_pen = FALSE;
+       int first_plot = TRUE;
+       int sac = 0;
+       struct plot_data *last_entry = NULL;
+
+       if (!get_cylinder_pressure_range(gc, pi))
+               return;
 
        for (i = 0; i < pi->nr; i++) {
                int mbar;
                struct plot_data *entry = pi->entry + i;
 
-               mbar = entry->pressure[type];
-               if (!entry->same_cylinder)
+               mbar = GET_PRESSURE(entry);
+               if (!entry->same_cylinder) {
                        lift_pen = TRUE;
+                       last_entry = NULL;
+               }
                if (!mbar) {
                        lift_pen = TRUE;
                        continue;
                }
+               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);
+                       }
+               } else {
+                       int j;
+                       sac = 0;
+                       for (j = last; j < i; j++)
+                               sac += GET_LOCAL_SAC(pi->entry + j, pi->entry + j + 1, dive);
+                       sac /= (i - last);
+                       if (entry->sec - last_entry->sec >= SAC_WINDOW) {
+                               last++;
+                               last_entry = pi->entry + last;
+                       }
+               }
+               set_sac_color(gc, sac, dive->sac);
                if (lift_pen) {
-                       if (i > 0 && entry->same_cylinder) {
+                       if (!first_plot && entry->same_cylinder) {
                                /* if we have a previous event from the same tank,
-                                * draw at least a short line .
-                                * This uses the implementation detail that the
-                                * type is either 0 or 1 */
+                                * draw at least a short line */
                                int prev_pr;
-                               prev_pr = (entry-1)->pressure[type] ? : (entry-1)->pressure[1 - type];
+                               prev_pr = GET_PRESSURE(entry - 1);
                                move_to(gc, (entry-1)->sec, prev_pr);
                                line_to(gc, entry->sec, mbar);
-                       } else
+                       } else {
+                               first_plot = FALSE;
                                move_to(gc, entry->sec, mbar);
+                       }
                        lift_pen = FALSE;
-               }
-               else
+               } else {
                        line_to(gc, entry->sec, mbar);
+               }
+               cairo_stroke(gc->cr);
+               move_to(gc, entry->sec, mbar);
        }
-       cairo_stroke(gc->cr);
-
-}
-
-static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info *pi)
-{
-       if (!get_cylinder_pressure_range(gc, pi))
-               return;
-
-       /* first plot the pressure readings we have from the dive computer */
-       set_source_rgba(gc, 0.2, 1.0, 0.2, 0.80);
-       plot_pressure_helper(gc, pi, SENSOR_PR);
-
-       /* then, in a different color, the interpolated values */
-       set_source_rgba(gc, 1.0, 1.0, 0.2, 0.80);
-       plot_pressure_helper(gc, pi, INTERPOLATED_PR);
 }
 
 static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
@@ -656,9 +717,7 @@ static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
        plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
 }
 
-#define GET_PRESSURE(_entry) (SENSOR_PRESSURE(_entry) ? : INTERPOLATED_PRESSURE(_entry))
-
-static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi)
+static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot_info *pi, struct dive *dive)
 {
        int i;
        int mbar, cyl;
@@ -704,7 +763,10 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
 
        for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) {
                if (last_time[cyl]) {
-                       plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP);
+                       if (dive->cylinder[cyl].end.mbar)
+                               plot_pressure_value(gc, dive->cylinder[cyl].end.mbar, last_time[cyl], CENTER, TOP);
+                       else
+                               plot_pressure_value(gc, last_pressure[cyl], last_time[cyl], CENTER, TOP);
                }
        }
 }
@@ -939,10 +1001,11 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
                                        list = NULL;
                                        continue;
                                }
-                               magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt;                               }
+                               magic = (nlist->end - cur_pr[entry->cylinderindex]) / pt;
+                       }
                        if (pt != 0.0) {
                                double cur_pt = (entry->sec - (entry-1)->sec) *
-                                       (1 + entry->depth / 10000.0);
+                                       (1 + (entry->depth + (entry-1)->depth) / 20000.0);
                                INTERPOLATED_PRESSURE(entry) =
                                        cur_pr[entry->cylinderindex] + cur_pt * magic;
                                cur_pr[entry->cylinderindex] = INTERPOLATED_PRESSURE(entry);
@@ -1158,7 +1221,7 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
                }
                /* finally, do the discrete integration to get the SAC rate equivalent */
                current->pressure_time += (entry->sec - (entry-1)->sec) *
-                                               (1 + entry->depth / 10000.0);
+                       (1 + (entry->depth + (entry-1)->depth) / 20000.0);
                missing_pr |= !SENSOR_PRESSURE(entry);
        }
 
@@ -1252,17 +1315,17 @@ void plot(struct graphics_context *gc, cairo_rectangle_int_t *drawing_area, stru
        /* Temperature profile */
        plot_temperature_profile(gc, pi);
 
-       /* Cylinder pressure plot */
-       plot_cylinder_pressure(gc, pi);
-
        /* Depth profile */
        plot_depth_profile(gc, pi);
        plot_events(gc, pi, dive);
 
+       /* Cylinder pressure plot */
+       plot_cylinder_pressure(gc, pi, dive);
+
        /* Text on top of all graphs.. */
        plot_temperature_text(gc, pi);
        plot_depth_text(gc, pi);
-       plot_cylinder_pressure_text(gc, pi);
+       plot_cylinder_pressure_text(gc, pi, dive);
 
        /* Bounding box last */
        gc->leftx = 0; gc->rightx = 1.0;