X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=libdivecomputer.c;h=78be2019a4adba9c03461ba5274271506a730f03;hb=c15f798a85db53dae404a9113266a4d2bc72fbc6;hp=c53a81e68201316a5de844e1fbd784d5fecda0e2;hpb=8c18add46b2cc0cdfc8c1095916bce81fbde1f1f;p=ext%2Fsubsurface.git diff --git a/libdivecomputer.c b/libdivecomputer.c index c53a81e..78be201 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -1,26 +1,12 @@ #include -#include #include #include "dive.h" #include "divelist.h" #include "display.h" +#include "display-gtk.h" -/* libdivecomputer */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/* handling uemis Zurich SDA files */ -#include "uemis.h" +#include "libdivecomputer.h" static void error(const char *fmt, ...) { @@ -36,14 +22,6 @@ static void error(const char *fmt, ...) g_error_free(error); } -typedef struct device_data_t { - device_type_t type; - const char *name, *devname; - GtkWidget *progressbar; - device_devinfo_t devinfo; - device_clock_t clock; -} device_data_t; - static parser_status_t create_parser(device_data_t *devdata, parser_t **parser) { switch (devdata->type) { @@ -92,7 +70,7 @@ static parser_status_t create_parser(device_data_t *devdata, parser_t **parser) return mares_nemo_parser_create(parser, devdata->devinfo.model); case DEVICE_TYPE_MARES_ICONHD: - return mares_iconhd_parser_create(parser); + return mares_iconhd_parser_create(parser, devdata->devinfo.model); case DEVICE_TYPE_HW_OSTC: return hw_ostc_parser_create(parser); @@ -140,16 +118,47 @@ static int parse_gasmixes(struct dive *dive, parser_t *parser, int ngases) return PARSER_STATUS_SUCCESS; } -void -sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata) +static void handle_event(struct dive *dive, struct sample *sample, parser_sample_value_t value) { - int i; + int type, time; static const char *events[] = { "none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter", "violation", "bookmark", "surface", "safety stop", "gaschange", "safety stop (voluntary)", "safety stop (mandatory)", "deepstop", "ceiling (safety stop)", "unknown", "divetime", "maxdepth", - "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning"}; + "OLF", "PO2", "airtime", "rgbm", "heading", "tissue level warning" + }; + const int nr_events = sizeof(events) / sizeof(const char *); + const char *name; + + /* + * Just ignore surface events. They are pointless. What "surface" + * means depends on the dive computer (and possibly even settings + * in the dive computer). It does *not* necessarily mean "depth 0", + * so don't even turn it into that. + */ + if (value.event.type == SAMPLE_EVENT_SURFACE) + return; + + /* + * Other evens might be more interesting, but for now we just print them out. + */ + type = value.event.type; + name = "invalid event number"; + if (type < nr_events) + name = events[type]; + + time = value.event.time; + if (sample) + time += sample->time.seconds; + + add_event(dive, time, type, value.event.flags, value.event.value, name); +} + +void +sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata) +{ + int i; struct dive **divep = userdata; struct dive *dive = *divep; struct sample *sample; @@ -177,8 +186,7 @@ sample_cb(parser_sample_type_t type, parser_sample_value_t value, void *userdata sample->temperature.mkelvin = (value.temperature + 273.15) * 1000 + 0.5; break; case SAMPLE_TYPE_EVENT: - printf(" %s\n", - value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]); + handle_event(dive, sample, value); break; case SAMPLE_TYPE_RBT: printf(" %u\n", value.rbt); @@ -208,6 +216,23 @@ static int parse_samples(struct dive **divep, parser_t *parser) return parser_samples_foreach(parser, sample_cb, divep); } +/* + * Check if this dive already existed before the import + */ +static int find_dive(struct dive *dive, device_data_t *devdata) +{ + int i; + + for (i = 0; i < devdata->preexisting; i++) { + struct dive *old = dive_table.dives[i]; + + if (dive->when != old->when) + continue; + return 1; + } + return 0; +} + static int dive_cb(const unsigned char *data, unsigned int size, const unsigned char *fingerprint, unsigned int fsize, void *userdata) @@ -294,15 +319,21 @@ static int dive_cb(const unsigned char *data, unsigned int size, parser_destroy(parser); return rc; } - record_dive(dive); parser_destroy(parser); + + /* If we already saw this dive, abort. */ + if (find_dive(dive, devdata)) + return 0; + + record_dive(dive); return 1; } static device_status_t import_device_data(device_t *device, device_data_t *devicedata) { + devicedata->preexisting = dive_table.nr; return device_foreach(device, dive_cb, devicedata); } @@ -379,8 +410,7 @@ static device_status_t device_open(const char *devname, } } -static void -event_cb(device_t *device, device_event_t event, const void *data, void *userdata) +static void event_cb(device_t *device, device_event_t event, const void *data, void *userdata) { const device_progress_t *progress = (device_progress_t *) data; const device_devinfo_t *devinfo = (device_devinfo_t *) data; @@ -392,7 +422,7 @@ event_cb(device_t *device, device_event_t event, const void *data, void *userdat printf("Event: waiting for user action\n"); break; case DEVICE_EVENT_PROGRESS: - gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(devdata->progressbar), + update_progressbar(&devdata->progress, (double) progress->current / (double) progress->maximum); break; case DEVICE_EVENT_DEVINFO: @@ -462,24 +492,16 @@ static void *pthread_wrapper(void *_data) return (void *)err_string; } -static void do_import(device_data_t *data) +void do_import(device_data_t *data) { pthread_t pthread; void *retval; - if (data->type == DEVICE_TYPE_UEMIS) - return uemis_import(); - - /* I'm sure there is some better interface for waiting on a thread in a gtk main loop */ + /* I'm sure there is some better interface for waiting on a thread in a UI main loop */ import_thread_done = 0; pthread_create(&pthread, NULL, pthread_wrapper, data); while (!import_thread_done) { - while (gtk_events_pending()) { - if (gtk_main_iteration_do(0)) { - import_thread_cancelled = 1; - break; - } - } + import_thread_cancelled = process_ui_events(); usleep(100000); } if (pthread_join(pthread, &retval) < 0) @@ -495,10 +517,7 @@ static void do_import(device_data_t *data) * libdivecomputer tell us what devices it supports, * rather than have the application have to know.. */ -struct device_list { - const char *name; - device_type_t type; -} device_list[] = { +struct device_list device_list[] = { { "Suunto Solution", DEVICE_TYPE_SUUNTO_SOLUTION }, { "Suunto Eon", DEVICE_TYPE_SUUNTO_EON }, { "Suunto Vyper", DEVICE_TYPE_SUUNTO_VYPER }, @@ -520,93 +539,5 @@ struct device_list { { "Cressi Edy", DEVICE_TYPE_CRESSI_EDY }, { "Zeagle N2iTiON 3", DEVICE_TYPE_ZEAGLE_N2ITION3 }, { "Atomics Cobalt", DEVICE_TYPE_ATOMICS_COBALT }, - { "Uemis Zurich SDA", DEVICE_TYPE_UEMIS }, { NULL } }; - -static void fill_computer_list(GtkListStore *store) -{ - GtkTreeIter iter; - struct device_list *list = device_list; - - for (list = device_list ; list->name ; list++) { - gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - 0, list->name, - 1, list->type, - -1); - } -} - -static GtkComboBox *dive_computer_selector(GtkWidget *dialog) -{ - GtkWidget *hbox, *combo_box; - GtkListStore *model; - GtkCellRenderer *renderer; - - hbox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, FALSE, 3); - - model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT); - fill_computer_list(model); - - combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); - gtk_box_pack_start(GTK_BOX(hbox), combo_box, FALSE, TRUE, 3); - - renderer = gtk_cell_renderer_text_new(); - gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), renderer, TRUE); - gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), renderer, "text", 0, NULL); - - return GTK_COMBO_BOX(combo_box); -} - -void import_dialog(GtkWidget *w, gpointer data) -{ - int result; - GtkWidget *dialog, *hbox; - GtkComboBox *computer; - device_data_t devicedata = { - .devname = "/dev/ttyUSB0", - }; - - dialog = gtk_dialog_new_with_buttons("Import from dive computer", - GTK_WINDOW(main_window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, - NULL); - - computer = dive_computer_selector(dialog); - - hbox = gtk_hbox_new(FALSE, 6); - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox, FALSE, TRUE, 3); - devicedata.progressbar = gtk_progress_bar_new(); - gtk_container_add(GTK_CONTAINER(hbox), devicedata.progressbar); - - gtk_widget_show_all(dialog); - result = gtk_dialog_run(GTK_DIALOG(dialog)); - switch (result) { - int type; - GtkTreeIter iter; - GtkTreeModel *model; - const char *comp; - case GTK_RESPONSE_ACCEPT: - if (!gtk_combo_box_get_active_iter(computer, &iter)) - break; - model = gtk_combo_box_get_model(computer); - gtk_tree_model_get(model, &iter, - 0, &comp, - 1, &type, - -1); - devicedata.type = type; - devicedata.name = comp; - do_import(&devicedata); - break; - default: - break; - } - gtk_widget_destroy(dialog); - - report_dives(); - dive_list_update_dives(dive_list); -}