Stop relying on gtk to track which dives are selected

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index 39f203738833519c594c50032146d13f867c49a2..de95d5e6614c0d0b05ef77700454b6474de29dce 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -125,21 +125,31 @@ static inline double mm_to_feet(int mm)
        return mm * 0.00328084;
 }
 
+static inline unsigned long feet_to_mm(double feet)
+{
+       return feet * 304.8 + 0.5;
+}
+
 static inline int to_feet(depth_t depth)
 {
        return mm_to_feet(depth.mm) + 0.5;
 }
 
-static double mkelvin_to_C(int mkelvin)
+static inline double mkelvin_to_C(int mkelvin)
 {
        return (mkelvin - 273150) / 1000.0;
 }
 
-static double mkelvin_to_F(int mkelvin)
+static inline double mkelvin_to_F(int mkelvin)
 {
        return mkelvin * 9 / 5000.0 - 459.670;
 }
 
+static inline unsigned long F_to_mkelvin(double f)
+{
+       return (f-32) * 1000 / 1.8 + 273150.5;
+}
+
 static inline int to_C(temperature_t temp)
 {
        if (!temp.mkelvin)
@@ -165,6 +175,12 @@ static inline double psi_to_bar(double psi)
 {
        return psi / 14.5037738;
 }
+
+static inline unsigned long psi_to_mbar(double psi)
+{
+       return psi_to_bar(psi)*1000 + 0.5;
+}
+
 static inline int to_PSI(pressure_t pressure)
 {
        return pressure.mbar * 0.0145037738 + 0.5;
@@ -211,6 +227,8 @@ struct event {
 
 #define MAX_CYLINDERS (8)
 #define MAX_WEIGHTSYSTEMS (4)
+#define W_IDX_PRIMARY 0
+#define W_IDX_SECONDARY 1
 
 struct dive {
        int number;
@@ -266,7 +284,7 @@ extern int selected_dive;
 
 static inline struct dive *get_dive(unsigned int nr)
 {
-       if (nr >= dive_table.nr)
+       if (nr >= dive_table.nr || nr < 0)
                return NULL;
        return dive_table.dives[nr];
 }
@@ -283,7 +301,7 @@ extern xmlDoc *test_xslt_transforms(xmlDoc *doc);
 
 extern void show_dive_info(struct dive *);
 
-extern void show_dive_equipment(struct dive *);
+extern void show_dive_equipment(struct dive *, int w_idx);
 
 extern void show_dive_stats(struct dive *);
 
@@ -299,6 +317,7 @@ extern time_t utc_mktime(struct tm *tm);
 
 extern struct dive *alloc_dive(void);
 extern void record_dive(struct dive *dive);
+extern void delete_dive(struct dive *dive);
 
 extern struct sample *prepare_sample(struct dive **divep);
 extern void finish_sample(struct dive *dive);
@@ -316,6 +335,7 @@ extern void add_event(struct dive *dive, int time, int type, int flags, int valu
 extern void init_ui(int *argcp, char ***argvp);
 
 extern void run_ui(void);
+extern void exit_ui(void);
 
 extern void report_error(GError* error);
 
@@ -325,7 +345,9 @@ extern void add_location(const char *string);
 extern void remember_event(const char *eventname);
 extern void evn_foreach(void (*callback)(const char *, int *, void *), void *data);
 
+extern int add_new_dive(struct dive *dive);
 extern int edit_dive_info(struct dive *dive);
+extern int edit_multi_dive_info(int nr, int *indices);
 extern void dive_list_update_dives(void);
 extern void flush_divelist(struct dive *dive);