X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=40fc5ca2c3668b5fada1924fb9ddb0fd41224324;hb=c15f798a85db53dae404a9113266a4d2bc72fbc6;hp=9cdfd61b0b77b290d6041e1187378b1284f6f918;hpb=a817f4b547b4193d31154fd0ff7f5190ccae76a5;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 9cdfd61..40fc5ca 100644
--- a/dive.h
+++ b/dive.h
@@ -86,6 +86,8 @@ typedef struct {
 	pressure_t start, end;
 } cylinder_t;
 
+extern double get_depth_units(unsigned int mm, int *frac, const char **units);
+
 static inline double mm_to_feet(int mm)
 {
 	return mm * 0.00328084;
@@ -132,6 +134,11 @@ static inline int to_PSI(pressure_t pressure)
 	return pressure.mbar * 0.0145037738 + 0.5;
 }
 
+static inline double to_ATM(pressure_t pressure)
+{
+	return pressure.mbar / 1013.25;
+}
+
 struct sample {
 	duration_t time;
 	depth_t depth;
@@ -140,6 +147,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 +176,8 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
+	int otu;
+	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];
 };
@@ -225,6 +249,8 @@ extern struct dive *try_to_merge(struct dive *a, struct dive *b);
 
 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 argc, char **argv);
@@ -236,8 +262,6 @@ extern void report_error(GError* error);
 extern void dive_list_update_dives(void);
 extern void flush_divelist(struct dive *dive);
 
-extern int open_import_file_dialog(char *filterpattern, char *filtertext, 
-				void(* parse_function)(char *));
 #define DIVE_ERROR_PARSE 1
 
 const char *weekday(int wday);