int startpress = 0, endpress = 0;
int maxdepth = 0, mintemp = 0;
int lastdepth = 0;
+ int lasttemp = 0;
+ temperature_t *redundant_temp = NULL;
for (i = 0; i < dive->samples; i++) {
struct sample *sample = dive->sample + i;
startpress = press;
}
if (temp) {
+ /*
+ * If we have consecutive identical
+ * temperature readings, throw away
+ * the redundant ones. We care about
+ * the "edges" only.
+ */
+ if (lasttemp == temp) {
+ if (redundant_temp)
+ redundant_temp->mkelvin = 0;
+ redundant_temp = &sample->temperature;
+ } else {
+ redundant_temp = NULL;
+ lasttemp = temp;
+ }
+
if (!mintemp || temp < mintemp)
mintemp = temp;
}
#include "display.h"
static GtkWidget *divedate, *divetime, *depth, *duration, *temperature, *locationnote;
-static GtkTextBuffer *location, *notes;
+static GtkEntry *location;
+static GtkTextBuffer *notes;
static int location_changed = 1, notes_changed = 1;
static struct dive *buffered_dive;
if (location_changed) {
g_free(dive->location);
- dive->location = get_text(location);
+ dive->location = gtk_editable_get_chars(GTK_EDITABLE(location), 0, -1);
}
if (notes_changed) {
gtk_label_set_text(GTK_LABEL(temperature), buffer);
text = dive->location ? : "";
- gtk_text_buffer_set_text(location, text, -1);
+ gtk_entry_set_text(location, text);
gtk_label_set_text(GTK_LABEL(locationnote), text);
text = dive->notes ? : "";
return frame;
}
-static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean expand)
+static GtkEntry *text_entry(GtkWidget *box, const char *label)
+{
+ GtkWidget *entry;
+
+ GtkWidget *frame = gtk_frame_new(label);
+
+ gtk_box_pack_start(GTK_BOX(box), frame, FALSE, TRUE, 0);
+
+ entry = gtk_entry_new ();
+ gtk_container_add(GTK_CONTAINER(frame), entry);
+
+ return GTK_ENTRY(entry);
+}
+
+static GtkTextBuffer *text_view(GtkWidget *box, const char *label, gboolean expand)
{
GtkWidget *view;
GtkTextBuffer *buffer;
gtk_box_pack_start(GTK_BOX(box), frame, expand, expand, 0);
GtkWidget* scrolled_window = gtk_scrolled_window_new (0, 0);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window), GTK_SHADOW_IN);
gtk_widget_show(scrolled_window);
view = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(view), GTK_WRAP_WORD);
gtk_container_add(GTK_CONTAINER(scrolled_window), view);
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
vbox = gtk_vbox_new(FALSE, 5);
gtk_container_add(GTK_CONTAINER(frame), vbox);
- location = text_entry(vbox, "Location", FALSE);
- notes = text_entry(vbox, "Notes", TRUE);
+ location = text_entry(vbox, "Location");
+ notes = text_view(vbox, "Notes", TRUE);
/* Add extended info here: name, description, yadda yadda */
update_dive_info(current_dive);
for (i = 0; i < MAX_CYLINDERS; i++) {
cylinder_t *cylinder = dive->cylinder+i;
int volume = cylinder->type.size.mliter;
- int pressure = cylinder->type.workingpressure.mbar;
int o2 = cylinder->gasmix.o2.permille;
int he = cylinder->gasmix.he.permille;
if (he)
fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
}
- if (volume) {
+ if (volume)
fprintf(f, " size='%u.%03u l'", FRACTION(volume, 1000));
- if (pressure)
- fprintf(f, " workpressure='%u.%03u bar'", FRACTION(pressure, 1000));
- }
fprintf(f, " />\n");
}
}
for (i = 0; i < dive_table.nr; i++)
save_dive(f, get_dive(i));
fprintf(f, "</dives>\n");
+ fclose(f);
}