X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=0116a1cf78a3d07ac4da2ccbe725de15f7e35d9e;hb=47a0e0e4be9b6074ca81e9e22191a0916d6f7c26;hp=109d0c57da1a984e59aa03dd0792c3f6ac258276;hpb=3a6c1f767d527c2247eefb264f68adf3f3770608;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 109d0c5..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,9 +84,24 @@ 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)
 {
 	return mm * 0.00328084;
@@ -127,11 +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;
@@ -140,6 +176,21 @@ struct sample {
 	int cylinderindex;
 };
 
+/*
+ * Events are currently pretty meaningless. This is
+ * just based on the random data that libdivecomputer
+ * gives us. I'm not sure what a real "architected"
+ * event model would actually look like, but right
+ * now you can associate a list of events with a dive,
+ * and we'll do something about it.
+ */
+struct event {
+	struct event *next;
+	duration_t time;
+	int type, flags, value;
+	char name[];
+};
+
 #define MAX_CYLINDERS (8)
 
 struct dive {
@@ -154,6 +205,8 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
+	int sac, otu;
+	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];
 };
@@ -163,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;
@@ -177,7 +234,7 @@ extern struct units input_units, output_units;
 extern int verbose;
 
 struct dive_table {
-	int nr, allocated;
+	int nr, allocated, preexisting;
 	struct dive **dives;
 };
 
@@ -195,6 +252,11 @@ static inline struct dive *get_dive(unsigned int nr)
 
 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 *);
@@ -202,6 +264,8 @@ 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);
 
@@ -218,15 +282,37 @@ extern void record_dive(struct dive *dive);
 extern struct sample *prepare_sample(struct dive **divep);
 extern void finish_sample(struct dive *dive, struct sample *sample);
 
-extern void report_dives(void);
+extern void report_dives(gboolean imported);
 extern struct dive *fixup_dive(struct dive *dive);
 extern struct dive *try_to_merge(struct dive *a, struct dive *b);
 
-extern void update_air_info(char *buffer);
+extern void renumber_dives(int nr);
+
+extern void add_event(struct dive *dive, int time, int type, int flags, int value, const char *name);
+
+/* UI related protopypes */
+
+extern void init_ui(int *argcp, char ***argvp);
+
+extern void run_ui(void);
+
+extern void report_error(GError* error);
+
+extern void add_cylinder_description(cylinder_type_t *);
+extern void add_people(const char *string);
+extern void add_location(const char *string);
+extern void remember_event(const char *eventname);
+extern void evn_foreach(void (*callback)(const char *, int *, void *), void *data);
+
+extern void dive_list_update_dives(void);
+extern void flush_divelist(struct dive *dive);
 
 #define DIVE_ERROR_PARSE 1
 
 const char *weekday(int wday);
 const char *monthname(int mon);
 
+#define UTF8_DEGREE "\xc2\xb0"
+#define UTF8_SUBSCRIPT_2 "\xe2\x82\x82"
+
 #endif /* DIVE_H */