diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | dive.c | 17 | ||||
| -rw-r--r-- | dive.h | 1 | ||||
| -rw-r--r-- | info.c | 29 | ||||
| -rw-r--r-- | save-xml.c | 7 |
6 files changed, 45 insertions, 13 deletions
diff --git a/.gitignore b/.gitignore index 295ea6b17..aeb949b3d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ *.o -/parse +/divelog @@ -4,7 +4,7 @@ CFLAGS=-Wall -Wno-pointer-sign -g OBJS=main.o dive.o profile.o info.o divelist.o parse-xml.o save-xml.o divelog: $(OBJS) - $(CC) $(LDLAGS) -o divelog $(OBJS) \ + $(CC) $(LDFLAGS) -o divelog $(OBJS) \ `xml2-config --libs` \ `pkg-config --libs gtk+-2.0` @@ -36,6 +36,8 @@ struct dive *fixup_dive(struct dive *dive) 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; @@ -59,6 +61,21 @@ struct dive *fixup_dive(struct dive *dive) 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; } @@ -75,6 +75,7 @@ typedef struct { typedef struct { volume_t size; pressure_t workingpressure; + const char *description; /* "LP85", "AL72", "AL80", "HP100+" or whatever */ } cylinder_type_t; typedef struct { @@ -7,7 +7,8 @@ #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; @@ -38,7 +39,7 @@ void flush_dive_info_changes(void) 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) { @@ -94,7 +95,7 @@ void update_dive_info(struct dive *dive) 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 ? : ""; @@ -142,7 +143,21 @@ GtkWidget *dive_info_frame(void) 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; @@ -152,10 +167,12 @@ static GtkTextBuffer *text_entry(GtkWidget *box, const char *label, gboolean exp 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)); @@ -175,8 +192,8 @@ GtkWidget *extended_dive_info_frame(void) 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); diff --git a/save-xml.c b/save-xml.c index 9e3640cad..c33cbb0dd 100644 --- a/save-xml.c +++ b/save-xml.c @@ -127,7 +127,6 @@ static void save_cylinder_info(FILE *f, struct dive *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; @@ -140,11 +139,8 @@ static void save_cylinder_info(FILE *f, struct dive *dive) 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"); } } @@ -193,4 +189,5 @@ void save_dives(const char *filename) for (i = 0; i < dive_table.nr; i++) save_dive(f, get_dive(i)); fprintf(f, "</dives>\n"); + fclose(f); } |