Get the math right for cylinder model setData function

This is a fun one.

We only want to mark the divelist changed if the user actually changed
something. So we try really hard to compare what was entered with what was
there and only if it is different do we overwrite existing values and
record this as a change to the divelist.

An additional challenge here is the fact that the user needs to enter a
working pressure before they can enter a size (when in cuft mode). That is
not really intuitive. We work around this by assuming working pressure is
3000psi if a size is given in cuft - but then if the user changes the
working pressure, that changes the volume. Now going back and changing the
volume again does the trick. Or enter the working pressure FIRST and then
the volume...

This also changes the incorrect MAXPRESSURE to WORKINGPRESSURE and uses
the text WorkPress in English (Gtk code used MaxPress which was simply
wrong - this is just the design pressure or working pressure, not some
hard maximum. In fact, people quite commonly "overfill" these tanks.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 2 insertions, 1 deletions

diff --git a/dive.h b/dive.h
index 968804581..a1febdd16 100644
--- a/dive.h
+++ b/dive.h
@@ -221,7 +221,7 @@ static inline double psi_to_bar(double psi)
 	return psi / 14.5037738;
 }
 
-static inline unsigned long psi_to_mbar(double psi)
+static inline long psi_to_mbar(double psi)
 {
 	return psi_to_bar(psi)*1000 + 0.5;
 }
@@ -238,6 +238,7 @@ static inline double bar_to_atm(double bar)
 
 /* Volume in mliter of a cylinder at pressure 'p' */
 extern int gas_volume(cylinder_t *cyl, pressure_t p);
+extern int wet_volume(double cuft, pressure_t p);
 
 static inline int mbar_to_PSI(int mbar)
 {