X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=ea8fceec1863dc41479d448912998f9a4156a642;hb=05857e0a05bc15672ddd5e835714d2cd20405b97;hp=e54d3a8624361e7cb9a1085a35c576cf62bf3536;hpb=1e75ceac0dbbf6a6eef1e13f076c3ae6a7af4c55;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index e54d3a8..ea8fcee 100644
--- 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.
  *
@@ -14,7 +16,7 @@
  *
  * We also strive to make '0' a meaningless number saying "not
  * initialized", since many values are things that may not have
- * been reported (eg tank pressure or temperature from dive
+ * been reported (eg cylinder pressure or temperature from dive
  * computers that don't support them). But sometimes -1 is an even
  * more explicit way of saying "not there".
  *
@@ -22,7 +24,7 @@
  * temperatures. Doing temperatures in celsius or fahrenheit would
  * make for loss of precision when converting from one to the other,
  * and using millikelvin is SI-like but also means that a temperature
- * of '0' is clearly just a missing temperature or tank pressure.
+ * of '0' is clearly just a missing temperature or cylinder pressure.
  *
  * Also strive to use units that can not possibly be mistaken for a
  * valid value in a "normal" system without conversion. If the max
@@ -74,8 +76,15 @@ typedef struct {
 
 typedef struct {
 	volume_t size;
-	pressure_t pressure;
-} tank_type_t;
+	pressure_t workingpressure;
+	const char *description;	/* "LP85", "AL72", "AL80", "HP100+" or whatever */
+} cylinder_type_t;
+
+typedef struct {
+	cylinder_type_t type;
+	gasmix_t gasmix;
+	pressure_t start, end;
+} cylinder_t;
 
 static inline int to_feet(depth_t depth)
 {
@@ -98,14 +107,13 @@ struct sample {
 	duration_t time;
 	depth_t depth;
 	temperature_t temperature;
-	pressure_t tankpressure;
-	int tankindex;
+	pressure_t cylinderpressure;
+	int cylinderindex;
 };
 
-#define MAX_MIXES (4)
+#define MAX_CYLINDERS (8)
 
 struct dive {
-	const char *name;
 	time_t when;
 	char *location;
 	char *notes;
@@ -113,12 +121,27 @@ struct dive {
 	duration_t duration, surfacetime;
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
-	pressure_t beginning_pressure, end_pressure;
-	gasmix_t gasmix[MAX_MIXES];
+	cylinder_t cylinder[MAX_CYLINDERS];
 	int samples;
 	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 {
@@ -136,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);
@@ -149,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 */