X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=0116a1cf78a3d07ac4da2ccbe725de15f7e35d9e;hb=47a0e0e4be9b6074ca81e9e22191a0916d6f7c26;hp=783d640a08c4d8e298ecb5e3f349f58837acf859;hpb=56980579514f2900e43441b483e435b3e3235266;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 783d640..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,7 +84,7 @@ 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);
@@ -91,17 +92,12 @@ 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 bar_to_atm(double bar)
-{
-	return bar / 1.01325;
-}
-
 static inline double ml_to_cuft(int ml)
 {
 	return ml / 28316.8466;
 }
 
-static inline double cuft_to_ml(double cuft)
+static inline double cuft_to_l(double cuft)
 {
 	return cuft * 28.3168466;
 }
@@ -156,6 +152,11 @@ 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;
@@ -253,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);
 
@@ -285,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);