X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=uemis.c;h=c390aae3b74635fa67466db2094030d4a99ce8bd;hb=f459c2ec22839a4a208ea833bdb1e0b87a6799b4;hp=7f431cba6b82e2599e5abb21a010a3082ca28237;hpb=9ddef6854e8f54cd8d1431c15ba37c2c18d32ca7;p=ext%2Fsubsurface.git

diff --git a/uemis.c b/uemis.c
index 7f431cb..c390aae 100644
--- a/uemis.c
+++ b/uemis.c
@@ -16,10 +16,7 @@
 #include <time.h>
 #include <regex.h>
 
-#include <gtk/gtk.h>
-
 #include "dive.h"
-#include "display.h"
 #include "uemis.h"
 
 /*
@@ -134,6 +131,24 @@ int matchit(FILE *infd, char *regex, char *typeregex, char **found) {
 	return 0;
 }
 
+/*
+ * pressure_to_depth: In centibar. And when converting to
+ * depth, I'm just going to always use saltwater, because I
+ * think "true depth" is just stupid. From a diving standpoint,
+ * "true depth" is pretty much completely pointless, unless
+ * you're doing some kind of underwater surveying work.
+ *
+ * So I give water depths in "pressure depth", always assuming
+ * salt water. So one atmosphere per 10m.
+ */
+static int pressure_to_depth(uint16_t value)
+{
+	double atm, cm;
+
+	atm = (value / 100.0) / 1.01325;
+	cm = 100 * atm + 0.5;
+	return( (cm > 0) ? 10 * (long)cm : 0);
+}
 
 /*
  * convert the base64 data blog
@@ -170,6 +185,7 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
 	int i;
 	uint8_t *data;
 	struct sample *sample;
+	struct dive *dive = *divep;
 
 	datalen = uemis_convert_base64(base64, &data);
 
@@ -177,20 +193,29 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
 	i = 0x123;
 	while ((i < datalen) && (*(uint16_t *)(data+i))) {
 		/* it seems that a dive_time of 0 indicates the end of the valid readings */
+		/* the SDA usually records more samples after the end of the dive --
+		 * we want to discard those, but not cut the dive short; sadly the dive
+		 * duration in the header is a) in minutes and b) up to 3 minutes short */
+		if (*(uint16_t *)(data+i) > dive->duration.seconds + 180)
+			break;
 		sample = prepare_sample(divep);
 		sample->time.seconds = *(uint16_t *)(data+i);
-		sample->depth.mm = (*(uint16_t *)(data+i+2) - 100) / 0.101428571 + 0.5;
+		sample->depth.mm = pressure_to_depth(*(uint16_t *)(data+i+2));
 		sample->temperature.mkelvin = (*(uint16_t *)(data+i+4) * 100) + 273150;
 		sample->cylinderpressure.mbar= *(uint16_t *)(data+i+23) * 10;
 		sample->cylinderindex = *(uint8_t *)(data+i+22);
 		finish_sample(*divep, sample);
 		i += 0x25;
 	}
+	dive->duration.seconds = sample->time.seconds - 1;
 	return;
 }
 
+/* parse a single file
+ * TODO: we don't report any errors when the parse fails - we simply don't add them to the list
+ */
 void
-parse_uemis_file(char *divelogfilename,GError **error) {
+parse_uemis_file(char *divelogfilename) {
 	char *found=NULL;
 	struct tm tm;
 	struct dive *dive;
@@ -217,7 +242,7 @@ parse_uemis_file(char *divelogfilename,GError **error) {
 		/* some error handling */
 		goto bail;
 	}
-	dive->maxdepth.mm = atof(found) / 0.10143 + 0.5;
+	dive->maxdepth.mm = pressure_to_depth(atoi(found));
 
 	if (! matchit(divelogfile,"<val key=\"file_content\">",
 			">\\([a-zA-Z0-9+/]*\\)<", &found)) {
@@ -236,40 +261,7 @@ bail:
  */
 void
 uemis_import() {
-	GtkWidget *dialog;
-	GtkFileFilter *filter = gtk_file_filter_new ();
-	gtk_file_filter_add_pattern (filter, "*.SDA");
-	gtk_file_filter_set_name(filter, "uemis Zurich SDA files");
-	dialog = gtk_file_chooser_dialog_new("Open File",
-					GTK_WINDOW(main_window),
-					GTK_FILE_CHOOSER_ACTION_OPEN,
-					GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-					GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-					NULL);
-	gtk_file_chooser_set_select_multiple(GTK_FILE_CHOOSER(dialog), TRUE);
-	gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter);
-
-	if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
-		GSList *filenames;
-		char *filename;
-		filenames = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog));
-
-		GError *error = NULL;
-		while(filenames != NULL) {
-			filename = (char *)filenames->data;
-			parse_uemis_file(filename, &error);
-			if (error != NULL)
-			{
-				report_error(error);
-				g_error_free(error);
-				error = NULL;
-			}
-
-			g_free(filename);
-			filenames = g_slist_next(filenames);
-		}
-		g_slist_free(filenames);
+	if (open_import_file_dialog("*.SDA","uemis Zurich SDA files",
+					&parse_uemis_file))
 		report_dives();
-	}
-	gtk_widget_destroy(dialog);
-}
+}