X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=97654dc5279fbf1ee9d044c9dddba9dae845b789;hb=18b8247cb357a9a716846854e451e306b752e542;hp=1766cff8203ef2cb38a465f6f90aa403709b97d8;hpb=a93641b7222e767d6a3a1be598cd8099d8517059;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 1766cff..97654dc 100644
--- a/dive.h
+++ b/dive.h
@@ -87,6 +87,7 @@ typedef struct {
 } cylinder_t;
 
 extern double get_depth_units(unsigned int mm, int *frac, const char **units);
+extern double get_temp_units(unsigned int mm, const char **units);
 
 static inline double mm_to_feet(int mm)
 {
@@ -147,6 +148,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 {
@@ -161,7 +177,8 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
-	double otu;
+	int otu;
+	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];
 };
@@ -171,6 +188,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;
@@ -185,7 +206,7 @@ extern struct units input_units, output_units;
 extern int verbose;
 
 struct dive_table {
-	int nr, allocated;
+	int nr, allocated, preexisting;
 	struct dive **dives;
 };
 
@@ -227,12 +248,14 @@ 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 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);
@@ -241,11 +264,15 @@ 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);
 
-extern int open_import_file_dialog(char *filterpattern, char *filtertext, 
-				void(* parse_function)(char *));
 #define DIVE_ERROR_PARSE 1
 
 const char *weekday(int wday);