Automatically renumber new dives when they are "obvious".

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index b121892e9296de5e8e2844124123fa0d728db9ea..5b7f4658b90c4a7002f0888ee954b741fe43590c 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -134,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;
@@ -171,6 +176,7 @@ 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[];
@@ -195,7 +201,7 @@ extern struct units input_units, output_units;
 extern int verbose;
 
 struct dive_table {
-       int nr, allocated;
+       int nr, allocated, preexisting;
        struct dive **dives;
 };
 
@@ -256,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);