Split reading/writing preferences into OS specific files

[ext/subsurface.git] / profile.c

diff --git a/profile.c b/profile.c
index 9fab8b2e89f5ae72cf4732f91e48d4a3cb73de00..aedea192b3583a85f0945259d7dca193105eb6d6 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -669,10 +669,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;
@@ -1004,7 +1001,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 +1138,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 -