Divide the panes evenly in view_three

[ext/subsurface.git] / dive.h

diff --git a/dive.h b/dive.h
index befa0cdcf3b50e13c95a6fe017979fad23442f91..a25fafb39e95cc4b0eee571f94b195165b2200f4 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -87,13 +87,29 @@ typedef struct {
        pressure_t start, end, sample_start, sample_end;
 } cylinder_t;
 
-extern int cylinder_none(cylinder_t *cyl);
+typedef struct {
+       weight_t weight;
+       const char *description;        /* "integrated", "belt", "ankle" */
+} weightsystem_t;
+
+extern int cylinder_none(void *_data);
+extern int weightsystem_none(void *_data);
 
 extern int get_pressure_units(unsigned int mb, const char **units);
 extern double get_depth_units(unsigned int mm, int *frac, const char **units);
 extern double get_volume_units(unsigned int mm, int *frac, const char **units);
 extern double get_temp_units(unsigned int mm, const char **units);
 
+static inline double grams_to_lbs(int grams)
+{
+       return grams / 453.6;
+}
+
+static inline int lbs_to_grams(double lbs)
+{
+       return lbs * 453.6 + 0.5;
+}
+
 static inline double ml_to_cuft(int ml)
 {
        return ml / 28316.8466;
@@ -109,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)
@@ -149,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;
@@ -194,6 +226,7 @@ struct event {
 };
 
 #define MAX_CYLINDERS (8)
+#define MAX_WEIGHTSYSTEMS (4)
 
 struct dive {
        int number;
@@ -208,6 +241,7 @@ struct dive {
        depth_t visibility;
        temperature_t airtemp, watertemp;
        cylinder_t cylinder[MAX_CYLINDERS];
+       weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS];
        int sac, otu;
        struct event *events;
        int samples, alloc_samples;
@@ -281,6 +315,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);
@@ -298,6 +333,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);
 
@@ -307,6 +343,7 @@ 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 void dive_list_update_dives(void);
 extern void flush_divelist(struct dive *dive);