X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=d96e0102d443fd91f5b62c8348d9f2cb70ed20af;hb=a9f74044ae228f912515bebc983f872aa7f37695;hp=82b336e5356cadaaf447060ec1d7c51d756e3956;hpb=c24fd4b82cf4476c6d9c863ee03f2d729b64e5f0;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index 82b336e..d96e010 100644
--- a/dive.h
+++ b/dive.h
@@ -69,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;
@@ -82,7 +82,7 @@ typedef struct {
 
 typedef struct {
 	cylinder_type_t type;
-	gasmix_t gasmix;
+	struct gasmix gasmix;
 	pressure_t start, end;
 } cylinder_t;
 
@@ -95,7 +95,21 @@ static inline int to_C(temperature_t temp)
 {
 	if (!temp.mkelvin)
 		return 0;
-	return (temp.mkelvin - 273150) / 1000;
+	return (temp.mkelvin - 273150 + 499) / 1000;
+}
+
+static inline int to_F(temperature_t temp)
+{
+	if (!temp.mkelvin)
+		return 0;
+	return temp.mkelvin * 9 / 5000.0 - 459.670 + 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)
@@ -114,6 +128,7 @@ struct sample {
 #define MAX_CYLINDERS (8)
 
 struct dive {
+	int number;
 	time_t when;
 	char *location;
 	char *notes;
@@ -126,6 +141,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 {
@@ -135,6 +166,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)
@@ -145,7 +179,13 @@ static inline struct dive *get_dive(unsigned int nr)
 extern void parse_xml_init(void);
 extern void parse_xml_file(const char *filename, GError **error);
 
-extern void flush_dive_info_changes(void);
+extern void show_dive_info(struct dive *);
+extern void flush_dive_info_changes(struct dive *);
+
+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)