]> git.tdb.fi Git - ext/subsurface.git/commitdiff
Merge branch 'guifixes' of git://github.com/dirkhh/subsurface
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Oct 2011 19:30:44 +0000 (22:30 +0300)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 20 Oct 2011 19:30:44 +0000 (22:30 +0300)
profile.c

index 10692535f464d8895d0416b898ee59e292ed4c8b..60b9ab9d9df85dd8cb99db3b33193a5bc9f07ae7 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -508,7 +508,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
                if (entry->same_cylinder)
                        line_to(gc, entry->sec, mbar);
                else
-                       move_to(gc, 0, pi->maxpressure);
+                       move_to(gc, entry->sec, mbar);
        }
        /* if we have valid samples, we don't want to draw a line to the minpressure
         * but just end wherever the dive ended (think valve shutdowns during dive)
@@ -719,6 +719,8 @@ static struct plot_info *create_plot_info(struct dive *dive)
                entry->same_cylinder = sample->cylinderindex == cylinderindex;
                cylinderindex = sample->cylinderindex;
                entry->pressure = sample->cylinderpressure.mbar;
+               if (!entry->same_cylinder && !entry->pressure)
+                       entry->pressure = dive->cylinder[cylinderindex].start.mbar;
                entry->temperature = sample->temperature.mkelvin;
 
                if (depth || lastdepth)