]> git.tdb.fi Git - ext/subsurface.git/blobdiff - equipment.c
Start re-organizing the cylinder entry in equipment.c
[ext/subsurface.git] / equipment.c
index bab0d5335137f0a00bd2c8a2dd5bdbd3f14d437e..ca8c99651efbfb8f62a9f1fe9cf00248c85b5ebf 100644 (file)
@@ -1,3 +1,13 @@
+/* equipment.c */
+/* creates the UI for the equipment page -
+ * controlled through the following interfaces:
+ *
+ * void show_dive_equipment(struct dive *dive)
+ * void flush_dive_equipment_changes(struct dive *dive)
+ *
+ * called from gtk-ui:
+ * GtkWidget *equipment_widget(void)
+ */
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 
 #include "dive.h"
 #include "display.h"
+#include "display-gtk.h"
 #include "divelist.h"
 
-static int cylinder_changed;
-static GtkComboBox *cylinder_description;
-static GtkSpinButton *cylinder_size, *cylinder_pressure, *nitrox_value;
+GtkListStore *cylinder_model;
+
+enum {
+       CYL_INDEX,
+       CYL_DESC,
+       CYL_SIZE,
+       CYL_WORKP,
+       CYL_STARTP,
+       CYL_ENDP,
+       CYL_O2,
+       CYL_HE,
+       CYL_COLUMNS
+};
+
+static struct {
+       GtkListStore *model;
+       GtkWidget *tree_view;
+       GtkWidget *edit, *add, *del;
+       GtkTreeViewColumn *desc, *size, *workp, *startp, *endp, *o2, *he;
+} cylinder_list;
+
+struct cylinder_widget {
+       int index, changed;
+       const char *name;
+       GtkWidget *hbox;
+       GtkComboBox *description;
+       GtkSpinButton *size, *pressure;
+       GtkWidget *o2, *gasmix_button;
+};
 
-static void set_cylinder_spinbuttons(int ml, int mbar)
+static struct cylinder_widget gtk_cylinder[MAX_CYLINDERS];
+
+static int convert_pressure(int mbar, double *p)
 {
+       int decimals = 1;
+       double pressure;
+
+       pressure = mbar / 1000.0;
+       if (mbar) {
+               if (output_units.pressure == PSI) {
+                       pressure *= 14.5037738; /* Bar to PSI */
+                       decimals = 0;
+               }
+       }
+       *p = pressure;
+       return decimals;
+}
+
+static int convert_volume_pressure(int ml, int mbar, double *v, double *p)
+{
+       int decimals = 1;
        double volume, pressure;
 
        volume = ml / 1000.0;
@@ -25,11 +81,21 @@ static void set_cylinder_spinbuttons(int ml, int mbar)
                }
                if (output_units.pressure == PSI) {
                        pressure *= 14.5037738; /* Bar to PSI */
+                       decimals = 0;
                }
        }
+       *v = volume;
+       *p = pressure;
+       return decimals;
+}
 
-       gtk_spin_button_set_value(cylinder_size, volume);
-       gtk_spin_button_set_value(cylinder_pressure, pressure);
+static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar)
+{
+       double volume, pressure;
+
+       convert_volume_pressure(ml, mbar, &volume, &pressure);
+       gtk_spin_button_set_value(cylinder->size, volume);
+       gtk_spin_button_set_value(cylinder->pressure, pressure);
 }
 
 static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
@@ -37,11 +103,12 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
        GtkTreeIter iter;
        GtkTreeModel *model = gtk_combo_box_get_model(combo_box);
        GValue value1 = {0, }, value2 = {0,};
-       cylinder_t *cyl = current_dive->cylinder + 0;
+       struct cylinder_widget *cylinder = data;
+       cylinder_t *cyl = current_dive->cylinder + cylinder->index;
 
        /* Did the user set it to some non-standard value? */
        if (!gtk_combo_box_get_active_iter(combo_box, &iter)) {
-               cylinder_changed = 1;
+               cylinder->changed = 1;
                return;
        }
 
@@ -50,7 +117,7 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
         * the description by hand. Whatever. So ignore them if
         * they are no-ops.
         */
-       if (!cylinder_changed && cyl->type.description) {
+       if (!cylinder->changed && cyl->type.description) {
                int same;
                char *desc = gtk_combo_box_get_active_text(combo_box);
 
@@ -59,12 +126,12 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
                if (same)
                        return;
        }
-       cylinder_changed = 1;
+       cylinder->changed = 1;
 
        gtk_tree_model_get_value(model, &iter, 1, &value1);
        gtk_tree_model_get_value(model, &iter, 2, &value2);
 
-       set_cylinder_spinbuttons(g_value_get_int(&value1), g_value_get_int(&value2));
+       set_cylinder_spinbuttons(cylinder, g_value_get_int(&value1), g_value_get_int(&value2));
 }
 
 /*
@@ -79,25 +146,26 @@ static gboolean match_cylinder(GtkTreeModel *model,
                                gpointer data)
 {
        const char *name;
-       const char *desc = data;
+       struct cylinder_widget *cylinder = data;
        GValue value = {0, };
 
        gtk_tree_model_get_value(model, iter, 0, &value);
        name = g_value_get_string(&value);
-       if (strcmp(desc, name))
+       if (strcmp(cylinder->name, name))
                return FALSE;
-       gtk_combo_box_set_active_iter(cylinder_description, iter);
+       gtk_combo_box_set_active_iter(cylinder->description, iter);
        found_match = 1;
        return TRUE;
 }
 
-static void add_cylinder(const char *desc, int ml, int mbar)
+static void add_cylinder(struct cylinder_widget *cylinder, const char *desc, int ml, int mbar)
 {
        GtkTreeModel *model;
 
        found_match = 0;
-       model = gtk_combo_box_get_model(cylinder_description);
-       gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc);
+       model = gtk_combo_box_get_model(cylinder->description);
+       cylinder->name = desc;
+       gtk_tree_model_foreach(model, match_cylinder, cylinder);
 
        if (!found_match) {
                GtkListStore *store = GTK_LIST_STORE(model);
@@ -109,47 +177,99 @@ static void add_cylinder(const char *desc, int ml, int mbar)
                        1, ml,
                        2, mbar,
                        -1);
-               gtk_combo_box_set_active_iter(cylinder_description, &iter);
+               gtk_combo_box_set_active_iter(cylinder->description, &iter);
        }
 }
 
-void show_dive_equipment(struct dive *dive)
+static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder)
 {
-       cylinder_t *cyl = &dive->cylinder[0];
-       const char *desc = cyl->type.description;
+       const char *desc;
        int ml, mbar;
        double o2;
 
+       /* Don't show uninitialized cylinder widgets */
+       if (!cylinder->description)
+               return;
+
+       desc = cyl->type.description;
        if (!desc)
                desc = "";
-
        ml = cyl->type.size.mliter;
        mbar = cyl->type.workingpressure.mbar;
-       add_cylinder(desc, ml, mbar);
+       add_cylinder(cylinder, desc, ml, mbar);
 
-       set_cylinder_spinbuttons(cyl->type.size.mliter, cyl->type.workingpressure.mbar);
+       set_cylinder_spinbuttons(cylinder, cyl->type.size.mliter, cyl->type.workingpressure.mbar);
        o2 = cyl->gasmix.o2.permille / 10.0;
+       gtk_widget_set_sensitive(cylinder->o2, !!o2);
+       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button), !!o2);
        if (!o2)
                o2 = 21.0;
-       gtk_spin_button_set_value(nitrox_value, o2);
+       gtk_spin_button_set_value(GTK_SPIN_BUTTON(cylinder->o2), o2);
+}
+
+static int cyl_nothing(cylinder_t *cyl)
+{
+       return  !cyl->type.size.mliter &&
+               !cyl->type.workingpressure.mbar &&
+               !cyl->type.description &&
+               !cyl->gasmix.o2.permille &&
+               !cyl->gasmix.he.permille &&
+               !cyl->start.mbar &&
+               !cyl->end.mbar;
+}
+
+void show_dive_equipment(struct dive *dive)
+{
+       int i, max;
+       GtkTreeIter iter;
+       GtkListStore *model;
+
+       model = cylinder_list.model;
+       gtk_list_store_clear(model);
+       max = MAX_CYLINDERS;
+       do {
+               cylinder_t *cyl = &dive->cylinder[max-1];
+
+               if (!cyl_nothing(cyl))
+                       break;
+       } while (--max);
+
+       for (i = 0; i < max; i++) {
+               cylinder_t *cyl = dive->cylinder+i;
+
+               gtk_list_store_append(model, &iter);
+               gtk_list_store_set(model, &iter,
+                       CYL_INDEX, i,
+                       CYL_DESC, cyl->type.description ? : "",
+                       CYL_SIZE, cyl->type.size.mliter,
+                       CYL_WORKP, cyl->type.workingpressure.mbar,
+                       CYL_STARTP, cyl->start.mbar,
+                       CYL_ENDP, cyl->end.mbar,
+                       CYL_O2, cyl->gasmix.o2.permille,
+                       CYL_HE, cyl->gasmix.he.permille,
+                       -1);
+       }
 }
 
 static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double min, double max, double incr)
 {
-       GtkWidget *frame, *button;
+       GtkWidget *frame, *hbox, *button;
 
        frame = gtk_frame_new(name);
-       gtk_container_add(GTK_CONTAINER(vbox), frame);
+       gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
+
+       hbox = gtk_hbox_new(FALSE, 3);
+       gtk_container_add(GTK_CONTAINER(frame), hbox);
 
        button = gtk_spin_button_new_with_range(min, max, incr);
-       gtk_container_add(GTK_CONTAINER(frame), button);
+       gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 0);
 
        gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID);
 
        return button;
 }
 
-static void fill_cylinder_info(cylinder_t *cyl, const char *desc, double volume, double pressure, int o2)
+static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl, const char *desc, double volume, double pressure, int o2)
 {
        int mbar, ml;
 
@@ -174,26 +294,57 @@ static void fill_cylinder_info(cylinder_t *cyl, const char *desc, double volume,
        /*
         * Also, insert it into the model if it doesn't already exist
         */
-       add_cylinder(desc, ml, mbar);
+       add_cylinder(cylinder, desc, ml, mbar);
 }
 
-static void record_cylinder_changes(struct dive *dive)
+static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cylinder)
 {
        const gchar *desc;
-       GtkComboBox *box = cylinder_description;
+       GtkComboBox *box;
        double volume, pressure;
        int o2;
 
+       /* Ignore uninitialized cylinder widgets */
+       box = cylinder->description;
+       if (!box)
+               return;
+
        desc = gtk_combo_box_get_active_text(box);
-       volume = gtk_spin_button_get_value(cylinder_size);
-       pressure = gtk_spin_button_get_value(cylinder_pressure);
-       o2 = gtk_spin_button_get_value(nitrox_value)*10 + 0.5;
-       fill_cylinder_info(dive->cylinder+0, desc, volume, pressure, o2);
+       volume = gtk_spin_button_get_value(cylinder->size);
+       pressure = gtk_spin_button_get_value(cylinder->pressure);
+       o2 = gtk_spin_button_get_value(GTK_SPIN_BUTTON(cylinder->o2))*10 + 0.5;
+       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(cylinder->gasmix_button)))
+               o2 = 0;
+       fill_cylinder_info(cylinder, cyl, desc, volume, pressure, o2);
 }
 
 void flush_dive_equipment_changes(struct dive *dive)
 {
-       record_cylinder_changes(dive);
+       /* We do nothing: we require the "Ok" button press */
+}
+
+static void apply_cb(GtkButton *button, gpointer data)
+{
+       int i;
+       struct dive *dive = current_dive;
+
+       if (!dive)
+               return;
+
+       for (i = 0; i < MAX_CYLINDERS; i++)
+               record_cylinder_changes(dive->cylinder+i, gtk_cylinder+i);
+       mark_divelist_changed(TRUE);
+       flush_divelist(dive);
+}
+
+static void cancel_cb(GtkButton *button, gpointer data)
+{
+       struct dive *dive = current_dive;
+
+       if (!dive)
+               return;
+
+       show_dive_equipment(current_dive);
 }
 
 /*
@@ -267,37 +418,67 @@ static void fill_tank_list(GtkListStore *store)
        }
 }
 
-static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model)
+static void nitrox_cb(GtkToggleButton *button, gpointer data)
 {
-       GtkWidget *frame, *hbox;
+       struct cylinder_widget *cylinder = data;
+       int state;
+
+       state = gtk_toggle_button_get_active(button);
+       gtk_widget_set_sensitive(cylinder->o2, state);
+}
+
+static void cylinder_widget(int nr, GtkListStore *model)
+{
+       struct cylinder_widget *cylinder;
+       GtkWidget *frame, *hbox, *hbox2;
        GtkWidget *widget;
        char buffer[80];
 
-       snprintf(buffer, sizeof(buffer), "Cylinder %d", nr);
-       frame = gtk_frame_new(buffer);
-       gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
+       cylinder = gtk_cylinder + nr;
+       cylinder->index = nr;
 
-       hbox = gtk_hbox_new(TRUE, 3);
-       gtk_container_add(GTK_CONTAINER(frame), hbox);
+       hbox = gtk_hbox_new(FALSE, 3);
+       cylinder->hbox = hbox;
 
-       frame = gtk_frame_new("Description");
-       gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, FALSE, 0);
+       snprintf(buffer, sizeof(buffer), "Cylinder %d", nr+1);
+       frame = gtk_frame_new(buffer);
+       gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, TRUE, 0);
+
+       hbox2 = gtk_hbox_new(FALSE, 3);
+       gtk_container_add(GTK_CONTAINER(frame), hbox2);
 
        widget = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
-       gtk_container_add(GTK_CONTAINER(frame), widget);
+       gtk_box_pack_start(GTK_BOX(hbox2), widget, FALSE, TRUE, 0);
 
-       cylinder_description = GTK_COMBO_BOX(widget);
-       g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), NULL);
+       cylinder->description = GTK_COMBO_BOX(widget);
+       g_signal_connect(widget, "changed", G_CALLBACK(cylinder_cb), cylinder);
 
-       widget = create_spinbutton(hbox, "Size", 0, 200, 0.1);
-       cylinder_size = GTK_SPIN_BUTTON(widget);
+       widget = create_spinbutton(hbox, "Size", 0, 300, 0.1);
+       cylinder->size = GTK_SPIN_BUTTON(widget);
 
-       widget = create_spinbutton(hbox, "Working Pressure", 0, 5000, 1);
-       cylinder_pressure = GTK_SPIN_BUTTON(widget);
+       widget = create_spinbutton(hbox, "Pressure", 0, 5000, 1);
+       cylinder->pressure = GTK_SPIN_BUTTON(widget);
 
        widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1);
-       nitrox_value = GTK_SPIN_BUTTON(widget);
-       gtk_spin_button_set_range(nitrox_value, 21.0, 100.0);
+       cylinder->o2 = widget;
+       cylinder->gasmix_button = gtk_check_button_new();
+       gtk_box_pack_start(GTK_BOX(gtk_widget_get_parent(cylinder->o2)),
+               cylinder->gasmix_button, FALSE, FALSE, 3);
+       g_signal_connect(cylinder->gasmix_button, "toggled", G_CALLBACK(nitrox_cb), cylinder);
+
+       gtk_spin_button_set_range(GTK_SPIN_BUTTON(cylinder->o2), 21.0, 100.0);
+}
+
+static void edit_cb(GtkButton *button, gpointer data)
+{
+}
+
+static void add_cb(GtkButton *button, gpointer data)
+{
+}
+
+static void del_cb(GtkButton *button, gpointer data)
+{
 }
 
 static GtkListStore *create_tank_size_model(void)
@@ -314,15 +495,139 @@ static GtkListStore *create_tank_size_model(void)
        return model;
 }
 
-GtkWidget *equipment_widget(void)
+static void size_data_func(GtkTreeViewColumn *col,
+                          GtkCellRenderer *renderer,
+                          GtkTreeModel *model,
+                          GtkTreeIter *iter,
+                          gpointer data)
 {
-       GtkWidget *vbox;
+       int ml, mbar;
+       double size, pressure;
+       char buffer[10];
+
+       gtk_tree_model_get(model, iter, CYL_SIZE, &ml, CYL_WORKP, &mbar, -1);
+       convert_volume_pressure(ml, mbar, &size, &pressure);
+       if (size)
+               snprintf(buffer, sizeof(buffer), "%.1f", size);
+       else
+               strcpy(buffer, "unkn");
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+static void pressure_data_func(GtkTreeViewColumn *col,
+                          GtkCellRenderer *renderer,
+                          GtkTreeModel *model,
+                          GtkTreeIter *iter,
+                          gpointer data)
+{
+       int index = (long)data;
+       int mbar, decimals;
+       double pressure;
+       char buffer[10];
+
+       gtk_tree_model_get(model, iter, index, &mbar, -1);
+       decimals = convert_pressure(mbar, &pressure);
+       if (mbar)
+               snprintf(buffer, sizeof(buffer), "%.*f", decimals, pressure);
+       else
+               *buffer = 0;
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+static void percentage_data_func(GtkTreeViewColumn *col,
+                          GtkCellRenderer *renderer,
+                          GtkTreeModel *model,
+                          GtkTreeIter *iter,
+                          gpointer data)
+{
+       int index = (long)data;
+       int permille;
+       char buffer[10];
+
+       gtk_tree_model_get(model, iter, index, &permille, -1);
+       if (permille)
+               snprintf(buffer, sizeof(buffer), "%.1f%%", permille / 10.0);
+       else
+               *buffer = 0;
+       g_object_set(renderer, "text", buffer, NULL);
+}
+
+static GtkWidget *cylinder_list_create(void)
+{
+       GtkWidget *tree_view;
        GtkListStore *model;
 
+       model = gtk_list_store_new(CYL_COLUMNS,
+               G_TYPE_INT,             /* CYL_INDEX */
+               G_TYPE_STRING,          /* CYL_DESC: utf8 */
+               G_TYPE_INT,             /* CYL_SIZE: mliter */
+               G_TYPE_INT,             /* CYL_WORKP: mbar */
+               G_TYPE_INT,             /* CYL_STARTP: mbar */
+               G_TYPE_INT,             /* CYL_ENDP: mbar */
+               G_TYPE_INT,             /* CYL_O2: permille */
+               G_TYPE_INT              /* CYL_HE: permille */
+               );
+       cylinder_list.model = model;
+       tree_view = gtk_tree_view_new_with_model(GTK_TREE_MODEL(model));
+       cylinder_list.desc = tree_view_column(tree_view, CYL_DESC, "Type", NULL, PANGO_ALIGN_LEFT, TRUE);
+       cylinder_list.size = tree_view_column(tree_view, CYL_SIZE, "Size", size_data_func, PANGO_ALIGN_RIGHT, TRUE);
+       cylinder_list.workp = tree_view_column(tree_view, CYL_WORKP, "MaxPress", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
+       cylinder_list.startp = tree_view_column(tree_view, CYL_STARTP, "Start", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
+       cylinder_list.endp = tree_view_column(tree_view, CYL_ENDP, "End", pressure_data_func, PANGO_ALIGN_RIGHT, TRUE);
+       cylinder_list.o2 = tree_view_column(tree_view, CYL_O2, "O" UTF8_SUBSCRIPT_2 "%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE);
+       cylinder_list.he = tree_view_column(tree_view, CYL_HE, "He%", percentage_data_func, PANGO_ALIGN_RIGHT, TRUE);
+       return tree_view;
+}
+
+GtkWidget *equipment_widget(void)
+{
+       GtkWidget *vbox, *hbox, *frame, *framebox;
+       GtkWidget *add, *del, *edit;
+
        vbox = gtk_vbox_new(FALSE, 3);
 
-       model = create_tank_size_model();
-       cylinder_widget(vbox, 0, model);
+       /*
+        * We create the cylinder size model at startup, since
+        * we're going to share it across all cylinders and all
+        * dives. So if you add a new cylinder type in one dive,
+        * it will show up when you edit the cylinder types for
+        * another dive.
+        */
+       cylinder_model = create_tank_size_model();
+
+       cylinder_list.tree_view = cylinder_list_create();
+
+       hbox = gtk_hbox_new(FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);
+
+       frame = gtk_frame_new("Cylinders");
+       gtk_box_pack_start(GTK_BOX(hbox), frame, TRUE, FALSE, 3);
+
+       framebox = gtk_vbox_new(FALSE, 3);
+       gtk_container_add(GTK_CONTAINER(frame), framebox);
+
+       hbox = gtk_hbox_new(FALSE, 3);
+       gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3);
+
+       gtk_box_pack_start(GTK_BOX(hbox), cylinder_list.tree_view, TRUE, FALSE, 3);
+
+       hbox = gtk_hbox_new(TRUE, 3);
+       gtk_box_pack_start(GTK_BOX(framebox), hbox, TRUE, FALSE, 3);
+
+       edit = gtk_button_new_from_stock(GTK_STOCK_EDIT);
+       add = gtk_button_new_from_stock(GTK_STOCK_ADD);
+       del = gtk_button_new_from_stock(GTK_STOCK_DELETE);
+       gtk_box_pack_start(GTK_BOX(hbox), edit, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), add, FALSE, FALSE, 0);
+       gtk_box_pack_start(GTK_BOX(hbox), del, FALSE, FALSE, 0);
+
+       cylinder_list.edit = edit;
+       cylinder_list.add = add;
+       cylinder_list.del = del;
+
+       g_signal_connect(edit, "clicked", G_CALLBACK(edit_cb), NULL);
+       g_signal_connect(add, "clicked", G_CALLBACK(add_cb), NULL);
+       g_signal_connect(del, "clicked", G_CALLBACK(del_cb), NULL);
 
        return vbox;
 }