X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=main.c;h=2489473b9c2f9fe43f65c4ce0405fba3b79e7cc6;hp=b7df3bfaa38df9c35c19e5bbfa1bba54cc423a0b;hb=HEAD;hpb=1d69524a7889ffa74a3e28004d9096524834053a diff --git a/main.c b/main.c index b7df3bf..2489473 100644 --- a/main.c +++ b/main.c @@ -1,10 +1,15 @@ +/* main.c */ #include +#include #include #include #include "dive.h" -#include "display.h" +#include "divelist.h" +struct units output_units; + +/* random helper functions, used here or elsewhere */ static int sortfn(const void *_a, const void *_b) { const struct dive *a = *(void **)_a; @@ -17,13 +22,130 @@ static int sortfn(const void *_a, const void *_b) return 0; } +const char *weekday(int wday) +{ + static const char wday_array[7][4] = { + "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" + }; + return wday_array[wday]; +} + +const char *monthname(int mon) +{ + static const char month_array[12][4] = { + "Jan", "Feb", "Mar", "Apr", "May", "Jun", + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", + }; + return month_array[mon]; +} + +/* + * When adding dives to the dive table, we try to renumber + * the new dives based on any old dives in the dive table. + * + * But we only do it if: + * + * - the last dive in the old dive table was numbered + * + * - all the new dives are strictly at the end (so the + * "last dive" is at the same location in the dive table + * after re-sorting the dives. + * + * - none of the new dives have any numbers + * + * This catches the common case of importing new dives from + * a dive computer, and gives them proper numbers based on + * your old dive list. But it tries to be very conservative + * and not give numbers if there is *any* question about + * what the numbers should be - in which case you need to do + * a manual re-numbering. + */ +static void try_to_renumber(struct dive *last, int preexisting) +{ + int i, nr; + + /* + * If the new dives aren't all strictly at the end, + * we're going to expect the user to do a manual + * renumbering. + */ + if (get_dive(preexisting-1) != last) + return; + + /* + * If any of the new dives already had a number, + * we'll have to do a manual renumbering. + */ + for (i = preexisting; i < dive_table.nr; i++) { + struct dive *dive = get_dive(i); + if (dive->number) + return; + } + + /* + * Ok, renumber.. + */ + nr = last->number; + for (i = preexisting; i < dive_table.nr; i++) { + struct dive *dive = get_dive(i); + dive->number = ++nr; + } +} + +/* + * track whether we switched to importing dives + */ +static gboolean imported = FALSE; + /* * This doesn't really report anything at all. We just sort the * dives, the GUI does the reporting */ -static void report_dives(void) +void report_dives(gboolean is_imported) { + int i; + int preexisting = dive_table.preexisting; + struct dive *last; + + /* This does the right thing for -1: NULL */ + last = get_dive(preexisting-1); + 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--; + } + + if (is_imported) { + /* Was the previous dive table state numbered? */ + if (last && last->number) + try_to_renumber(last, preexisting); + + /* did we have dives in the table and added more? */ + if (last && preexisting != dive_table.nr) + mark_divelist_changed(TRUE); + } + dive_table.preexisting = dive_table.nr; + dive_list_update_dives(); } static void parse_argument(const char *arg) @@ -35,6 +157,22 @@ static void parse_argument(const char *arg) case 'v': verbose++; continue; + case '-': + /* long options with -- */ + if (strcmp(arg,"--import") == 0) { + /* mark the dives so far as the base, + * everything after is imported */ + report_dives(FALSE); + imported = TRUE; + return; + } + /* fallthrough */ + case 'p': + /* ignore process serial number argument when run as native macosx app */ + if (strncmp(arg, "-psn_", 5) == 0) { + return; + } + /* fallthrough */ default: fprintf(stderr, "Bad argument '%s'\n", arg); exit(1); @@ -42,61 +180,43 @@ static void parse_argument(const char *arg) } while (*++p); } -static void on_destroy(GtkWidget* w, gpointer data) +void update_dive(struct dive *new_dive) { - gtk_main_quit(); + static struct dive *buffered_dive; + struct dive *old_dive = buffered_dive; + + if (old_dive) { + flush_divelist(old_dive); + } + if (new_dive) { + show_dive_info(new_dive); + show_dive_equipment(new_dive, W_IDX_PRIMARY); + show_dive_stats(new_dive); + } + buffered_dive = new_dive; } -static GtkTreeModel *fill_dive_list(void) +void renumber_dives(int nr) { int i; - GtkListStore *store; - GtkTreeIter iter; - - store = gtk_list_store_new(1, G_TYPE_STRING); for (i = 0; i < dive_table.nr; i++) { struct dive *dive = dive_table.dives[i]; - - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - 0, dive->name, - -1); + dive->number = nr + i; + flush_divelist(dive); } - - return GTK_TREE_MODEL(store); -} - -static GtkWidget *create_dive_list(void) -{ - GtkWidget *list; - GtkCellRenderer *renderer; - GtkTreeModel *model; - - list = gtk_tree_view_new(); - - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(list), - -1, "Dive", renderer, "text", 0, NULL); - - model = fill_dive_list(); - gtk_tree_view_set_model(GTK_TREE_VIEW(list), model); - g_object_unref(model); - return list; + mark_divelist_changed(TRUE); } int main(int argc, char **argv) { int i; - GtkWidget *win; - GtkWidget *divelist; - GtkWidget *vbox; - GtkWidget *scrolled_window; - GtkWidget *frame; + + output_units = SI_units; parse_xml_init(); - gtk_init(&argc, &argv); + init_ui(&argc, &argv); for (i = 1; i < argc; i++) { const char *a = argv[i]; @@ -105,41 +225,20 @@ int main(int argc, char **argv) parse_argument(a); continue; } - parse_xml_file(a); + GError *error = NULL; + parse_file(a, &error); + + if (error != NULL) + { + report_error(error); + g_error_free(error); + error = NULL; + } } - report_dives(); - - win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); - - /* HBOX for the list of dives and cairo window */ - vbox=gtk_hbox_new(FALSE, 5); - gtk_container_set_border_width(GTK_CONTAINER(vbox), 5); - gtk_container_add(GTK_CONTAINER(win), vbox); - gtk_widget_show(vbox); - - /* Scrolled window for the list goes into the vbox.. */ - scrolled_window=gtk_scrolled_window_new(NULL, NULL); - gtk_widget_set_usize(scrolled_window, 150, 350); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_container_add(GTK_CONTAINER(vbox), scrolled_window); - gtk_widget_show(scrolled_window); - - /* Frame for dive profile */ - frame = dive_profile_frame(); - - gtk_container_add(GTK_CONTAINER(vbox), frame); - - /* Create the atual divelist */ - divelist = create_dive_list(); - - /* .. and connect it to the scrolled window */ - gtk_container_add(GTK_CONTAINER(scrolled_window), divelist); - - gtk_widget_set_app_paintable(win, TRUE); - gtk_widget_show_all(win); + report_dives(imported); - gtk_main(); + run_ui(); + exit_ui(); return 0; }