X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=0116a1cf78a3d07ac4da2ccbe725de15f7e35d9e;hb=4891fa812f04da1f46075433d28fa0f33145e125;hp=92d358d0257de2524a7ed5ffe444b3455426e0ed;hpb=98efa0794aa12eea203216e6f5e7e0bdd336d488;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 92d358d..0116a1c 100644
--- a/dive.h
+++ b/dive.h
@@ -5,6 +5,7 @@
 #include <time.h>
 
 #include <glib.h>
+#include <libxml/tree.h>
 
 /*
  * Some silly typedefs to make our units very explicit.
@@ -83,10 +84,23 @@ typedef struct {
 typedef struct {
 	cylinder_type_t type;
 	struct gasmix gasmix;
-	pressure_t start, end;
+	pressure_t start, end, sample_start, sample_end;
 } cylinder_t;
 
+extern int get_pressure_units(unsigned int mb, const char **units);
 extern double get_depth_units(unsigned int mm, int *frac, const char **units);
+extern double get_volume_units(unsigned int mm, int *frac, const char **units);
+extern double get_temp_units(unsigned int mm, const char **units);
+
+static inline double ml_to_cuft(int ml)
+{
+	return ml / 28316.8466;
+}
+
+static inline double cuft_to_l(double cuft)
+{
+	return cuft * 28.3168466;
+}
 
 static inline double mm_to_feet(int mm)
 {
@@ -129,16 +143,31 @@ static inline int to_K(temperature_t temp)
 	return (temp.mkelvin + 499)/1000;
 }
 
+static inline double psi_to_bar(double psi)
+{
+	return psi / 14.5037738;
+}
 static inline int to_PSI(pressure_t pressure)
 {
 	return pressure.mbar * 0.0145037738 + 0.5;
 }
 
+static inline double bar_to_atm(double bar)
+{
+	return bar / 1.01325;
+}
+
 static inline double to_ATM(pressure_t pressure)
 {
 	return pressure.mbar / 1013.25;
 }
 
+static inline int mbar_to_PSI(int mbar)
+{
+	pressure_t p = {mbar};
+	return to_PSI(p);
+}
+
 struct sample {
 	duration_t time;
 	depth_t depth;
@@ -176,7 +205,7 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
-	int otu;
+	int sac, otu;
 	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];
@@ -187,6 +216,10 @@ struct dive {
  * the input and output may come in some random format. This
  * keeps track of those units.
  */
+/* turns out in Win32 PASCAL is defined as a calling convention */
+#ifdef WIN32
+#undef PASCAL
+#endif
 struct units {
 	enum { METERS, FEET } length;
 	enum { LITER, CUFT } volume;
@@ -221,12 +254,18 @@ extern void parse_xml_init(void);
 extern void parse_xml_file(const char *filename, GError **error);
 extern void set_filename(const char *filename);
 
+#ifdef XSLT
+extern xmlDoc *test_xslt_transforms(xmlDoc *doc);
+#endif
+
 extern void show_dive_info(struct dive *);
 extern void flush_dive_info_changes(struct dive *);
 
 extern void show_dive_equipment(struct dive *);
 extern void flush_dive_equipment_changes(struct dive *);
 
+extern void show_dive_stats(struct dive *);
+
 extern void update_dive(struct dive *new_dive);
 extern void save_dives(const char *filename);
 
@@ -253,7 +292,7 @@ extern void add_event(struct dive *dive, int time, int type, int flags, int valu
 
 /* UI related protopypes */
 
-extern void init_ui(int argc, char **argv);
+extern void init_ui(int *argcp, char ***argvp);
 
 extern void run_ui(void);