X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=6b5c7781693c613024f92eb7877c10ae0296f37d;hb=80b0c097334a13f9fd69ed87eceb3997a1084311;hp=89f790122fa4d4312a2aca694ab1c75ef2b5b5e7;hpb=1cbe2444cc6c0c8da9e730561914986506d83770;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 89f7901..6b5c778 100644
--- a/dive.h
+++ b/dive.h
@@ -125,21 +125,31 @@ static inline double mm_to_feet(int mm)
 	return mm * 0.00328084;
 }
 
+static inline unsigned long feet_to_mm(double feet)
+{
+	return feet * 304.8 + 0.5;
+}
+
 static inline int to_feet(depth_t depth)
 {
 	return mm_to_feet(depth.mm) + 0.5;
 }
 
-static double mkelvin_to_C(int mkelvin)
+static inline double mkelvin_to_C(int mkelvin)
 {
 	return (mkelvin - 273150) / 1000.0;
 }
 
-static double mkelvin_to_F(int mkelvin)
+static inline double mkelvin_to_F(int mkelvin)
 {
 	return mkelvin * 9 / 5000.0 - 459.670;
 }
 
+static inline unsigned long F_to_mkelvin(double f)
+{
+	return (f-32) * 1000 / 1.8 + 273150.5;
+}
+
 static inline int to_C(temperature_t temp)
 {
 	if (!temp.mkelvin)
@@ -165,6 +175,12 @@ static inline double psi_to_bar(double psi)
 {
 	return psi / 14.5037738;
 }
+
+static inline unsigned long psi_to_mbar(double psi)
+{
+	return psi_to_bar(psi)*1000 + 0.5;
+}
+
 static inline int to_PSI(pressure_t pressure)
 {
 	return pressure.mbar * 0.0145037738 + 0.5;
@@ -317,6 +333,7 @@ extern void add_event(struct dive *dive, int time, int type, int flags, int valu
 extern void init_ui(int *argcp, char ***argvp);
 
 extern void run_ui(void);
+extern void exit_ui(void);
 
 extern void report_error(GError* error);