Merge branch 'freediving-tweaks' of git://github.com/mguentner/subsurface

Merge freediving tweaks (zoom in on short dives etc) from Maximilian
Güntner.

Trivial conflicts in display.h due to unrelated printing stuff just
happening to be added nearby.

* 'freediving-tweaks' of git://github.com/mguentner/subsurface:
  moved zoomed_plot to display.h
  plot the time with a fixed padding (leading zero)
  updated/corrected comment
  added "Zoom" button and improved scaling
  fixed indentation
  use increments that make sense for 600 seconds
  Plot shorter (apnea) dives with a reasonable scale

diff --git a/display.h b/display.h
index d054b699450161de1fc2e8699ac5e58173e06357..4e1511656ad5d20b38948b8819a5ad25aefe5ee0 100644 (file)
--- a/display.h
+++ b/display.h
@@ -31,4 +31,6 @@ struct options {
        gboolean print_profiles;
 };
 
+extern char zoomed_plot;
+
 #endif

diff --git a/gtk-gui.c b/gtk-gui.c
index 2a4d77ac9a78e60cc052ddbfdf3e36421b6d6109..7db777ab92e4254fdb14644ad2ac2c9348387dc4 100644 (file)
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -729,6 +729,13 @@ static void view_three(GtkWidget *w, gpointer data)
        gtk_paned_set_position(GTK_PANED(vpane), requisition.height + 6);
 }
 
+static void toggle_zoom(GtkWidget *w, gpointer data)
+{
+       zoomed_plot = (zoomed_plot)?0 : 1;
+       /*Update dive*/
+       repaint_dive();
+}
+
 static GtkActionEntry menu_items[] = {
        { "FileMenuAction", NULL, "File", NULL, NULL, NULL},
        { "LogMenuAction",  NULL, "Log", NULL, NULL, NULL},
@@ -749,7 +756,8 @@ static GtkActionEntry menu_items[] = {
        { "ViewList",       NULL, "List",  CTRLCHAR "1", NULL, G_CALLBACK(view_list) },
        { "ViewProfile",    NULL, "Profile", CTRLCHAR "2", NULL, G_CALLBACK(view_profile) },
        { "ViewInfo",       NULL, "Info", CTRLCHAR "3", NULL, G_CALLBACK(view_info) },
-       { "ViewThree",       NULL, "Three", CTRLCHAR "4", NULL, G_CALLBACK(view_three) },
+       { "ViewThree",      NULL, "Three", CTRLCHAR "4", NULL, G_CALLBACK(view_three) },
+       { "ToggleZoom",     NULL, "Toggle Zoom", CTRLCHAR "0", NULL, G_CALLBACK(toggle_zoom) },
 };
 static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
 
@@ -771,6 +779,7 @@ static const gchar* ui_string = " \
                                <menuitem name=\"Add Dive\" action=\"AddDive\" /> \
                                <separator name=\"Separator\"/> \
                                <menuitem name=\"Renumber\" action=\"Renumber\" /> \
+                               <menuitem name=\"Toggle Zoom\" action=\"ToggleZoom\" /> \
                                <menu name=\"View\" action=\"ViewMenuAction\"> \
                                        <menuitem name=\"List\" action=\"ViewList\" /> \
                                        <menuitem name=\"Profile\" action=\"ViewProfile\" /> \

diff --git a/profile.c b/profile.c
index 6a159cca85681fcc8436f159e6d0da9deb56e7c4..d4e88c02c21c498293d87a87ebf0f7a853a13ea0 100644 (file)
--- a/profile.c
+++ b/profile.c
@@ -14,6 +14,7 @@
 #include "color.h"
 
 int selected_dive = 0;
+char zoomed_plot = 0;
 
 typedef enum { STABLE, SLOW, MODERATE, FAST, CRAZY } velocity_t;
 
@@ -180,22 +181,40 @@ static void dump_pi (struct plot_info *pi)
  * When showing dive profiles, we scale things to the
  * current dive. However, we don't scale past less than
  * 30 minutes or 90 ft, just so that small dives show
- * up as such.
- * we also need to add 180 seconds at the end so the min/max
+ * up as such unless zoom is enabled.
+ * We also need to add 180 seconds at the end so the min/max
  * plots correctly
  */
 static int get_maxtime(struct plot_info *pi)
 {
        int seconds = pi->maxtime;
-       /* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */
-       return MAX(30*60, ROUND_UP(seconds+150, 60*5));
+       if (zoomed_plot) {
+               /* Rounded up to one minute, with at least 2.5 minutes to
+                * spare.
+                * For dive times shorter than 10 minutes, we use seconds/4 to
+                * calculate the space dynamically.
+                * This is seamless since 600/4 = 150.
+                */
+               if ( seconds < 600 )
+                       return ROUND_UP(seconds+seconds/4, 60);
+               else
+                       return ROUND_UP(seconds+150, 60);
+       } else {
+               /* min 30 minutes, rounded up to 5 minutes, with at least 2.5 minutes to spare */
+               return MAX(30*60, ROUND_UP(seconds+150, 60*5));
+       }
 }
 
 static int get_maxdepth(struct plot_info *pi)
 {
        unsigned mm = pi->maxdepth;
-       /* Minimum 30m, rounded up to 10m, with at least 3m to spare */
-       return MAX(30000, ROUND_UP(mm+3000, 10000));
+       if (zoomed_plot) {
+               /* Rounded up to 10m, with at least 3m to spare */
+               return ROUND_UP(mm+3000, 10000);
+       } else {
+               /* Minimum 30m, rounded up to 10m, with at least 3m to spare */
+               return MAX(30000, ROUND_UP(mm+3000, 10000));
+       }
 }
 
 typedef struct {
@@ -443,20 +462,21 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
        int sec, depth;
        struct plot_data *entry;
        int maxtime, maxdepth, marker;
-       int increments[4] = { 5*60, 10*60, 15*60, 30*60 };
+       int increments[8] = { 10, 20, 30, 60, 5*60, 10*60, 15*60, 30*60 };
 
        /* Get plot scaling limits */
        maxtime = get_maxtime(pi);
        maxdepth = get_maxdepth(pi);
 
-       /* Time markers: at most every 5 min, but no more than 12 markers
-        * and for convenience we do 5, 10, 15 or 30 min intervals.
+       /* Time markers: at most every 10 seconds, but no more than 12 markers.
+        * We start out with 10 seconds and increment up to 30 minutes,
+        * depending on the dive time.
         * This allows for 6h dives - enough (I hope) for even the craziest
         * divers - but just in case, for those 8h depth-record-breaking dives,
         * we double the interval if this still doesn't get us to 12 or fewer
         * time markers */
        i = 0;
-       while (maxtime / increments[i] > 12 && i < 4)
+       while (maxtime / increments[i] > 12 && i < 8)
                i++;
        incr = increments[i];
        while (maxtime / incr > 12)
@@ -473,11 +493,17 @@ static void plot_depth_profile(struct graphics_context *gc, struct plot_info *pi
        }
        cairo_stroke(cr);
 
-       /* now the text on every second time marker */
+       /* now the text on the time markers */
        text_render_options_t tro = {10, TIME_TEXT, CENTER, TOP};
-       for (i = incr; i < maxtime; i += 2 * incr)
-               plot_text(gc, &tro, i, 1, "%d", i/60);
-
+       if (maxtime < 600) {
+               /* Be a bit more verbose with shorter dives */
+               for (i = incr; i < maxtime; i += incr)
+                       plot_text(gc, &tro, i, 1, "%02d:%02d", i/60, i%60);
+       } else {
+               /* Only render the time on every second marker for normal dives */
+               for (i = incr; i < maxtime; i += 2 * incr)
+                       plot_text(gc, &tro, i, 1, "%d", i/60);
+       }
        /* Depth markers: every 30 ft or 10 m*/
        gc->leftx = 0; gc->rightx = 1.0;
        gc->topy = 0; gc->bottomy = maxdepth;