X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=main.c;h=57c8f70e66a92a67c22c263a9c2ca737e378313a;hb=31123f63af0a2b6a9756b8496f56359d1c68a645;hp=96149d38c870d75f62163edf5c705d9f2763d65e;hpb=5f05173e793d49319c727240014b59a04bd4075c;p=ext%2Fsubsurface.git diff --git a/main.c b/main.c index 96149d3..57c8f70 100644 --- a/main.c +++ b/main.c @@ -20,156 +20,6 @@ static int sortfn(const void *_a, const void *_b) return 0; } -static int alloc_samples; - -/* Don't pick a zero for MERGE_MIN() */ -#define MERGE_MAX(res, a, b, n) res->n = MAX(a->n, b->n) -#define MERGE_MIN(res, a, b, n) res->n = (a->n)?(b->n)?MIN(a->n, b->n):(a->n):(b->n) - -static struct dive *add_sample(struct sample *sample, int time, struct dive *dive) -{ - int nr = dive->samples; - struct sample *d; - - if (nr >= alloc_samples) { - alloc_samples = (alloc_samples + 64) * 3 / 2; - dive = realloc(dive, dive_size(alloc_samples)); - if (!dive) - return NULL; - } - dive->samples = nr+1; - d = dive->sample + nr; - - *d = *sample; - d->time.seconds = time; - return dive; -} - -/* - * Merge samples. Dive 'a' is "offset" seconds before Dive 'b' - */ -static struct dive *merge_samples(struct dive *res, struct dive *a, struct dive *b, int offset) -{ - int asamples = a->samples; - int bsamples = b->samples; - struct sample *as = a->sample; - struct sample *bs = b->sample; - - for (;;) { - int at, bt; - struct sample sample; - - if (!res) - return NULL; - - at = asamples ? as->time.seconds : -1; - bt = bsamples ? bs->time.seconds + offset : -1; - - /* No samples? All done! */ - if (at < 0 && bt < 0) - return res; - - /* Only samples from a? */ - if (bt < 0) { -add_sample_a: - res = add_sample(as, at, res); - as++; - asamples--; - continue; - } - - /* Only samples from b? */ - if (at < 0) { -add_sample_b: - res = add_sample(bs, bt, res); - bs++; - bsamples--; - continue; - } - - if (at < bt) - goto add_sample_a; - if (at > bt) - goto add_sample_b; - - /* same-time sample: add a merged sample. Take the non-zero ones */ - sample = *bs; - if (as->depth.mm) - sample.depth = as->depth; - if (as->temperature.mkelvin) - sample.temperature = as->temperature; - if (as->tankpressure.mbar) - sample.tankpressure = as->tankpressure; - if (as->tankindex) - sample.tankindex = as->tankindex; - - res = add_sample(&sample, at, res); - - as++; - bs++; - asamples--; - bsamples--; - } -} - -static char *merge_text(const char *a, const char *b) -{ - char *res; - - if (!a || !*a) - return (char *)b; - if (!b || !*b) - return (char *)a; - if (!strcmp(a,b)) - return (char *)a; - res = malloc(strlen(a) + strlen(b) + 9); - if (!res) - return (char *)a; - sprintf(res, "(%s) or (%s)", a, b); - return res; -} - -/* - * This could do a lot more merging. Right now it really only - * merges almost exact duplicates - something that happens easily - * with overlapping dive downloads. - */ -static struct dive *try_to_merge(struct dive *a, struct dive *b) -{ - int i; - struct dive *res; - - if (a->when != b->when) - return NULL; - - alloc_samples = 5; - res = malloc(dive_size(alloc_samples)); - if (!res) - return NULL; - memset(res, 0, dive_size(alloc_samples)); - - res->when = a->when; - res->name = merge_text(a->name, b->name); - res->location = merge_text(a->location, b->location); - res->notes = merge_text(a->notes, b->notes); - MERGE_MAX(res, a, b, maxdepth.mm); - MERGE_MAX(res, a, b, meandepth.mm); /* recalc! */ - MERGE_MAX(res, a, b, duration.seconds); - MERGE_MAX(res, a, b, surfacetime.seconds); - MERGE_MAX(res, a, b, airtemp.mkelvin); - MERGE_MIN(res, a, b, watertemp.mkelvin); - MERGE_MAX(res, a, b, beginning_pressure.mbar); - MERGE_MAX(res, a, b, end_pressure.mbar); - for (i = 0; i < MAX_MIXES; i++) { - if (a->gasmix[i].o2.permille) { - res->gasmix[i] = a->gasmix[i]; - continue; - } - res->gasmix[i] = b->gasmix[i]; - } - return merge_samples(res, a, b, 0); -} - /* * This doesn't really report anything at all. We just sort the * dives, the GUI does the reporting @@ -278,25 +128,45 @@ static void file_save(GtkWidget *w, gpointer data) gtk_widget_destroy(dialog); } -static GtkItemFactoryEntry menu_items[] = { - { "/_File", NULL, NULL, 0, "" }, - { "/File/_Open", "O", file_open, 0, "", GTK_STOCK_OPEN }, - { "/File/_Save", "S", file_save, 0, "", GTK_STOCK_SAVE }, +static void quit(GtkWidget *w, gpointer data) +{ + gtk_main_quit(); +} + +static GtkActionEntry menu_items[] = { + { "FileMenuAction", GTK_STOCK_FILE, "File", NULL, NULL, NULL}, + { "OpenFile", GTK_STOCK_OPEN, NULL, "O", NULL, G_CALLBACK(file_open) }, + { "SaveFile", GTK_STOCK_SAVE, NULL, "S", NULL, G_CALLBACK(file_save) }, + { "Quit", GTK_STOCK_QUIT, NULL, "Q", NULL, G_CALLBACK(quit) }, }; static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]); -/* This is just directly from the gtk menubar tutorial. */ +static const gchar* ui_string = " \ + \ + \ + \ + \ + \ + \ + \ + \ + \ +"; + static GtkWidget *get_menubar_menu(GtkWidget *window) { - GtkItemFactory *item_factory; - GtkAccelGroup *accel_group; + GtkActionGroup *action_group = gtk_action_group_new("Menu"); + gtk_action_group_add_actions(action_group, menu_items, nmenu_items, 0); - accel_group = gtk_accel_group_new(); - item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "
", accel_group); + GtkUIManager *ui_manager = gtk_ui_manager_new(); + gtk_ui_manager_insert_action_group(ui_manager, action_group, 0); + GError* error = 0; + gtk_ui_manager_add_ui_from_string(GTK_UI_MANAGER(ui_manager), ui_string, -1, &error); - gtk_item_factory_create_items(item_factory, nmenu_items, menu_items, NULL); - gtk_window_add_accel_group(GTK_WINDOW(window), accel_group); - return gtk_item_factory_get_widget(item_factory, "
"); + gtk_window_add_accel_group(GTK_WINDOW(window), gtk_ui_manager_get_accel_group(ui_manager)); + GtkWidget* menu = gtk_ui_manager_get_widget(ui_manager, "/MainMenu"); + + return menu; } int main(int argc, char **argv) @@ -304,9 +174,11 @@ int main(int argc, char **argv) int i; GtkWidget *win; GtkWidget *divelist; - GtkWidget *table; + GtkWidget *paned; + GtkWidget *info_box; GtkWidget *notebook; GtkWidget *frame; + GtkWidget *dive_info; GtkWidget *menubar; GtkWidget *vbox; @@ -327,7 +199,7 @@ int main(int argc, char **argv) report_dives(); win = gtk_window_new(GTK_WINDOW_TOPLEVEL); - g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); + g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL); main_window = win; vbox = gtk_vbox_new(FALSE, 0); @@ -336,34 +208,33 @@ int main(int argc, char **argv) menubar = get_menubar_menu(win); 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, TRUE, TRUE, 0); - gtk_widget_show(table); + /* HPane for left the dive list, and right the dive info */ + paned = gtk_hpaned_new(); + gtk_box_pack_end(GTK_BOX(vbox), paned, TRUE, TRUE, 0); /* Create the atual divelist */ divelist = create_dive_list(); - gtk_table_attach(GTK_TABLE(table), divelist, 0, 1, 0, 2, - 0, GTK_FILL | GTK_SHRINK | GTK_EXPAND, 0, 0); + gtk_paned_add1(GTK_PANED(paned), divelist); + + /* VBox for dive info, and tabs */ + info_box = gtk_vbox_new(FALSE, 5); + gtk_paned_add2(GTK_PANED(paned), info_box); /* 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); + gtk_box_pack_start(GTK_BOX(info_box), frame, FALSE, TRUE, 5); /* Notebook for dive info vs profile vs .. */ notebook = gtk_notebook_new(); - gtk_table_attach_defaults(GTK_TABLE(table), notebook, 1, 2, 1, 2); + gtk_box_pack_start(GTK_BOX(info_box), notebook, TRUE, TRUE, 5); /* Frame for dive profile */ - frame = dive_profile_frame(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Dive Profile")); - dive_profile = frame; + dive_profile = dive_profile_widget(); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_profile, gtk_label_new("Dive Profile")); /* Frame for extended dive info */ - frame = extended_dive_info_frame(); - gtk_notebook_append_page(GTK_NOTEBOOK(notebook), frame, gtk_label_new("Extended dive Info")); + dive_info = extended_dive_info_widget(); + gtk_notebook_append_page(GTK_NOTEBOOK(notebook), dive_info, gtk_label_new("Extended dive Info")); gtk_widget_set_app_paintable(win, TRUE); gtk_widget_show_all(win);