/* 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},
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);
/* 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);
return pi->maxpressure != 0;
}
+#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 */
+ * 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 delta = sac - avg_sac;
- if (delta < -6000)
- set_source_rgb(gc, 0.0, 0.4, 0.2);
- else if (delta < -4000)
- set_source_rgb(gc, 0.2, 0.6, 0.2);
- else if (delta < -2000)
- set_source_rgb(gc, 0.4, 0.8, 0.2);
- else if (delta < 0)
- set_source_rgb(gc, 0.6, 0.8, 0.2);
- else if (delta < 2000)
- set_source_rgb(gc, 0.8, 0.8, 0.2);
- else if (delta < 4000)
- set_source_rgb(gc, 0.8, 0.6, 0.2);
- else if (delta < 6000)
- set_source_rgb(gc, 0.8, 0.4, 0.2);
- else if (delta < 8000)
- set_source_rgb(gc, 0.9, 0.3, 0.2);
- else
- set_source_rgb(gc, 1.0, 0.2, 0.2);
+ 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 */
if (!last_entry) {
last = i;
last_entry = entry;
- if (first_plot) {
- /* don't start with a sac of 0 */
- int fe = i + 1;
- struct plot_data *future_entry = pi->entry + fe;
- while (fe < pi->nr && future_entry->sec - entry->sec < SAC_WINDOW) {
- fe++;
- future_entry = pi->entry + fe;
- }
- sac = GET_LOCAL_SAC(entry, future_entry, dive);
+ 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;
}
- } else if (entry->sec - last_entry->sec >= SAC_WINDOW) {
- sac = GET_LOCAL_SAC(last_entry, entry, dive);
- last++;
- last_entry = pi->entry + last;
}
set_sac_color(gc, sac, dive->sac);
if (lift_pen) {
plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
}
-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;
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);
}
}
}
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);
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 -
}
/* 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);
}
/* Temperature profile */
plot_temperature_profile(gc, pi);
- /* Cylinder pressure plot */
- plot_cylinder_pressure(gc, pi, dive);
-
/* 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;
projects / ext / subsurface.git / blobdiff