X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=5ff8f0fe6d9bb56aa0bfb1fea3f4f43e33527f78;hb=bf13c14d16fdb1aa0230f688ff88635f395c6887;hp=32f45da5be37d725bc2eb8f353765771626ac27d;hpb=23c2b43c1042713cc4c394c3d08ec0016e41eb1a;p=ext%2Fsubsurface.git

diff --git a/equipment.c b/equipment.c
index 32f45da..5ff8f0f 100644
--- a/equipment.c
+++ b/equipment.c
@@ -22,7 +22,6 @@
 GtkListStore *cylinder_model;
 
 enum {
-	CYL_INDEX,
 	CYL_DESC,
 	CYL_SIZE,
 	CYL_WORKP,
@@ -46,7 +45,7 @@ struct cylinder_widget {
 	const char *name;
 	GtkWidget *hbox;
 	GtkComboBox *description;
-	GtkSpinButton *size, *pressure;
+	GtkSpinButton *size, *pressure, *start, *end;
 	GtkWidget *o2, *gasmix_button;
 };
 
@@ -88,20 +87,25 @@ static int convert_volume_pressure(int ml, int mbar, double *v, double *p)
 	return decimals;
 }
 
-static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar)
+static void set_cylinder_spinbuttons(struct cylinder_widget *cylinder, int ml, int mbar, int start, int end)
 {
 	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);
+
+	convert_pressure(start, &pressure);
+	gtk_spin_button_set_value(cylinder->start, pressure);
+	convert_pressure(end, &pressure);
+	gtk_spin_button_set_value(cylinder->end, pressure);
 }
 
 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,};
+	int ml, mbar, start, end;
 	struct cylinder_widget *cylinder = data;
 	cylinder_t *cyl = current_dive->cylinder + cylinder->index;
 
@@ -127,10 +131,14 @@ static void cylinder_cb(GtkComboBox *combo_box, gpointer data)
 	}
 	cylinder->changed = 1;
 
-	gtk_tree_model_get_value(model, &iter, 1, &value1);
-	gtk_tree_model_get_value(model, &iter, 2, &value2);
+	gtk_tree_model_get(model, &iter,
+		CYL_SIZE, &ml,
+		CYL_WORKP, &mbar,
+		CYL_STARTP, &start,
+		CYL_ENDP, &end,
+		-1);
 
-	set_cylinder_spinbuttons(cylinder, g_value_get_int(&value1), g_value_get_int(&value2));
+	set_cylinder_spinbuttons(cylinder, ml, mbar, start, end);
 }
 
 /*
@@ -197,7 +205,9 @@ static void show_cylinder(cylinder_t *cyl, struct cylinder_widget *cylinder)
 	mbar = cyl->type.workingpressure.mbar;
 	add_cylinder(cylinder, desc, ml, mbar);
 
-	set_cylinder_spinbuttons(cylinder, cyl->type.size.mliter, cyl->type.workingpressure.mbar);
+	set_cylinder_spinbuttons(cylinder,
+		cyl->type.size.mliter, cyl->type.workingpressure.mbar,
+		cyl->start.mbar, cyl->end.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);
@@ -220,7 +230,6 @@ static int cyl_nothing(cylinder_t *cyl)
 static void set_one_cylinder(int index, cylinder_t *cyl, GtkListStore *model, GtkTreeIter *iter)
 {
 	gtk_list_store_set(model, iter,
-		CYL_INDEX, index,
 		CYL_DESC, cyl->type.description ? : "",
 		CYL_SIZE, cyl->type.size.mliter,
 		CYL_WORKP, cyl->type.workingpressure.mbar,
@@ -266,25 +275,29 @@ static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name, double mi
 	GtkWidget *frame, *hbox, *button;
 
 	frame = gtk_frame_new(name);
-	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(vbox), frame, TRUE, FALSE, 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_box_pack_start(GTK_BOX(hbox), button, FALSE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(hbox), button, TRUE, FALSE, 0);
 
 	gtk_spin_button_set_update_policy(GTK_SPIN_BUTTON(button), GTK_UPDATE_IF_VALID);
 
 	return button;
 }
 
-static void fill_cylinder_info(struct cylinder_widget *cylinder, 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, double start, double end, int o2)
 {
 	int mbar, ml;
 
-	if (output_units.pressure == PSI)
+	if (output_units.pressure == PSI) {
 		pressure /= 14.5037738;
+		start /= 14.5037738;
+		end /= 14.5037738;
+	}
 
 	if (pressure && output_units.volume == CUFT) {
 		volume *= 28.3168466;	/* CUFT to liter */
@@ -299,6 +312,8 @@ static void fill_cylinder_info(struct cylinder_widget *cylinder, cylinder_t *cyl
 	cyl->type.description = desc;
 	cyl->type.size.mliter = ml;
 	cyl->type.workingpressure.mbar = mbar;
+	cyl->start.mbar = start * 1000 + 0.5;
+	cyl->end.mbar = end * 1000 + 0.5;
 	cyl->gasmix.o2.permille = o2;
 
 	/*
@@ -311,7 +326,7 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl
 {
 	const gchar *desc;
 	GtkComboBox *box;
-	double volume, pressure;
+	double volume, pressure, start, end;
 	int o2;
 
 	/* Ignore uninitialized cylinder widgets */
@@ -322,10 +337,12 @@ static void record_cylinder_changes(cylinder_t *cyl, struct cylinder_widget *cyl
 	desc = gtk_combo_box_get_active_text(box);
 	volume = gtk_spin_button_get_value(cylinder->size);
 	pressure = gtk_spin_button_get_value(cylinder->pressure);
+	start = gtk_spin_button_get_value(cylinder->start);
+	end = gtk_spin_button_get_value(cylinder->end);
 	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);
+	fill_cylinder_info(cylinder, cyl, desc, volume, pressure, start, end, o2);
 }
 
 void flush_dive_equipment_changes(struct dive *dive)
@@ -418,6 +435,10 @@ static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, G
 	GtkWidget *frame, *hbox;
 	GtkWidget *widget;
 
+	/*
+	 * Cylinder type: description, size and
+	 * working pressure
+	 */
 	frame = gtk_frame_new("Cylinder");
 
 	hbox = gtk_hbox_new(FALSE, 3);
@@ -439,6 +460,24 @@ static void cylinder_widget(GtkWidget *vbox, struct cylinder_widget *cylinder, G
 	widget = create_spinbutton(hbox, "Pressure", 0, 5000, 1);
 	cylinder->pressure = GTK_SPIN_BUTTON(widget);
 
+	/*
+	 * Cylinder start/end pressures
+	 */
+	hbox = gtk_hbox_new(FALSE, 3);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
+	widget = create_spinbutton(hbox, "Start Pressure", 0, 5000, 1);
+	cylinder->start = GTK_SPIN_BUTTON(widget);
+
+	widget = create_spinbutton(hbox, "End Pressure", 0, 5000, 1);
+	cylinder->end = GTK_SPIN_BUTTON(widget);
+
+	/*
+	 * Cylinder gas mix: Air, Nitrox or Trimix
+	 */
+	hbox = gtk_hbox_new(FALSE, 3);
+	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, TRUE, 0);
+
 	widget = create_spinbutton(hbox, "Nitrox", 21, 100, 0.1);
 	cylinder->o2 = widget;
 	cylinder->gasmix_button = gtk_check_button_new();
@@ -490,6 +529,18 @@ static int edit_cylinder_dialog(int index, cylinder_t *cyl)
 	return success;
 }
 
+static int get_model_index(GtkListStore *model, GtkTreeIter *iter)
+{
+	int *p, index;
+	GtkTreePath *path;
+
+	path = gtk_tree_model_get_path(GTK_TREE_MODEL(model), iter);
+	p = gtk_tree_path_get_indices(path);
+	index = p ? *p : 0;
+	gtk_tree_path_free(path);
+	return index;
+}
+
 static void edit_cb(GtkButton *button, gpointer data)
 {
 	int index;
@@ -504,11 +555,12 @@ static void edit_cb(GtkButton *button, gpointer data)
 	if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
 		return;
 
-	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CYL_INDEX, &index, -1);
+	index = get_model_index(model, &iter);
 	if (!edit_cylinder_dialog(index, &cyl))
 		return;
 
 	set_one_cylinder(index, &cyl, model, &iter);
+	repaint_dive();
 }
 
 static void add_cb(GtkButton *button, gpointer data)
@@ -547,7 +599,7 @@ static void del_cb(GtkButton *button, gpointer data)
 	if (!gtk_tree_selection_get_selected(selection, NULL, &iter))
 		return;
 
-	gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, CYL_INDEX, &index, -1);
+	index = get_model_index(model, &iter);
 
 	dive = current_dive;
 	if (!dive)
@@ -555,12 +607,7 @@ static void del_cb(GtkButton *button, gpointer data)
 	cyl = dive->cylinder + index;
 	nr = cylinder_list.max_index - index - 1;
 
-	if (gtk_list_store_remove(model, &iter)) {
-		do {
-			gtk_list_store_set(model, &iter, CYL_INDEX, index, -1);
-			index++;
-		} while (gtk_tree_model_iter_next(GTK_TREE_MODEL(model), &iter));
-	}
+	gtk_list_store_remove(model, &iter);
 
 	cylinder_list.max_index--;
 	memmove(cyl, cyl+1, nr*sizeof(*cyl));
@@ -670,7 +717,6 @@ static GtkWidget *cylinder_list_create(void)
 	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 */