X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=equipment.c;h=4bde92aef28af6bb83558caa42a085f631793292;hb=ed8561bf59e8a46ca5f7442f0ca80ad10c482970;hp=5b8bf35834d7166380ef6adfb422491c441d51ff;hpb=067506038a5fea72e60680513d768f89722671fd;p=ext%2Fsubsurface.git

diff --git a/equipment.c b/equipment.c
index 5b8bf35..4bde92a 100644
--- a/equipment.c
+++ b/equipment.c
@@ -8,26 +8,128 @@
 #include "display.h"
 #include "divelist.h"
 
+static int cylinder_changed;
+static GtkComboBox *cylinder_description;
+static GtkSpinButton *cylinder_size, *cylinder_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 volume, pressure;
+
+	cylinder_changed = 1;
+	if (!gtk_combo_box_get_active_iter(combo_box, &iter))
+		return;
+
+	gtk_tree_model_get_value(model, &iter, 1, &value1);
+	volume = g_value_get_int(&value1);
+	gtk_tree_model_get_value(model, &iter, 2, &value2);
+	pressure = g_value_get_int(&value2);
+
+	gtk_spin_button_set_value(cylinder_size,
+			volume / 1000.0);
+	gtk_spin_button_set_value(cylinder_pressure,
+			pressure / 1000.0);
+}
+
+static gboolean match_cylinder(GtkTreeModel *model,
+				GtkTreePath *path,
+				GtkTreeIter *iter,
+				gpointer data)
+{
+	const char *name;
+	const char *desc = data;
+	GValue value = {0, };
+
+	gtk_tree_model_get_value(model, iter, 0, &value);
+	name = g_value_get_string(&value);
+	if (strcmp(desc, name))
+		return FALSE;
+	gtk_combo_box_set_active_iter(cylinder_description, iter);
+	return TRUE;
+}
+
 void show_dive_equipment(struct dive *dive)
 {
+	cylinder_type_t *type = &dive->cylinder[0].type;
+	const char *desc = type->description;
+	GtkTreeModel *model = gtk_combo_box_get_model(cylinder_description);
+
+	if (desc)
+		gtk_tree_model_foreach(model, match_cylinder, (gpointer)desc);
+	gtk_spin_button_set_value(cylinder_size,
+			type->size.mliter / 1000.0);
+	gtk_spin_button_set_value(cylinder_pressure,
+			type->workingpressure.mbar / 1000.0);
+}
+
+static GtkWidget *create_spinbutton(GtkWidget *vbox, const char *name)
+{
+	GtkWidget *frame, *button;
+
+	frame = gtk_frame_new(name);
+	gtk_container_add(GTK_CONTAINER(vbox), frame);
+
+	button = gtk_spin_button_new_with_range( 0.0, 3500.0, 0.1);
+	gtk_container_add(GTK_CONTAINER(frame), button);
+
+	return button;
+}
+
+static void fill_cylinder_info(cylinder_t *cyl, const char *desc, int mliter, int mbar)
+{
+	/*
+	 * The code is currently too broken to actually set anything,
+	 * so just print what we would set
+	 */
+	printf("Set cylinder to '%s': %.1f liter at %.1f bar working pressure\n",
+		desc, mliter / 1000.0, mbar / 1000.);
+#if 0
+	cyl->type.description = desc;
+	cyl->type.size.mliter = mliter;
+	cyl->type.workingpressure.mbar = mbar;
+#endif
+}
+
+static void record_cylinder_changes(struct dive *dive)
+{
+	const gchar *desc;
+	GtkComboBox *box = cylinder_description;
+	gdouble volume, pressure;
+
+	desc = gtk_combo_box_get_active_text(box);
+	volume = gtk_spin_button_get_value(cylinder_size);
+	pressure = gtk_spin_button_get_value(cylinder_pressure);
+
+	fill_cylinder_info(dive->cylinder+0,
+		desc, volume * 1000, pressure * 1000);
 }
 
 void flush_dive_equipment_changes(struct dive *dive)
 {
+	if (cylinder_changed) {
+		cylinder_changed = 0;
+		record_cylinder_changes(dive);
+	}
 }
 
+/* We should take these from the dive list instead */
 static struct tank_info {
 	const char *name;
 	int size;	/* cuft or mliter depending on psi */
 	int psi;	/* If zero, size is in mliter */
 } tank_info[] = {
-	{ "None", },
+	{ "None", 0, 0 },
 	{ "10.0 l", 10000 },
 	{ "11.1 l", 11100 },
 	{ "AL72", 72, 3000 },
 	{ "AL80", 80, 3000 },
-	{ "LP85", 85, 2640 },
-	{ "LP95", 95, 2640 },
+	{ "LP85", 85, 2400 },
+	{ "LP95", 95, 2400 },
+	{ "LP85+", 85, 2640 },
+	{ "LP95+", 95, 2640 },
 	{ "HP100", 100, 3442 },
 	{ "HP119", 119, 3442 },
 	{ NULL, }
@@ -66,18 +168,31 @@ static void fill_tank_list(GtkListStore *store)
 
 static void cylinder_widget(GtkWidget *box, int nr, GtkListStore *model)
 {
-	GtkWidget *frame, *hbox, *size;
+	GtkWidget *frame, *hbox;
+	GtkWidget *description, *size, *pressure;
 	char buffer[80];
 
 	snprintf(buffer, sizeof(buffer), "Cylinder %d", nr);
 	frame = gtk_frame_new(buffer);
-	gtk_box_pack_start(GTK_BOX(box), frame, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0);
 
 	hbox = gtk_hbox_new(TRUE, 3);
 	gtk_container_add(GTK_CONTAINER(frame), hbox);
 
-	size = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
-	gtk_box_pack_start(GTK_BOX(hbox), size, FALSE, FALSE, 0);
+	frame = gtk_frame_new("Description");
+	gtk_box_pack_start(GTK_BOX(hbox), frame, FALSE, FALSE, 0);
+
+	description = gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(model), 0);
+	gtk_container_add(GTK_CONTAINER(frame), description);
+
+	cylinder_description = GTK_COMBO_BOX(description);
+	g_signal_connect(description, "changed", G_CALLBACK(cylinder_cb), description);
+
+	size = create_spinbutton(hbox, "Size");
+	cylinder_size = GTK_SPIN_BUTTON(size);
+
+	pressure = create_spinbutton(hbox, "Working Pressure");
+	cylinder_pressure = GTK_SPIN_BUTTON(pressure);
 }
 
 static GtkListStore *create_tank_size_model(void)
@@ -99,7 +214,7 @@ GtkWidget *equipment_widget(void)
 	GtkWidget *vbox;
 	GtkListStore *model;
 
-	vbox = gtk_vbox_new(TRUE, 3);
+	vbox = gtk_vbox_new(FALSE, 3);
 
 	model = create_tank_size_model();
 	cylinder_widget(vbox, 0, model);