X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=bbc5c67ae36413fead1c033f136e7685aa001d6c;hb=e9d28901341d4cefb4c80a98239daaf81fb3d941;hp=1386a3bf8d8b7a999e08bcf4fcb6b99faeae47e5;hpb=6b075e0339f419555f08ece3a6c4a29407ecc32b;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 1386a3b..bbc5c67 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.
  *
@@ -67,10 +69,10 @@ typedef struct {
 	int grams;
 } weight_t;
 
-typedef struct {
+struct gasmix {
 	fraction_t o2;
 	fraction_t he;
-} gasmix_t;
+};
 
 typedef struct {
 	volume_t size;
@@ -80,7 +82,8 @@ typedef struct {
 
 typedef struct {
 	cylinder_type_t type;
-	gasmix_t gasmix;
+	struct gasmix gasmix;
+	pressure_t start, end;
 } cylinder_t;
 
 static inline int to_feet(depth_t depth)
@@ -88,11 +91,35 @@ static inline int to_feet(depth_t depth)
 	return depth.mm * 0.00328084 + 0.5;
 }
 
+static double mkelvin_to_C(int mkelvin)
+{
+	return (mkelvin - 273150) / 1000.0;
+}
+
+static double mkelvin_to_F(int mkelvin)
+{
+	return mkelvin * 9 / 5000.0 - 459.670;
+}
+
 static inline int to_C(temperature_t temp)
 {
 	if (!temp.mkelvin)
 		return 0;
-	return (temp.mkelvin - 273150) / 1000;
+	return mkelvin_to_C(temp.mkelvin) + 0.5;
+}
+
+static inline int to_F(temperature_t temp)
+{
+	if (!temp.mkelvin)
+		return 0;
+	return mkelvin_to_F(temp.mkelvin) + 0.5;
+}
+
+static inline int to_K(temperature_t temp)
+{
+	if (!temp.mkelvin)
+		return 0;
+	return (temp.mkelvin + 499)/1000;
 }
 
 static inline int to_PSI(pressure_t pressure)
@@ -108,22 +135,40 @@ struct sample {
 	int cylinderindex;
 };
 
-#define MAX_CYLINDERS (4)
+#define MAX_CYLINDERS (8)
 
 struct dive {
+	int number;
 	time_t when;
 	char *location;
 	char *notes;
+	char *divemaster, *buddy;
+	double latitude, longitude;
 	depth_t maxdepth, meandepth;
 	duration_t duration, surfacetime;
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
-	pressure_t beginning_pressure, end_pressure;
 	cylinder_t cylinder[MAX_CYLINDERS];
-	int samples;
+	int samples, alloc_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 {
@@ -133,6 +178,9 @@ struct dive_table {
 
 extern struct dive_table dive_table;
 
+extern int selected_dive;
+#define current_dive (get_dive(selected_dive))
+
 static inline struct dive *get_dive(unsigned int nr)
 {
 	if (nr >= dive_table.nr)
@@ -141,9 +189,15 @@ 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 show_dive_info(struct dive *);
+extern void flush_dive_info_changes(struct dive *);
 
-extern void flush_dive_info_changes(void);
+extern void show_dive_equipment(struct dive *);
+extern void flush_dive_equipment_changes(struct dive *);
+
+extern void update_dive(struct dive *new_dive);
 extern void save_dives(const char *filename);
 
 static inline unsigned int dive_size(int samples)
@@ -151,7 +205,20 @@ static inline unsigned int dive_size(int samples)
 	return sizeof(struct dive) + samples*sizeof(struct sample);
 }
 
+extern time_t utc_mktime(struct tm *tm);
+
+extern struct dive *alloc_dive(void);
+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 struct dive *fixup_dive(struct dive *dive);
 extern struct dive *try_to_merge(struct dive *a, struct dive *b);
 
+extern void update_air_info(char *buffer);
+
+#define DIVE_ERROR_PARSE 1
+
 #endif /* DIVE_H */