Add 'mean depth' marker on dive plot

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index a8e3c319afd58cbc9011d910f17a409997d9f707..e54d3a8624361e7cb9a1085a35c576cf62bf3536 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -1,6 +1,9 @@
 #ifndef DIVE_H
 #define DIVE_H
 
+#include <stdlib.h>
+#include <time.h>
+
 /*
  * Some silly typedefs to make our units very explicit.
  *
@@ -66,8 +69,7 @@ typedef struct {
 
 typedef struct {
        fraction_t o2;
-       fraction_t n2;
-       fraction_t he2;
+       fraction_t he;
 } gasmix_t;
 
 typedef struct {
@@ -100,14 +102,19 @@ struct sample {
        int tankindex;
 };
 
+#define MAX_MIXES (4)
+
 struct dive {
        const char *name;
        time_t when;
+       char *location;
+       char *notes;
        depth_t maxdepth, meandepth;
        duration_t duration, surfacetime;
        depth_t visibility;
        temperature_t airtemp, watertemp;
        pressure_t beginning_pressure, end_pressure;
+       gasmix_t gasmix[MAX_MIXES];
        int samples;
        struct sample sample[];
 };
@@ -121,7 +128,25 @@ struct dive_table {
 
 extern struct dive_table dive_table;
 
+static inline struct dive *get_dive(unsigned int nr)
+{
+       if (nr >= dive_table.nr)
+               return NULL;
+       return dive_table.dives[nr];
+}
+
 extern void parse_xml_init(void);
 extern void parse_xml_file(const char *filename);
 
+extern void flush_dive_info_changes(void);
+extern void save_dives(const char *filename);
+
+static inline unsigned int dive_size(int samples)
+{
+       return sizeof(struct dive) + samples*sizeof(struct sample);
+}
+
+extern struct dive *fixup_dive(struct dive *dive);
+extern struct dive *try_to_merge(struct dive *a, struct dive *b);
+
 #endif /* DIVE_H */