Merge branch 'ui-tweaks' of https://github.com/nathansamson/diveclog

* 'ui-tweaks' of https://github.com/nathansamson/diveclog:
  Some UI beauty patches:

diff --git a/dive.c b/dive.c
index 5ddb6bc8087faae233843dc46683382934fe6792..7fe6eb17b863f0ceeef887d81636fcb77991a3e8 100644 (file)
--- a/dive.c
+++ b/dive.c
@@ -21,10 +21,38 @@
  */
 static void update_depth(depth_t *depth, int new)
 {
-       int old = depth->mm;
+       if (new) {
+               int old = depth->mm;
 
-       if (abs(old - new) > 1000)
-               depth->mm = new;
+               if (abs(old - new) > 1000)
+                       depth->mm = new;
+       }
+}
+
+static void update_pressure(pressure_t *pressure, int new)
+{
+       if (new) {
+               int old = pressure->mbar;
+
+               if (abs(old - new) > 1000)
+                       pressure->mbar = new;
+       }
+}
+
+static void update_duration(duration_t *duration, int new)
+{
+       if (new)
+               duration->seconds = new;
+}
+
+static void update_temperature(temperature_t *temperature, int new)
+{
+       if (new) {
+               int old = temperature->mkelvin;
+
+               if (abs(old - new) > 1000)
+                       temperature->mkelvin = new;
+       }
 }
 
 struct dive *fixup_dive(struct dive *dive)
@@ -85,18 +113,16 @@ struct dive *fixup_dive(struct dive *dive)
        }
        if (end < 0)
                return dive;
-       dive->duration.seconds = end - start;
+
+       update_duration(&dive->duration, end - start);
        if (start != end)
-               update_depth(&dive->meandepth, depthtime / (end - start));
-       if (startpress)
-               dive->beginning_pressure.mbar = startpress;
-       if (endpress)
-               dive->end_pressure.mbar = endpress;
-       if (mintemp)
-               dive->watertemp.mkelvin = mintemp;
-
-       if (maxdepth)
-               update_depth(&dive->maxdepth, maxdepth);
+               depthtime /= (end - start);
+
+       update_depth(&dive->meandepth, depthtime);
+       update_pressure(&dive->beginning_pressure, startpress);
+       update_pressure(&dive->end_pressure, endpress);
+       update_temperature(&dive->watertemp, mintemp);
+       update_depth(&dive->maxdepth, maxdepth);
 
        return dive;
 }

diff --git a/parse-xml.c b/parse-xml.c
index 3221111c748bf37ec9825533b6df8e79a7ce9f39..1ca046db7a62f2e0391e8f89e896df0c34dd06d8 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -708,6 +708,51 @@ static void sanitize_gasmix(gasmix_t *mix)
        memset(mix, 0, sizeof(*mix));
 }
 
+/*
+ * See if the size/workingpressure looks like some standard cylinder
+ * size, eg "AL80".
+ */
+static void match_standard_cylinder(cylinder_type_t *type)
+{
+       int psi, cuft, len;
+       const char *fmt;
+       char buffer[20], *p;
+
+       /* Do we already have a cylinder description? */
+       if (type->description)
+               return;
+
+       cuft = type->size.mliter / 1000;
+       psi = type->workingpressure.mbar / 68.95;
+
+       switch (psi) {
+       case 2300 ... 2500:     /* 2400 psi: LP tank */
+               fmt = "LP%d";
+               break;
+       case 2600 ... 2700:     /* 2640 psi: LP+10% */
+               fmt = "LP%d+";
+               break;
+       case 2900 ... 3100:     /* 3000 psi: ALx tank */
+               fmt = "AL%d";
+               break;
+       case 3400 ... 3500:     /* 3442 psi: HP tank */
+               fmt = "HP%d";
+               break;
+       case 3700 ... 3850:     /* HP+10% */
+               fmt = "HP%d+";
+               break;
+       default:
+               return;
+       }
+       len = snprintf(buffer, sizeof(buffer), fmt, cuft);
+       p = malloc(len+1);
+       if (!p)
+               return;
+       memcpy(p, buffer, len+1);
+       type->description = p;
+}
+
+
 /*
  * There are two ways to give cylinder size information:
  *  - total amount of gas in cuft (depends on working pressure and physical size)
@@ -720,20 +765,24 @@ static void sanitize_gasmix(gasmix_t *mix)
  */
 static void sanitize_cylinder_type(cylinder_type_t *type)
 {
+       double volume_of_air, atm, volume;
+
        /* If we have no working pressure, it had *better* be just a physical size! */
        if (!type->workingpressure.mbar)
                return;
 
-       /*
-        * 35l tanks? Do they exist?
-        * Assume this is a "size in cuft" thing.
-        */
-       if (type->size.mliter > 35000) {
-               double volume_of_air = type->size.mliter * 28.317;      /* cu ft to milliliter */
-               double atm = type->workingpressure.mbar / 1013.25;      /* working pressure in atm */
-               double volume = volume_of_air / atm;                    /* milliliters at 1 atm: "true size" */
-               type->size.mliter = volume;
-       }
+       /* No size either? Nothing to go on */
+       if (!type->size.mliter)
+               return;
+
+       /* Ok, we have both size and pressure: try to match a description */
+       match_standard_cylinder(type);
+
+       /* .. and let's assume that the 'size' was cu ft of air */
+       volume_of_air = type->size.mliter * 28.317;     /* milli-cu ft to milliliter */
+       atm = type->workingpressure.mbar / 1013.25;     /* working pressure in atm */
+       volume = volume_of_air / atm;                   /* milliliters at 1 atm: "true size" */
+       type->size.mliter = volume + 0.5;
 }
 
 static void sanitize_cylinder_info(struct dive *dive)

diff --git a/save-xml.c b/save-xml.c
index c33cbb0ddaae0def1daac898109efa5c595531f6..46bcec0a18b3bbbe13b08c6f2ecc96f93ab95db7 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -127,6 +127,7 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
        for (i = 0; i < MAX_CYLINDERS; i++) {
                cylinder_t *cylinder = dive->cylinder+i;
                int volume = cylinder->type.size.mliter;
+               const char *description = cylinder->type.description;
                int o2 = cylinder->gasmix.o2.permille;
                int he = cylinder->gasmix.he.permille;
 
@@ -141,6 +142,8 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
                }
                if (volume)
                        fprintf(f, " size='%u.%03u l'", FRACTION(volume, 1000));
+               if (description)
+                       fprintf(f, " name='%s'", description);
                fprintf(f, " />\n");
        }
 }