Improve temperature text plotting in profile display

[ext/subsurface.git] / profile.c

diff --git a/profile.c b/profile.c
index e5d8aa9b9065d5cc335e9a74413da3bd2eae1aae..f1f3761506fc1f5b65cbc6255b7c00ec4ef14ed2 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -513,7 +513,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.2, 0.2, 1.0, LEFT, TOP};
+       static const text_render_options_t tro = {12, 0.6, 0.6, 1.0, LEFT, TOP};
 
        deg = get_temp_units(mkelvin, &unit);
 
@@ -523,7 +523,7 @@ static void plot_single_temp_text(struct graphics_context *gc, int sec, int mkel
 static void plot_temperature_text(struct graphics_context *gc, struct plot_info *pi)
 {
        int i;
-       int last = 0, sec = 0;
+       int last = -300, sec = 0;
        int last_temperature = 0, last_printed_temp = 0;
 
        if (!setup_temperature_limits(gc, pi))
@@ -537,14 +537,23 @@ static void plot_temperature_text(struct graphics_context *gc, struct plot_info
                        continue;
                last_temperature = mkelvin;
                sec = entry->sec;
-               if (sec < last + 300)
+               /* don't print a temperature
+                * if it's been less than 5min and less than a 2K change OR
+                * if it's been less than 2min OR if the change from the
+                * last print is less than .4K (and therefore less than 1F */
+               if (((sec < last + 300) && (abs(mkelvin - last_printed_temp) < 2000)) ||
+                       (sec < last + 120) ||
+                       (abs(mkelvin - last_printed_temp) < 400))
                        continue;
                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 (abs(last_temperature - last_printed_temp) > 500)
+       /* it would be nice to print the end temperature, if it's
+        * different or if the last temperature print has been more
+        * than a quarter of the dive back */
+       if ((abs(last_temperature - last_printed_temp) > 500) ||
+               ((double)last / (double)sec < 0.75))
                plot_single_temp_text(gc, sec, last_temperature);
 }
 
@@ -660,8 +669,10 @@ static void plot_cylinder_pressure_text(struct graphics_context *gc, struct plot
        if (!get_cylinder_pressure_range(gc, pi))
                return;
 
-       /* only loop over the actual events from the dive computer */
-       for (i = 2; i < pi->nr; i++) {
+       /* only loop over the actual events from the dive computer
+        * plus the second synthetic event at the start (to make sure
+        * we get "time=0" right) */
+       for (i = 1; i < pi->nr; i++) {
                entry = pi->entry + i;
 
                if (!entry->same_cylinder) {
@@ -889,8 +900,9 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
                cur_pr[cyl] = track_pr[cyl]->start;
        }
 
-       /* The first two are "fillers" */
-       for (i = 2; i < pi->nr; i++) {
+       /* The first two are "fillers", but in case we don't have a sample
+        * at time 0 we need to process the second of them here */
+       for (i = 1; i < pi->nr; i++) {
                entry = pi->entry + i;
                if (SENSOR_PRESSURE(entry)) {
                        cur_pr[entry->cylinderindex] = SENSOR_PRESSURE(entry);
@@ -929,7 +941,8 @@ static void fill_missing_tank_pressures(struct dive *dive, struct plot_info *pi,
                                INTERPOLATED_PRESSURE(entry) =
                                        cur_pr[entry->cylinderindex] + cur_pt * magic;
                                cur_pr[entry->cylinderindex] = INTERPOLATED_PRESSURE(entry);
-                       }
+                       } else
+                               INTERPOLATED_PRESSURE(entry) = cur_pr[entry->cylinderindex];
                }
        }
 }
@@ -1094,7 +1107,7 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
                entry->temperature = sample->temperature.mkelvin;
 
                if (depth || lastdepth)
-                       lastindex = i+pi_idx;
+                       lastindex = i + pi_idx;
 
                lastdepth = depth;
                if (depth > pi->maxdepth)
@@ -1109,14 +1122,14 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
                entry = pi->entry + i + pi_idx;
                ev = get_next_gaschange(ev->next);
        }
-       nr_samples += pi_idx - 2;
+       nr = nr_samples + pi_idx - 2;
        check_gas_change_events(dive, pi);
 
        for (cyl = 0; cyl < MAX_CYLINDERS; cyl++) /* initialize the start pressures */
                track_pr[cyl] = pr_track_alloc(dive->cylinder[cyl].start.mbar, -1);
        current = track_pr[pi->entry[2].cylinderindex];
-       for (i = 0; i < nr_samples; i++) {
-               entry = pi->entry + i + 2;
+       for (i = 0; i < nr + 1; i++) {
+               entry = pi->entry + i + 1;
 
                entry->same_cylinder = entry->cylinderindex == cylinderindex;
                cylinderindex = entry->cylinderindex;
@@ -1155,12 +1168,15 @@ static struct plot_info *create_plot_info(struct dive *dive, int nr_samples, str
                }
        }
        /* Fill in the last two entries with empty values but valid times */
-       i = nr_samples + 2;
+       i = nr + 2;
        pi->entry[i].sec = sec + 20;
        pi->entry[i+1].sec = sec + 40;
-       /* the number of actual entries - we may have allocated more if there
-        * were gas change events, but this is how many were filled */
+       /* the number of actual entries - some computers have lots of
+        * depth 0 samples at the end of a dive, we want to make sure
+        * we have exactly one of them at the end */
        pi->nr = lastindex+1;
+       while (pi->nr <= i+2 && pi->entry[pi->nr-1].depth > 0)
+               pi->nr++;
        pi->maxtime = pi->entry[lastindex].sec;
 
        pi->endpressure = pi->minpressure = dive->cylinder[0].end.mbar;