Make the first filename on the command line the default filename

[ext/subsurface.git] / profile.c

diff --git a/profile.c b/profile.c
index f40742c4a354c22e905c75ea21d096bdc4289092..60b9ab9d9df85dd8cb99db3b33193a5bc9f07ae7 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -25,6 +25,7 @@ struct plot_info {
        int endpressure; /* start pressure better be max pressure */
        int mintemp, maxtemp;
        struct plot_data {
+               unsigned int same_cylinder:1;
                int sec;
                int pressure, temperature;
                /* Depth info */
@@ -171,14 +172,20 @@ static void plot_one_event(struct graphics_context *gc, struct plot_info *pi, st
        /* draw a little tirangular marker and attach tooltip */
        x = SCALEX(gc, event->time.seconds);
        y = SCALEY(gc, depth);
-       set_source_rgba(gc, 1.0, 0.1, 0.1, 0.5);
-       cairo_move_to(gc->cr, x-6, y-3);
-       cairo_line_to(gc->cr, x  , y-3);
-       cairo_line_to(gc->cr, x-3, y+3);
-       cairo_line_to(gc->cr, x-6, y-3);
+       set_source_rgba(gc, 1.0, 1.0, 0.1, 0.8);
+       cairo_move_to(gc->cr, x-15, y+6);
+       cairo_line_to(gc->cr, x-3  , y+6);
+       cairo_line_to(gc->cr, x-9, y-6);
+       cairo_line_to(gc->cr, x-15, y+6);
        cairo_stroke_preserve(gc->cr);
        cairo_fill(gc->cr);
-       attach_tooltip(x-6, y-3, 6, 6, event->name);
+       set_source_rgba(gc, 0.0, 0.0, 0.0, 0.8);
+       cairo_move_to(gc->cr, x-9, y-3);
+       cairo_line_to(gc->cr, x-9, y+1);
+       cairo_move_to(gc->cr, x-9, y+4);
+       cairo_line_to(gc->cr, x-9, y+4);
+       cairo_stroke(gc->cr);
+       attach_tooltip(x-15, y-6, 12, 12, event->name);
 }
 
 static void plot_events(struct graphics_context *gc, struct plot_info *pi, struct dive *dive)
@@ -490,8 +497,7 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
 
        set_source_rgba(gc, 0.2, 1.0, 0.2, 0.80);
 
-       move_to(gc, 0, pi->maxpressure);
-       for (i = 1; i < pi->nr; i++) {
+       for (i = 0; i < pi->nr; i++) {
                int mbar;
                struct plot_data *entry = pi->entry + i;
 
@@ -499,7 +505,10 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
                if (!mbar)
                        continue;
                have_pressure = TRUE;
-               line_to(gc, entry->sec, mbar);
+               if (entry->same_cylinder)
+                       line_to(gc, entry->sec, mbar);
+               else
+                       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)
@@ -685,6 +694,7 @@ static struct plot_info *analyze_plot_info(struct plot_info *pi)
  */
 static struct plot_info *create_plot_info(struct dive *dive)
 {
+       int cylinderindex = -1;
        int lastdepth, lastindex;
        int i, nr = dive->samples + 4, sec;
        size_t alloc_size = plot_info_size(nr);
@@ -705,7 +715,12 @@ static struct plot_info *create_plot_info(struct dive *dive)
 
                sec = entry->sec = sample->time.seconds;
                depth = entry->val = sample->depth.mm;
+
+               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)
@@ -721,6 +736,10 @@ static struct plot_info *create_plot_info(struct dive *dive)
        i = dive->samples + 2;
        pi->entry[i].sec = sec + 20;
        pi->entry[i+1].sec = sec + 40;
+       if (cylinderindex >= 0) {
+               pi->entry[i].pressure = dive->cylinder[cylinderindex].end.mbar;
+               pi->entry[i].same_cylinder = 1;
+       }
 
        pi->nr = lastindex+1;
        pi->maxtime = pi->entry[lastindex].sec;