equipment: clean up cylinder pressure spinbutton setup

[ext/subsurface.git] / equipment.c

diff --git a/equipment.c b/equipment.c
index 12f39ae3f7c8bedab61ca1a91fa47c2c080f9a4e..c2d05d2ba4d2304595acd175d487a8a913e999d0 100644 (file)
--- a/equipment.c
+++ b/equipment.c
@@ -49,18 +49,19 @@ struct cylinder_widget {
        GtkWidget *o2, *gasmix_button;
 };
 
+/* we want bar - so let's not use our unit functions */
 static int convert_pressure(int mbar, double *p)
 {
        int decimals = 1;
        double pressure;
 
-       pressure = mbar / 1000.0;
-       if (mbar) {
-               if (output_units.pressure == PSI) {
-                       pressure *= 14.5037738; /* Bar to PSI */
-                       decimals = 0;
-               }
+       if (output_units.pressure == PSI) {
+               pressure = mbar_to_PSI(mbar);
+               decimals = 0;
+       } else {
+               pressure = mbar / 1000.0;
        }
+
        *p = pressure;
        return decimals;
 }
@@ -71,16 +72,17 @@ static int convert_volume_pressure(int ml, int mbar, double *v, double *p)
        double volume, pressure;
 
        volume = ml / 1000.0;
-       pressure = mbar / 1000.0;
        if (mbar) {
                if (output_units.volume == CUFT) {
-                       volume /= 28.3168466;   /* Liters to cuft */
-                       volume *= pressure / 1.01325;
+                       volume = ml_to_cuft(ml);
+                       volume *= bar_to_atm(mbar / 1000.0);
                }
+
                if (output_units.pressure == PSI) {
-                       pressure *= 14.5037738; /* Bar to PSI */
+                       pressure = mbar_to_PSI(mbar);
                        decimals = 0;
-               }
+               } else
+                       pressure = mbar / 1000.0;
        }
        *v = volume;
        *p = pressure;
@@ -96,13 +98,13 @@ static void set_cylinder_type_spinbuttons(struct cylinder_widget *cylinder, int
        gtk_spin_button_set_value(cylinder->pressure, pressure);
 }
 
-static void set_cylinder_pressure_spinbuttons(struct cylinder_widget *cylinder, int start, int end)
+static void set_cylinder_pressure_spinbuttons(struct cylinder_widget *cylinder, cylinder_t *cyl)
 {
        double pressure;
 
-       convert_pressure(start, &pressure);
+       convert_pressure(cyl->start.mbar, &pressure);
        gtk_spin_button_set_value(cylinder->start, pressure);
-       convert_pressure(end, &pressure);
+       convert_pressure(cyl->end.mbar, &pressure);
        gtk_spin_button_set_value(cylinder->end, pressure);
 }
 
@@ -264,8 +266,7 @@ static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder)
 
        set_cylinder_type_spinbuttons(cylinder,
                cyl->type.size.mliter, cyl->type.workingpressure.mbar);
-       set_cylinder_pressure_spinbuttons(cylinder,
-               cyl->start.mbar, cyl->end.mbar);
+       set_cylinder_pressure_spinbuttons(cylinder, cyl);
        o2 = cyl->gasmix.o2.permille / 10.0;
        gtk_widget_set_sensitive(cylinder->o2, !!o2);
        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button), !!o2);
@@ -281,18 +282,24 @@ static int cyl_nothing(cylinder_t *cyl)
                !cyl->type.description &&
                !cyl->gasmix.o2.permille &&
                !cyl->gasmix.he.permille &&
+               !cyl->sample_start.mbar &&
+               !cyl->sample_end.mbar &&
                !cyl->start.mbar &&
                !cyl->end.mbar;
 }
 
 static void set_one_cylinder(int index, cylinder_t *cyl, GtkListStore *model, GtkTreeIter *iter)
 {
+       unsigned int start, end;
+
+       start = cyl->start.mbar ? : cyl->sample_start.mbar;
+       end = cyl->end.mbar ? : cyl->sample_end.mbar;
        gtk_list_store_set(model, iter,
                CYL_DESC, cyl->type.description ? : "",
                CYL_SIZE, cyl->type.size.mliter,
                CYL_WORKP, cyl->type.workingpressure.mbar,
-               CYL_STARTP, cyl->start.mbar,
-               CYL_ENDP, cyl->end.mbar,
+               CYL_STARTP, start,
+               CYL_ENDP, end,
                CYL_O2, cyl->gasmix.o2.permille,
                CYL_HE, cyl->gasmix.he.permille,
                -1);
@@ -352,14 +359,14 @@ static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl
        int mbar, ml;
 
        if (output_units.pressure == PSI) {
-               pressure /= 14.5037738;
-               start /= 14.5037738;
-               end /= 14.5037738;
+               pressure = psi_to_bar(pressure);
+               start = psi_to_bar(start);
+               end = psi_to_bar(end);
        }
 
        if (pressure && output_units.volume == CUFT) {
-               volume *= 28.3168466;   /* CUFT to liter */
-               volume /= pressure / 1.01325;
+               volume = cuft_to_l(volume);
+               volume /= bar_to_atm(pressure);
        }
 
        ml = volume * 1000 + 0.5;
@@ -461,9 +468,9 @@ static void fill_tank_list(GtkListStore *store)
 
                /* Is it in cuft and psi? */
                if (psi) {
-                       double bar = 0.0689475729 * psi;
-                       double airvolume = 28316.8466 * size;
-                       double atm = bar / 1.01325;
+                       double bar = psi_to_bar(psi);
+                       double airvolume = cuft_to_l(size) * 1000.0;
+                       double atm = bar_to_atm(bar);
 
                        ml = airvolume / atm + 0.5;
                        mbar = bar*1000 + 0.5;