Merge branch 'compiler-warning' of https://github.com/nathansamson/diveclog

* 'compiler-warning' of https://github.com/nathansamson/diveclog:
  Removed the unused startemp and enttemp calculations. This fixes a compiler warning too.

Fix up trivial conflict in dive.c due to the temperature simplification
(commit 9961c7f89ce6: "Remove redundant temperature readings").

diff --git a/.gitignore b/.gitignore
index 295ea6b17b04ac60ce1723a762551e5df889ce13..aeb949b3d83246d568ac4907e2c68c3b0893884b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 *.o
-/parse
+/divelog

diff --git a/Makefile b/Makefile
index b16d38c7a5cd61145ebc8a9b2c2ff045e3d0d403..8b5fd220f57e9729e98941cee4d6ed51f20e6527 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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`
 

diff --git a/dive.c b/dive.c
index f758785d940c65fba7a702f0b5b0b91f9b95e170..757622fe7076cf10a43a70aa9b1ec6facd5fc816 100644 (file)
--- a/dive.c
+++ b/dive.c
@@ -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;
                }

diff --git a/dive.h b/dive.h
index c6c545dcc11e133a748113f8529fce9a5128aeb6..2d03ee7cd7d0db4c364ed51a9a1fd1cee37e2c94 100644 (file)
--- a/dive.h
+++ b/dive.h
@@ -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 {

diff --git a/info.c b/info.c
index 55708bedfd7b103313810034398749d2364659d9..9abbbec400e58efff5b11cdc9044e933e68f04f9 100644 (file)
--- a/info.c
+++ b/info.c
@@ -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 9e3640cad84d9cf99e92eabf6d6c1e5369d896d2..c33cbb0ddaae0def1daac898109efa5c595531f6 100644 (file)
--- 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);
 }