X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=uemis.c;h=25d1b8ab76a7f215c61dbed5b746b49a51ac9bf7;hb=ed157e4288d10cd5e42cce8afe4498bcefc15b6a;hp=5cede0facce9b161bde15db1e1ab2b8903cff38e;hpb=fa76733d255b32ecaabc600c8d582b8baa9d27c2;p=ext%2Fsubsurface.git

diff --git a/uemis.c b/uemis.c
index 5cede0f..25d1b8a 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"
 
 /*
@@ -189,9 +186,30 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
 	uint8_t *data;
 	struct sample *sample;
 	struct dive *dive = *divep;
+	int template, gasoffset;
 
 	datalen = uemis_convert_base64(base64, &data);
 
+	/* dive template in use:
+	   0 = air
+	   1 = nitrox (B)
+	   2 = nitrox (B+D)
+	   3 = nitrox (B+T+D)
+	   uemis cylinder data is insane - it stores seven tank settings in a block
+	   and the template tells us which of the four groups of tanks we need to look at
+	 */
+	gasoffset = template = *(uint8_t *)(data+115);
+	if (template == 3)
+		gasoffset = 4;
+	for (i = 0; i < template; i++) {
+		float volume = *(float *)(data+116+25*(gasoffset + i)) * 1000.0;
+		/* uemis always assumes a working pressure of 3000psi / 206bar - even though that's wrong */
+		/* I also think that the unit that it stores (cuft for me) might change with SDA settings */
+		// dive->cylinder[i].type.size.mliter = volume * 206.84 / 28.317;
+		dive->cylinder[i].type.size.mliter = volume * 200 / 28.317;
+		dive->cylinder[i].gasmix.o2.permille = *(uint8_t *)(data+120+25*(gasoffset + i)) * 10 + 0.5;
+		dive->cylinder[i].gasmix.he.permille = 0;
+	}
 	/* first byte of divelog data is at offset 0x123 */
 	i = 0x123;
 	while ((i < datalen) && (*(uint16_t *)(data+i))) {
@@ -202,20 +220,24 @@ static void parse_divelog_binary(char *base64, struct dive **divep) {
 		if (*(uint16_t *)(data+i) > dive->duration.seconds + 180)
 			break;
 		sample = prepare_sample(divep);
+		dive = *divep; /* prepare_sample might realloc the dive */
 		sample->time.seconds = *(uint16_t *)(data+i);
 		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);
+		finish_sample(dive, 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;
@@ -245,7 +267,7 @@ parse_uemis_file(char *divelogfilename,GError **error) {
 	dive->maxdepth.mm = pressure_to_depth(atoi(found));
 
 	if (! matchit(divelogfile,"<val key=\"file_content\">",
-			">\\([a-zA-Z0-9+/]*\\)<", &found)) {
+			">\\([a-zA-Z0-9+/=]*\\)<", &found)) {
 		/* some error handling */
 		goto bail;
 	}
@@ -261,40 +283,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);
-}
+}