Start "output unit management" support

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index 65337303a05d893e7e894ac764ff46a444c0ab61..ea8fceec1863dc41479d448912998f9a4156a642 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -4,6 +4,8 @@
 #include <stdlib.h>
 #include <time.h>
 
+#include <glib.h>
+
 /*
  * Some silly typedefs to make our units very explicit.
  *
@@ -124,6 +126,22 @@ struct dive {
        struct sample sample[];
 };
 
+/*
+ * We keep our internal data in well-specified units, but
+ * the input and output may come in some random format. This
+ * keeps track of those units.
+ */
+struct units {
+       enum { METERS, FEET } length;
+       enum { LITER, CUFT } volume;
+       enum { BAR, PSI, PASCAL } pressure;
+       enum { CELSIUS, FAHRENHEIT, KELVIN } temperature;
+       enum { KG, LBS } weight;
+};
+
+extern const struct units SI_units, IMPERIAL_units;
+extern struct units input_units, output_units;
+
 extern int verbose;
 
 struct dive_table {
@@ -141,7 +159,7 @@ static inline struct dive *get_dive(unsigned int nr)
 }
 
 extern void parse_xml_init(void);
-extern void parse_xml_file(const char *filename);
+extern void parse_xml_file(const char *filename, GError **error);
 
 extern void flush_dive_info_changes(void);
 extern void save_dives(const char *filename);
@@ -154,4 +172,6 @@ static inline unsigned int dive_size(int samples)
 extern struct dive *fixup_dive(struct dive *dive);
 extern struct dive *try_to_merge(struct dive *a, struct dive *b);
 
+#define DIVE_ERROR_PARSE 1
+
 #endif /* DIVE_H */