Only update mean/max depths with computed ones if they are way off

[ext/subsurface.git] / main.c

diff --git a/main.c b/main.c
index a2119b8cf3af977efdb2e96f6a5a6caafb9c595c..5a047bb09a58882244235f6838a409c8ce4e5cff 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <time.h>
 
@@ -25,7 +26,32 @@ static int sortfn(const void *_a, const void *_b)
  */
 static void report_dives(void)
 {
+       int i;
+
        qsort(dive_table.dives, dive_table.nr, sizeof(struct dive *), sortfn);
+
+       for (i = 1; i < dive_table.nr; i++) {
+               struct dive **pp = &dive_table.dives[i-1];
+               struct dive *prev = pp[0];
+               struct dive *dive = pp[1];
+               struct dive *merged;
+
+               if (prev->when + prev->duration.seconds < dive->when)
+                       continue;
+
+               merged = try_to_merge(prev, dive);
+               if (!merged)
+                       continue;
+
+               free(prev);
+               free(dive);
+               *pp = merged;
+               dive_table.nr--;
+               memmove(pp+1, pp+2, sizeof(*pp)*(dive_table.nr - i));
+
+               /* Redo the new 'i'th dive */
+               i--;
+       }
 }
 
 static void parse_argument(const char *arg)
@@ -96,7 +122,7 @@ static void file_save(GtkWidget *w, gpointer data)
        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
                char *filename;
                filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
-               printf("Save: '%s'\n", filename);
+               save_dives(filename);
                g_free(filename);
        }
        gtk_widget_destroy(dialog);
@@ -154,35 +180,41 @@ int main(int argc, char **argv)
        g_signal_connect(G_OBJECT(win), "destroy",      G_CALLBACK(on_destroy), NULL);
        main_window = win;
 
-       vbox = gtk_vbox_new(FALSE, 1);
+       vbox = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(win), vbox);
 
        menubar = get_menubar_menu(win);
-       gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, FALSE, 0);
 
        /* Table for the list of dives, cairo window, and dive info */
        table = gtk_table_new(2, 2, FALSE);
        gtk_container_set_border_width(GTK_CONTAINER(table), 5);
-       gtk_box_pack_end(GTK_BOX(vbox), table, FALSE, TRUE, 0);
+       gtk_box_pack_end(GTK_BOX(vbox), table, TRUE, TRUE, 0);
        gtk_widget_show(table);
 
        /* Create the atual divelist */
        divelist = create_dive_list();
-       gtk_table_attach_defaults(GTK_TABLE(table), divelist, 0, 1, 0, 2);
+       gtk_table_attach(GTK_TABLE(table), divelist, 0, 1, 0, 2,
+               0, GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0);
+
+       /* Frame for minimal dive info */
+       frame = dive_info_frame();
+       gtk_table_attach(GTK_TABLE(table), frame, 1, 2, 0, 1,
+                GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0, 0);
 
        /* Notebook for dive info vs profile vs .. */
        notebook = gtk_notebook_new();
        gtk_table_attach_defaults(GTK_TABLE(table), notebook, 1, 2, 1, 2);
 
-       /* Frame for dive info */
-       frame = dive_info_frame();
-       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Info"));
-
        /* Frame for dive profile */
        frame = dive_profile_frame();
        gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Profile"));
        dive_profile = frame;
 
+       /* Frame for extended dive info */
+       frame = extended_dive_info_frame();
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info"));
+
        gtk_widget_set_app_paintable(win, TRUE);
        gtk_widget_show_all(win);