[PATCH] Import Datatrak/WLog files

Salvador Cuñat salvador.cunat at gmail.com
Sun Oct 26 13:23:19 PDT 2014


Sequentially parses a file, expected to be a Datatrak/WLog divelog, and
converts the dive info into Subsurface's dive structure.

As my first DC, back in 90s, was an Aladin Air X, the obvious choice of log
software was DTrak (Win version). After using it for some time we moved to WLog
(shareware software more user friendly than Dtrak, printing capable, and still
better, it runs under wine, which, as linux user, was definitive for me). Then,
some years later, my last Aladin died and I moved to an OSTC, forcing me to
look for a software that support this DC.
I found JDivelog which was capable of import Dtrak logs and used it for some
time until discovered Subsurface existence and devoted to it.

The fact was that importing Dtrak dives in JDivelog and then re-importing them
in Subsurface caused a significant data loss (mainly in the profile events and
alarms) and weird location of some other info in the dive notes (mostly tag
items in the original Dtrak software). This situation can't actually be solved
with tools like divelogs.de which causes similar if no greater data loss.

Although this won't be a core feature for Subsurface, I expect it can be useful
for some other divers as has been for me.

Comments an issues:

Datatrak/Wlog files include a lot of diving data which are not directly
supported in Subsurface, in these cases we choose mostly to use "tags".

The lack of some important info in Datatrak archives (e.g. tank's initial
pressure) forces us to do some arbitrary assumptions (e.g. initial pressure =
200 bar).

There might be archives coming directly from old DOS days, as first versions
of Datatrak run on that OS; they were coded CP437 or CP850, while dive logs
coming from Win versions seems to be coded CP1252. Finally, Wlog seems to use a
mixed confusing style. Program directly converts some of the old encoded chars
to iso8859 but is expected there be some issues with non alphabetic chars, e.g.
"ª".

There are two text fields: "Other activities" and "Dive notes", both limited to
256 char size. We have merged them in Subsurface's "Dive Notes" although the
first one could be "tagged", but we're unsure that the user had filled it in
a tag friendly way.

WLog adds some information to the dive and lets the user to write more than
256 chars notes. This is achieved, while keeping compatibility with DTrak
divelogs, by adding a complementary file named equally as the .log file and
with .add extension where all this info is stored.  We have, still, not worked
with this complementary files.

This work is based on the paper referenced in butracker #194 which has some
errors (e.g. beginning of log and beginning of dive are changed) and a lot of
bytes of unknown meaning. Example.log shows, at least, one more byte than those
referred in the paper for the O2 Aladin computer, this could be a byte referred
to the use of SCR but the lack of an OC dive with O2 computer makes impossible
for us to compare.

The only way we have figured out to distinguish a priori between SCR and non
SCR dives with O2 computers is that the dives are tagged with a "rebreather"
tag. Obviously this is not a very trusty way of doing things. In SCR dives,
the O2% in mix means, probably, the maximum O2% in the circuit, not the O2%
of the EAN mix in the tanks, which would be unknown in this case.

The list of DCs related in bug #194 paper seems incomplete, we have added
one or two from WLog and discarded those which are known to exist but whose
model is unknown, grouping them under the imaginative name of "unknown". The
list can easily be increased in the future if we ever know the models
identifiers.
BTW, in Example.log, 0x00 identifier is used for some DC dives and from my own
divelogs is inferred that 0x00 is used for manually entered dives, this could
easily be an error in Example.log coming from a preproduction DC model.

Example.log which is shipped in datatrak package is included in dives
directory for testing pourposes.

Signed-off-by: Salvador Cuñat <salvador.cunat at gmail.com>
---
 datatrak.c           |  724 ++++++++++++++++++++++++++++++++++++++++++++++++++
 datatrak.h           |   35 +++
 dives/Example.log    |  Bin 0 -> 26340 bytes
 file.c               |    7 +
 qt-ui/mainwindow.cpp |    4 +-
 subsurface.pro       |    6 +-
 6 files changed, 773 insertions(+), 3 deletions(-)
 create mode 100644 datatrak.c
 create mode 100644 datatrak.h
 create mode 100644 dives/Example.log

diff --git a/datatrak.c b/datatrak.c
new file mode 100644
index 0000000..3c11659
--- /dev/null
+++ b/datatrak.c
@@ -0,0 +1,724 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+#include "datatrak.h"
+#include "dive.h"
+#include "units.h"
+#include "device.h"
+#include "gettext.h"
+#include "time.h"
+
+unsigned char lector_bytes[2], lector_word[4], tmp_1byte, *byte;
+int tmp_2bytes, is_nitrox, is_O2, is_SCR;
+long tmp_4bytes;
+
+
+static int two_bytes_to_int(unsigned char x, unsigned char y) {
+
+	return (x << 8) + y;
+}
+
+static long four_bytes_to_long(unsigned char x, unsigned char y, unsigned char z, unsigned char t) {
+
+	return (((long)x << 24) + ((long)y << 16) + ((long)z << 8) + ((long)t));
+}
+
+static unsigned char* byte_to_bits(unsigned char byte) {
+
+	unsigned char i, *bits = (unsigned char*) malloc(8 * sizeof(unsigned char));
+
+	for (i = 0; i < 8; i++) {
+		bits[i] = (byte & (unsigned char) pow(2,i))/pow(2,i);
+	}
+	return bits;
+}
+
+static time_t date_time_to_ssrfc(long date, int time) {
+
+	time_t tmp;
+	tmp = ((date -135140)*86400)+(time*60);
+	return tmp;
+}
+
+static unsigned char to_8859(unsigned char char_cp850) {
+	unsigned char outchar;
+	unsigned char char_8859[46] = {0xc7, 0xfc, 0xe9, 0xe2, 0xe4, 0xe0, 0xe5, 0xe7,
+				      0xea, 0xeb, 0xe8, 0xef, 0xee, 0xec, 0xc4, 0xc5,
+				      0xc9, 0xe6, 0xc6, 0xf4, 0xf6, 0xf2, 0xfb, 0xf9,
+				      0xff, 0xd6, 0xdc, 0xf8, 0xa3, 0xd8, 0xd7, 0x66,
+				      0xe1, 0xed, 0xf3, 0xfa, 0xf1, 0xd1, 0xaa, 0xba,
+				      0xbf, 0xae, 0xac, 0xbd, 0xbc, 0xa1};
+	outchar = char_8859[char_cp850 - 0x80];
+	return (outchar);
+}
+
+static char *to_utf8(unsigned char *in_string) {
+	int outlen, inlen, i=0, j=0;
+	inlen = strlen(in_string);
+	outlen = (inlen * 2)+1;
+
+	char *out_string = calloc(outlen, sizeof(char));
+	for (i = 0; i < inlen; i++) {
+		if (in_string[i] < 127) {
+			out_string[j] = in_string[i];
+		} else {
+			if (in_string[i] > 127 && in_string[i] <= 173) {
+				in_string[i] = to_8859(in_string[i]);
+			}
+			out_string[j] = (in_string[i] >> 6) | 0xC0;
+			j++;
+			out_string[j] = (in_string[i] & 0x3F) | 0x80;
+		}
+		j++;
+	}
+	out_string[j+1] = '\0';
+	return(out_string);
+}
+
+/*
+ * Shameless copy paste from dive.c add_sample() with ligth changes
+ */
+static struct sample *add_dt_sample(int time, struct divecomputer *dc)
+{
+	struct sample *p = prepare_sample(dc);
+
+	if (p) {
+		p->time.seconds = time;
+		finish_sample(dc);
+	}
+	return p;
+}
+
+/*
+ * Subsurface sample structure doesn't support the flags and alarms in the dt .log
+ * so will treat them as dc events.
+ */
+static struct sample *dtrak_profile(int samplenum, int o2percent, struct dive *dt_dive, FILE* archivo) {
+
+	int i, j = 1, interval;
+	struct sample *dtsample;
+	struct divecomputer *dc = &dt_dive->dc;
+
+	for (i = 1; i <= samplenum; i++) {
+		fread(&lector_bytes, sizeof(unsigned char), 2, archivo);
+		interval= 20*(i+1);
+		dtsample = add_dt_sample(interval, dc);
+		dtsample->depth.mm = ((two_bytes_to_int(lector_bytes[0],lector_bytes[1]) & 0xFFC0)*1000/410);
+		byte = byte_to_bits(two_bytes_to_int(lector_bytes[0],lector_bytes[1]) & 0x003F);
+		if (byte[0] == 1){
+			dtsample->in_deco = true;
+		}
+		if (byte[1] == 1){
+			add_event(dc, dtsample->time.seconds, 0, 0, 0, "rbt");
+		}
+		if (byte[2] == 1){
+			add_event(dc, dtsample->time.seconds, 0, 0, 0, "ascent");
+		}
+		if (byte[3] == 1){
+			add_event(dc, dtsample->time.seconds, 0, 0, 0, "ceiling");
+		}
+		if (byte[4] == 1){
+			add_event(dc, dtsample->time.seconds, 0, 0, 0, "workload");
+		}
+		if (byte[5] == 1){
+			add_event(dc, dtsample->time.seconds, 0, 0, 0, "transmitter");
+		}
+		if (j == 3) {
+			read_bytes (1);
+			if (is_O2) {
+				read_bytes (1);
+				o2percent = tmp_1byte;
+			}
+			j = 0;
+		}
+		if (is_O2) {
+			// In commit 5f44fdd setpoint replaced po2, so although this is not necesarily CCR dive ...
+			dtsample->setpoint.mbar = calculate_depth_to_mbar(dtsample->depth.mm, dt_dive->surface_pressure, 0) * o2percent / 100;
+		}
+		j++;
+	}
+	return (dtsample);
+}
+
+/*
+ * Reads the header of a file and returns the header struct
+ * If it's not a DATATRAK file returns header zero initalized
+ */
+static dtrakheader read_file_header(FILE* archivo) {
+
+	dtrakheader fileheader = {0,0,0,0};
+	const short headerbytes = 12;
+	unsigned char *lector = (unsigned char *) malloc(headerbytes * sizeof(unsigned char));
+
+	fread(lector, sizeof(unsigned char), headerbytes, archivo);
+	if (two_bytes_to_int (lector[0],lector[1]) != 0xA100) {
+		puts ("Error, el archivo no parece un divelog DATATRAK");
+		return (fileheader);
+	}
+	fileheader.header = (lector[0] << 8) + lector[1];
+	fileheader.dc_serial_1 = two_bytes_to_int(lector[2], lector[3]);
+	fileheader.dc_serial_2 = two_bytes_to_int(lector[4], lector[5]);
+	fileheader.divesNum = two_bytes_to_int (lector[7], lector[6]);
+	free (lector);
+	return (fileheader);
+}
+
+
+/*
+ * Parses the dive extracting its data and filling a subsurface's dive structure
+ */
+static struct dive dt_dive_parser (FILE* archivo, struct dive *dt_dive) {
+
+	unsigned char n;
+	int  profile_length;
+	char *tmp_notes_str = NULL;
+	unsigned char	*tmp_string1 = NULL,
+			*locality = NULL,
+			*dive_point = NULL,
+			buffer[1024];
+	struct divecomputer *dc = &dt_dive->dc;
+
+	is_nitrox = is_O2 = is_SCR = 0;
+
+	/*
+	 * Parse byte to byte till next dive entry
+	 */
+	n = 0;
+	fread(&lector_bytes[n], sizeof(char), 1, archivo);
+	while (lector_bytes[n] != 0xA0) {
+		fread(&lector_bytes[n], sizeof(char), 1, archivo);
+	}
+
+	/*
+	 * Found dive header 0xA000, verify second byte
+	 */
+	fread(&lector_bytes[n+1], sizeof(char), 1, archivo);
+	if (two_bytes_to_int (lector_bytes[0],lector_bytes[1]) != 0xA000) {
+		printf("ERROR, Byte = %4x\n", two_bytes_to_int (lector_bytes[0],lector_bytes[1]));
+		dt_dive = NULL;
+		return (*dt_dive);
+	}
+
+	/*
+	 * Begin parsing
+	 * First, Date of dive, 4 bytes
+	 */
+	read_bytes(4);
+
+
+	/*
+	 * Next, Time in minutes since 00:00
+	 */
+	read_bytes(2);
+
+	dt_dive->dc.when = dt_dive->when = (timestamp_t) date_time_to_ssrfc(tmp_4bytes, tmp_2bytes);
+
+	/*
+	 * Now, Locality, 1st byte is long of string, rest is string
+	 */
+	read_bytes(1);
+	read_string(locality);
+
+	/*
+	 * Next, Dive point, defined as Locality
+	 */
+	read_bytes(1);
+	read_string(dive_point);
+
+	/*
+	 * Subsurface only have a location variable, so we have to merge DTrak's
+	 * Locality and Dive points.
+	 */
+	snprintf(buffer,sizeof(buffer), "%s, %s", locality, dive_point);
+	dt_dive->location = strdup(buffer);
+	memset(dive_point, 0, sizeof(dive_point));
+	memset(locality, 0, sizeof(locality));
+	free(locality);
+	free(dive_point);
+
+	/*
+	 * Altitude. Don't exist in Subsurface, the equivalent would be
+	 * surface air pressure which can, be calculated from altitude.
+	 * As dtrak registers altitude intervals, we, arbitrarily, choose
+	 * the lower altitude/pressure equivalence for each segment.
+	 */
+	read_bytes(1);
+	switch (tmp_1byte) {
+		case 1:
+			dt_dive->dc.surface_pressure.mbar = 1013;
+			break;
+		case 2:
+			dt_dive->dc.surface_pressure.mbar = 928;
+			break;
+		case 3:
+			dt_dive->dc.surface_pressure.mbar = 806;
+			break;
+		case 4:
+			dt_dive->dc.surface_pressure.mbar = 684;
+			break;
+		default:
+			dt_dive->dc.surface_pressure.mbar = 1013;
+	}
+
+	/*
+	 * Interval (minutes)
+	 */
+	read_bytes(2);
+	if (tmp_2bytes != 0x7FFF) {
+		dt_dive->dc.surfacetime.seconds = (uint32_t) tmp_2bytes * 60;
+	}
+
+	/*
+	 * Weather, values table, 0 to 6
+	 * Subsurface don't have this record but we can use tags
+	 */
+	dt_dive->tag_list = NULL;
+
+	read_bytes(1);
+	switch (tmp_1byte) {
+		case 1:
+			taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","clear")));
+			break;
+		case 2:
+			taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","misty")));
+			break;
+		case 3:
+			taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","fog")));
+			break;
+		case 4:
+			taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","rain")));
+			break;
+		case 5:
+			taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","storm")));
+			break;
+		case 6:
+			taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","snow")));
+			break;
+		default:
+			// unknown, do nothing
+			break;
+	}
+
+	/*
+	 * Air Temperature
+	 */
+	read_bytes(2);
+	if (tmp_2bytes != 0x7FFF) {
+		dt_dive->dc.airtemp.mkelvin = C_to_mkelvin((double)(tmp_2bytes/100));
+	}
+
+	/*
+	 * Dive suit, values table, 0 to 6
+	 */
+	read_bytes(1);
+	switch (tmp_1byte) {
+		case 1:
+			dt_dive->suit = strdup(QT_TRANSLATE_NOOP("gettextFromC","No suit"));
+			break;
+		case 2:
+			dt_dive->suit = strdup(QT_TRANSLATE_NOOP("gettextFromC","Shorty"));
+			break;
+		case 3:
+			dt_dive->suit = strdup(QT_TRANSLATE_NOOP("gettextFromC","Combi"));
+			break;
+		case 4:
+			dt_dive->suit = strdup(QT_TRANSLATE_NOOP("gettextFromC","Wet suit"));
+			break;
+		case 5:
+			dt_dive->suit = strdup(QT_TRANSLATE_NOOP("gettextFromC","Semidry suit"));
+			break;
+		case 6:
+			dt_dive->suit = strdup(QT_TRANSLATE_NOOP("gettextFromC","Dry suit"));
+			break;
+		default:
+			// unknown, do nothing
+			break;
+	    }
+
+	/*
+	 * Tank, volume size in liter*100. And initialize gasmix to air (default).
+	 * Dtrak don't record init and end pressures, but consumed bar, so let's
+	 * init a default pressure of 200 bar.
+	 */
+	read_bytes(2);
+	if (tmp_2bytes != 0x7FFF) {
+		dt_dive->cylinder[0].type.size.mliter = tmp_2bytes*10;
+		dt_dive->cylinder[0].type.description = strdup("");
+		dt_dive->cylinder[0].start.mbar = 200000;
+		dt_dive->cylinder[0].gasmix.he.permille = 0;
+		dt_dive->cylinder[0].gasmix.o2.permille = 210;
+		dt_dive->cylinder[0].manually_added = true;
+	}
+
+	/*
+	 * Maximum depth, in cm.
+	 */
+	read_bytes(2);
+	if (tmp_2bytes != 0x7FFF) {
+		dt_dive->maxdepth.mm = dt_dive->dc.maxdepth.mm = (int32_t) tmp_2bytes * 10;
+	}
+
+	/*
+	 * Dive time in minutes.
+	 */
+	read_bytes(2);
+	if (tmp_2bytes != 0x7FFF) {
+		dt_dive->duration.seconds = dt_dive->dc.duration.seconds = (uint32_t) tmp_2bytes * 60;
+	}
+
+	/*
+	 * Minimum water temperature in C*100. If unknown, set to 0K which
+	 * is subsurface's value for "unknown"
+	 */
+	read_bytes(2);
+	if (tmp_2bytes != 0x7fff) {
+		dt_dive->watertemp.mkelvin = dt_dive->dc.watertemp.mkelvin = C_to_mkelvin((double)(tmp_2bytes/100));
+	} else {
+		dt_dive->watertemp.mkelvin = 0;
+	}
+
+	/*
+	 * Air used in bar*100.
+	 */
+	read_bytes(2);
+	if ((tmp_2bytes != 0x7FFF) && (dt_dive->cylinder[0].type.size.mliter)) {
+		dt_dive->cylinder[0].gas_used.mliter = dt_dive->cylinder[0].type.size.mliter * (tmp_2bytes / 100.0);
+	}
+
+	/*
+	 * Dive Type 1 -  Bit table. Subsurface don't have this record, but
+	 * will use tags. Bits 0 and 1 are not used. Reuse coincident tags.
+	 */
+	read_bytes(1);
+	byte = byte_to_bits(tmp_1byte);
+	if (byte[2] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","no stop")));
+	}
+	if (byte[3] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","deco")));
+	}
+	if (byte[4] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","single ascent")));
+	}
+	if (byte[5] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","multiple ascent")));
+	}
+	if (byte[6] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","fresh")));
+	}
+	if (byte[7] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","salt water")));
+	}
+
+	/*
+	 * Dive Type 2 - Bit table, use tags again
+	 */
+	read_bytes (1);
+	byte = byte_to_bits(tmp_1byte);
+	if (byte[0] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup("nitrox"));
+		is_nitrox = 1;
+	}
+	if (byte[1] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup("rebreather"));
+		is_SCR = 1;
+	}
+
+	/*
+	 *  Dive Activity 1 - Bit table, use tags again
+	 */
+	read_bytes(1);
+	byte = byte_to_bits(tmp_1byte);
+	if (byte[0] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","sight seeing")));
+	}
+	if (byte[1] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","club dive")));
+	}
+	if (byte[2] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","instructor")));
+	}
+	if (byte[3] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","instruction")));
+	}
+	if (byte[4] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","night")));
+	}
+	if (byte[5] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","cave")));
+	}
+	if (byte[6] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","ice")));
+	}
+	if (byte[7] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","search")));
+	}
+
+
+	/*
+	 * Dive Activity 2 - Bit table, use tags again
+	 */
+	read_bytes(1);
+	byte = byte_to_bits(tmp_1byte);
+	if (byte[0] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","wreck")));
+	}
+	if (byte[1] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","river")));
+	}
+	if (byte[2] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","drift")));
+	}
+	if (byte[3] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","photo")));
+	}
+	if (byte[4] == 1) {
+		taglist_add_tag(&dt_dive->tag_list, strdup(QT_TRANSLATE_NOOP("gettextFromC","other")));
+	}
+
+	/*
+	 * Other activities - String  1st byte = long
+	 * Will put this in dive notes before the true notes
+	 */
+	read_bytes(1);
+	if (tmp_1byte != 0) {
+		read_string (tmp_string1);
+		snprintf (buffer, sizeof(buffer), "%s: %s\n",
+				QT_TRANSLATE_NOOP("gettextFromC","Other activities"),
+				tmp_string1);
+		tmp_notes_str = strdup(buffer);
+		memset(tmp_string1, 0, sizeof(tmp_string1));
+		free(tmp_string1);
+	}
+
+	/*
+	 * Dive buddies
+	 */
+	read_bytes(1);
+	if (tmp_1byte != 0) {
+		read_string(tmp_string1);
+		dt_dive->buddy = strdup(tmp_string1);
+		memset(tmp_string1, 0, sizeof(tmp_string1));
+		free(tmp_string1);
+	}
+
+	/*
+	 * Dive notes
+	 */
+	read_bytes(1);
+	if (tmp_1byte != 0) {
+		read_string(tmp_string1);
+		int len = snprintf(buffer, sizeof(buffer),"%s%s:\n%s",
+				tmp_notes_str ? tmp_notes_str : "",
+				QT_TRANSLATE_NOOP("gettextFromC","Datatrak/Wlog notes"),
+				tmp_string1);
+		dt_dive->notes = calloc((len +1), sizeof(char));
+		dt_dive->notes = memcpy(dt_dive->notes, buffer, len);
+		memset(tmp_string1, 0, sizeof(tmp_string1));
+		free(tmp_string1);
+		if (tmp_notes_str != NULL) {
+			memset(tmp_notes_str, 0, sizeof(tmp_notes_str));
+			free(tmp_notes_str);
+		}
+	}
+
+	/*
+	 * Alarms 1 - Bit table - Not in Subsurface, we use the profile
+	 */
+	read_bytes(1);
+
+	/*
+	 * Alarms 2 - Bit table - Not in Subsurface, we use the profile
+	 */
+	read_bytes(1);
+
+	/*
+	 * Dive number
+	 */
+	read_bytes(2);
+	dt_dive->number = tmp_2bytes;
+
+	/*
+	 * Computer timestamp - Useless for Subsurface
+	 */
+	read_bytes(4);
+
+	/*
+	 * Model - table - Not included 0x14, 0x24, 0x41, and 0x73
+	 * known to exist, but not its model name - To add in the future.
+	 * Strangely 0x00 serves for manually added dives and a dc too, at
+	 * least in EXAMPLE.LOG file, shipped with the software.
+	 */
+	read_bytes(1);
+	switch(tmp_1byte) {
+		case (0x00):
+			dt_dive->dc.model = strdup(QT_TRANSLATE_NOOP("gettextFromC","Manually entered dive"));
+			break;
+		case (0x1C):
+			dt_dive->dc.model = strdup("Aladin Air");
+			break;
+		case (0x1D):
+			dt_dive->dc.model = strdup("Spiro Monitor 2 plus");
+			break;
+		case (0x1E):
+			dt_dive->dc.model = strdup("Aladin Sport");
+			break;
+		case (0x1F):
+			dt_dive->dc.model = strdup("Aladin Pro");
+			break;
+		case (0x34):
+			dt_dive->dc.model = strdup("Aladin Air X");
+			break;
+		case (0x3D):
+			dt_dive->dc.model = strdup("Spiro Monitor 2 plus");
+			break;
+		case (0x3F):
+			dt_dive->dc.model = strdup("Mares Genius");
+			break;
+		case (0x44):
+			dt_dive->dc.model = strdup("Aladin Air X");
+			break;
+		case (0x48):
+			dt_dive->dc.model = strdup("Spiro Monitor 3 Air");
+			break;
+		case (0xA4):
+			dt_dive->dc.model = strdup("Aladin Air X O2");
+			break;
+		case (0xB1):
+			dt_dive->dc.model = strdup("Citizen Hyper Aqualand");
+			break;
+		case (0xB2):
+			dt_dive->dc.model = strdup("Citizen ProMaster");
+			break;
+		case (0xB3):
+			dt_dive->dc.model = strdup("Mares Guardian");
+			break;
+		case (0xBC):
+			dt_dive->dc.model = strdup("Aladin Air X Nitrox");
+			break;
+		case (0xF4):
+			dt_dive->dc.model = strdup("Aladin Air X Nitrox");
+			break;
+		case (0xFF):
+			dt_dive->dc.model = strdup("Aladin Pro Nitrox");
+			break;
+		default:
+			dt_dive->dc.model = strdup(QT_TRANSLATE_NOOP("gettextFromC","Unknown"));
+			break;
+	}
+	if ((tmp_1byte & 0xF0) == 0xF0) {
+		is_nitrox = 1;
+	}
+	if ((tmp_1byte & 0xF0) == 0xA0) {
+		is_O2 = 1;
+	}
+
+	/*
+	 * Air usage, unknown use. Probably allows or deny manually entering gas
+	 * comsumption based on dc model - Useless for Subsurface
+	 */
+	read_bytes(1);
+
+	fseek (archivo, 6, 1);	// jump over 6 bytes whitout known use
+
+	/*
+	 * Profile data length
+	 */
+	read_bytes(2);
+	profile_length = tmp_2bytes;
+	if (profile_length != 0) {
+
+		/*
+		 * 8 x 2 bytes for the tissues saturation useless for subsurface
+		 * and other 6 bytes without known use
+		 */
+		fseek (archivo, 22, 1);
+		if (is_nitrox || is_O2) {
+
+			/*
+			 * CNS  % (unsure) values table (only nitrox computers)
+			 */
+			read_bytes (1);
+
+			/*
+			 * % O2 in nitrox mix - (only nitrox and O2 computers but differents)
+			 */
+			read_bytes (1);
+			if (is_nitrox) {
+				dt_dive->cylinder[0].gasmix.o2.permille =
+						(tmp_1byte & 0x0F ? 20.0 + 2 * (tmp_1byte & 0x0F) : 21.0) * 10;
+			}
+			if (is_O2) {
+				dt_dive->cylinder[0].gasmix.o2.permille = tmp_1byte * 10;
+				read_bytes(1)  // Jump over one byte, unknown use
+			}
+		}
+		/*
+		 * profileLength = Nº bytes, need to know how many samples are there.
+		 * 2bytes per sample plus another one each three samples. Also includes the
+		 * bytes jumped over (22) and the nitrox (2) or O2 (3).
+		 */
+		int samplenum = is_O2 ? ((profile_length - 25) * 3 / 8) : ((profile_length - 24) * 3 / 7);
+		int o2percent = dt_dive->cylinder[0].gasmix.o2.permille / 10;
+
+		dc->events = calloc(samplenum,sizeof(struct event));
+		dc->alloc_samples = samplenum;
+		dc->samples = 0;
+		dc->sample = calloc(samplenum, sizeof(struct sample));
+
+		dtrak_profile(samplenum, o2percent, dt_dive, archivo);
+	}
+	/*
+	 * Initialize some dive data not supported by Datatrak/WLog
+	 */
+	if (!strcmp(dt_dive->dc.model, "Manually entered dive")) {
+		dt_dive->dc.deviceid = 0;
+	} else {
+		dt_dive->dc.deviceid = 0xffffffff;
+	}
+	create_device_node(dt_dive->dc.model, dt_dive->dc.deviceid, "", "", dt_dive->dc.model);
+	dt_dive->dc.next = NULL;
+	if (!is_SCR) {
+		dt_dive->cylinder[0].end.mbar = dt_dive->cylinder[0].start.mbar -
+			((dt_dive->cylinder[0].gas_used.mliter / dt_dive->cylinder[0].type.size.mliter)*1000);
+	} else {
+		dt_dive->dc.dctype = CCR;	// Well, actually false but necesary for correct po2 display on
+						// profile and info box as result of commit 5f44fdd
+	}
+	return (*dt_dive);
+}
+
+void datatrak_import(const char *file, struct dive_table *table) {
+
+	FILE* archivo;
+	dtrakheader *fileheader = (dtrakheader *) malloc(sizeof(dtrakheader));
+	int i = 0;
+
+	if ((archivo = fopen(file, "rb")) == NULL) {
+		puts("Error, couldn't open the file");
+		return;
+	}
+
+	/*
+	 * Verify fileheader,  get number of dives in datatrak divelog
+	 */
+	*fileheader = read_file_header (archivo);
+
+	if (fileheader->header == 0) {
+		puts("Error. Not a DATATRAK/WLOG file\n");
+	}
+	while (i < fileheader->divesNum) {
+		struct dive *ptdive = alloc_dive();
+		*ptdive = dt_dive_parser(archivo, ptdive);
+		if (!ptdive)
+			puts("Error, no dive\n");
+		i++;
+		record_dive(ptdive);
+	}
+	taglist_cleanup(&g_tag_list);
+	fclose(archivo);
+	sort_table(table);
+	free (fileheader);
+}
diff --git a/datatrak.h b/datatrak.h
new file mode 100644
index 0000000..f85626e
--- /dev/null
+++ b/datatrak.h
@@ -0,0 +1,35 @@
+#ifndef DATATRAK_HEADER_H
+#define DATATRAK_HEADER_H
+
+#include <string.h>
+
+typedef struct dtrakheader_ {
+	int header; 			//Must be 0xA100;
+	int divesNum;
+	int dc_serial_1;
+	int dc_serial_2;
+} dtrakheader;
+
+#define read_bytes(_n) \
+	switch (_n) {\
+		case 1:\
+			fread (&lector_bytes, sizeof(char), _n, archivo);\
+			tmp_1byte = lector_bytes[0];\
+			break;\
+		case 2:\
+			fread (&lector_bytes, sizeof(char), _n, archivo);\
+			tmp_2bytes = two_bytes_to_int (lector_bytes[1], lector_bytes[0]);\
+			break;\
+		default:\
+			fread (&lector_word, sizeof(char), _n, archivo);\
+			tmp_4bytes = four_bytes_to_long (lector_word[3],lector_word[2],lector_word[1],lector_word[0]);\
+			break;\
+	}
+
+#define read_string(_property)\
+	_property = (unsigned char *) calloc((tmp_1byte + 1), sizeof(unsigned char));\
+	fread (_property, sizeof(unsigned char), tmp_1byte, archivo);\
+	_property = strcat(to_utf8(_property), "");\
+
+
+#endif // DATATRAK_HEADER_H
diff --git a/dives/Example.log b/dives/Example.log
new file mode 100644
index 0000000000000000000000000000000000000000..3cc8cd3f8fbef7bdef12822d110641ddceb1ed70
GIT binary patch
literal 26340
zcmajI3w&MoRp-0*(b>{@>wk3gIC^irB}<lM%d+M7f6H>}wrQ&*F3s(5!AjyL{=~I|
zY&WGB$o~|F`E=ld87M8!5km&b%zU6Tbf7?i|IRo-hXRJu4g;l#ONVDWWrhxq5^nBy
z?IX)}>Tu7F&(eOLz1Ld*wSMdI-}zw)&Sm65`Aqm_*^-a%%gFIe_VmTaHj1Y<p1B-7
zF%@q<emQvMxy&oiW#1h>WhUfS+t&1lBqtKCpTBy3Qv&%&_-kJ^Cs#It>z9j{<#g~C
z$UTdQ*c+h at Z9z;;2K^pymfW&E;LJW*u=CDLuZ_9ktm&6t*R^J<((cMxlV1xt@$OGx
zO>p;m`gc}LN$Pgen?=7*maREqtv%^XEU}BN5;^J3ad%u!h&ka;h;?RFRwedk)vh`=
z9(IRhDK>NQ^h;x6hMw<F>fY3oI#)IQe!vf8P2JX|Urgl3Ws=*KJuGI{&bnDw-{WQ)
z)3KQjCgbsj83~3PLk%;~=#T5M=}b&gNlYcKG%B&FG|G))Vv2FW<-IA`yvsS$W^+Dg
zP0qEsRxxcZCy=ad3gd$<Unz{eK~os6)P^w5<-c2nkz3!mx_RO83meiR|0(=ue?KR7
zpO|?&E9d3muPr`Ve7bn4c%~GWf2LF{!8dy&=Sr^MnHj&}_j$9=ajZ2nZqki8o^#j_
zdgRgLYu;3Cd9CfH3EWrk{>}#9yx$+c&;5qdykFn3AQ#)_mOhBeNbB1+E~@rq<fp^`
zBiJjk3I0VbsU?pG4}G-q{q4U{`GNA|<xiBQypOx>`WaXC6ZU{N$B at _qVqWLY$m_+t
z!N1YILCovj>txNEQ*z3lg1A#|)tNQ>fIY(@@tNd-hFMKkgVn^W1*ciesf6{0iIZcE
zqlr1vIFu~M=0IaHo{h~^V=Ng>Ow@={F~$SIU~C5C{-7_e_r<*dLhTMZ<Bo>u2-+L%
z4bvV};&Q{3k?mb1C^d?KDI~?9011kXQo|IJVk7sG$;Aa0Qwl192 at L;nC&t9ppc<Ge
zge~nsd(s}5a$HPGu_*^EC=q+AvFT{AB&H)_;U*fjxTYJcL8YO37H|`#q#W~mg+?JM
zBqr}e7Sk%NuFaxut?1T&VW6LG4)pfbjm^h4HZNbfvhmop$Dg_y<g!h9b%y=u*IeHV
zuhy at h3BTbV=XXV43?90zUzdwNUp!X&*&_SwjqG;ThhlWtht`Ci-{&Sg>MkayI`2%*
z7i__qf-m|Kqu5u(h%vq at RcktIO*$p&v^C!@9MX0(%joyJKdXP(d)8P9w at s_dtr>4R
zq(dN8uE^;nUveb}DY}9;MOU;%%Qf>pulLd>tu6{(cq{Z#=(8^4Z(o-u;J#rU983?f
zSs%6d7TGxj+mq#ltkhd<x~a+8?`)2O@&gyIJ^7yV*PeWKbK~)+gQ=Zy`&Wg1 at YSv`
zZu8Ri at a2maH!eLPE%MQ@?|T<+|FXO at SifULeX+mvLX)lGcHS1U7>|-ITT}5opEt(w
zyv}q<x9`fD>h%r=t{KGA4ngdI?Z=+kPG4PvyT%z8rNl$vwZNsCtBdJ(!*<k}F+0v;
z#+@!^!cMqJF_SW__F<2kwR=2fV#ZEk2mOql at sMem;5<L!C#{+AoWSXRoVEHS_Hs(h
zl#JWRngQ-*ASKevE%~~uJHwaVA>G#0eAOd5Jb)|vh%Z|fgB at T&eh{l`7F8+UOw|T4
zN}HO|HrM8{pLt(EUu^C=3f7iw^EtHcdYiPNiaskytOd1f)q%i1bdVGBYi3J6!H_uB
z91{7{7p|PYbmi*#C-3rn{qjQV?@pzIq4klg=ijk$Ndo!V at bjw&c4hWOdGps5pSfpY
zAFfXd((T|VJQTBF7abONQKtRabu;MdYp8n}p@!FYuk at -vINc(GSr$YvXXkvh7tgtf
zAC+Z)#Nysg`c;cxi)}3Cq(8~JIy-;T8p}9g?W7!$gU;-iIX`91h#Ryj0#}df=S+|7
zalICS^teuMY7D)ObnLjQ)YH-EOht+oH`QvJR>b8bbUR%8_NKbGzv;ro%g<i8dgbw_
z_P!034rT+`2WrT2m$^2-_Cdjx=O5VIxb*n>E03$E`nhoFvv=6{jlr95Gp|tkL}{b+
z*`~@fq+Po+y>`^kI{3C|4>@zpA9F_`l9Hny_wIOb%VMlM;ZE?xo^|EMaeEvV;rcn`
zxI5yHcylB<+&J7YN8-c5N^A}`7Qb_ at x;Xj%k<$aGquxgELw!}-hwbkVqJaiWZ2B6#
zNgpKWQ`POW1A;zJ;{O){vp+e|SZ>r0#fKVP>~L~8Iii<7qGTmG7%w%<zF<C{3C#FQ
z!>9WL(;IXrK!a+6Jx_1}?TQY{*!p~Ia!Fg<)-Y|2T-+8w+LByg@^L<3U%tV@#)LH`
zxg-}G4iEH5&QikRZ5aJHpX4EploU8zF$SX`XQQ0M{yIpCI9gZ3)z;Ohb#+UAoguKN
zDa^tn8<(Q^(i5BKH-gsiwj8H0T+b|~=r4cjsm%*lu3moTDdhO`;rzpgc6Ih}@X)2Z
z at ZYD3?`g`BAD1FJXQyS!nkBm=`@}5T1;60T{LP7*1J_Njfd3fp*<3bUGlAW`X8K2l
zJ2u at Y0mEn69(NX-;z4`pIHE??Pa^o^sZv;UV?|cnQEv|V{j%uHg4^S#5t$#qIcQBU
zmIruON0{KcUeOU?dR$Ms(e+4|H$A at FcVduShhQ!-u-5pxx|6a`JxNi`OlocTvN)8Y
z6ddj>uNK9d0)t*H5nrsa$>y!e!+2eDd8a41oNslw5S$M#(uR0umBEjGr3}`0K-8Cl
zE at WUTsU2#2)5eu67v6bUGV-zTZ@=}91U at 5gQJ?(L;)g09ul!wkxx8OT-bY=FwD at fL
zgZ!2Wg~jU6OV-~e=|+s?TFP-ep94FDj&Yw3ezlzGMrT at FddR(BEtX@&U?e29#!aK_
z+q{}+-Iy9)l_P7GwN~GHeaDe=p1ND?3am(P$*IAvx44YYSd-zG0&4`Q`5Q24qiL&4
z>(?$_-H28%U{yAP6Fb=DDGbBKw)F>6tl9FqYhMqGej$9_2M+Jv?Wco#Z1oRfwb^HH
z6s06(XWE_d$i2gMs*4)3V{Y1;y>3wsShMU8IV{kMTaiQ79KsqM5_3on`ekeO`F(C5
zaSdNeSle&0x%=D#s_qXchCPH at 9tO&K0+oibNgUYNoQ!P{$7Yo;8<>-g<BcPUS!o<<
z98AoCWH|t!F2 at HNSds(D!Qfy}KNu at 9hl1tcKw|ba7J|JR!t7~GCWb&H*a=031Jj at E
zVA$TECo$cPuB5ABx&mDwok1sIN}$-=)RK<CXqZw;jSVO at hY3;J(NLn+DK$i?T?rJ}
z#)UvF5ca1PlIW6JAWRSYl44-;N!v?m&M;ECu~7(sq#$9nPMEJCHFc?t%f<W<_79V#
zK at tb#!OTG+hUEC0n`le$;i#&#*jL+z+k)MaKSw$KTT9{LmvKZFFFbwuQu&ed=bvSy
zoZo!*{N~e{Dam{(z%Bi7E-U5C2XkjJOA<b?dEx4N<dpnkc<nun+ZU6AGQLnaR5)7r
z)k074O~tP+{+~N8$yYoOi=faBcr)xG8L?(mM%@TeY_{`y^Dh46pSX**ox51fg)*5r
z(7cP5w{BkH9)2l&*4?>>ua>b7n73Abr1X!)pDzAT@%iG{6>l2(QHELGmwe4wbF(D1
z4%~UauMNtOk8CY+ksD?$Yq9}@DE-_afejc}&5c{~dHD6c+1wjnzH(^;{GU6$`OXVh
zH=aCC6p)EpVAM~P`{YLO!thz?*p2$F_%Qm#_cbrV_iw-e!2I0{TZuBIictkw^!Y(&
zMi at sE-c0!!J1-22{eH=rC3nCb5d6V at 3t6@Y8A%M1gC25_0dv6C56C{dD2%^7GULn?
z*O(9kvt?MBKX_fSi|v+9u#2zpi*;k$ZN-@~3 at U*XUC|ZP2J8J9HPYDbicNuL)mI%y
z5+B&2uNQVKvTVuU!j>f4_V82ZFI?KVR(Lx&{jtrLAAkCM=G!qQ0$+ZqrCYufh`^VO
zw7zL$^XY3>WL1(d`s9zw$J&~_`9-OpEHsyIEJ$&_xUZ=}*{#;?+&PmwmydE=rtMtr
zTrM)L+r;zRrnp^-ib at JBrV#03^4s|>NHHpHSGG<2IhM$@N0oDxbM+DjaC&aL5>>WL
z<y?8I9GUXD^0t!b_QrF??RtJIcdl*Qgj?acFfznwTiGqsvfUD8AW=#(TftVaUC(Uu
zM+C(C2N)qOt#5ys{K8W$XWxDnG{95Cfah~%fL+$4BPi9~Kwb?0V_$Li>Azpzc(u5R
z#@+^Y&+I(Cgi=BVz8z`dcgeMQGvp#W;?1aM0ijCd8C$*Adpxm8H=3NkZd#jeNm-l2
zNZTHZFCVdtJTXzW*P&yBHv!bwP5yeu>tXl%aQFJzlGgnh`IeTiRDFHIF9ogd4lfjj
z<;R0#(`Th+SM>w=&*AJ_r+1(6 at 1*Naq}Ke4i`yFtTT7mstooWYU5+sz0LMPt3*hhy
zKuo9ak}hjHZKrgyCN&G-V692IT(_+QMJ$JO69F`j^j!=m+v71mJ+5B{;hP`wgHn&+
z+c*K6pCYn|$WXZ%Zx}EPwrE-=E&E2{@Q|wyx<Na5D;iwym2Mw(W;?9$QM)bO%w5L=
zx40HdkOaZUdtFS{-cBLdR$I?H at jRh2umA(UkhxbkvNx1-pU4kjG^WSSa$I=!{FSR$
zZjTTnH^ZCXw||#^e=J>hw4?bK=a4|~DU={1=JSkN9lVTFDcg1vnRRokdc#(4b=VHS
zSi9AAYtS!Fh{l=`Uv`R+(<-S?$&{NSMwMxSOu0#m0UGmTZd at Sa#HDa$)DHXlkR5OX
zM8S4Ih?g}`h4lM=+vgM at N|z8Bbx76LfrF;~x1;ul+cTB-E|y;`uX1O3+m_9}*W^~)
zR>Sw2mKRxmTZzIJWmPAvdN%W#Zb?<{(F~0H*}?>jtIyv(s9p+x{cAgS88#l6zwG=e
zbENVgN``F9`-}g)_^c6gBfAZ+Y>jk^6s1-a;$&ZI_eM}a;H$5>TFoQt>$Ot0=sKjv
z2H)vxoxYo;zgPNPpR4iUZdhuOjbKY{R5|5pX)-`+ at J+^jKe0XRtBre&^lOuD+RfP7
zjAN0SCIiNO4UWo~>z{J7evhy1aeI<IjoNf$PcReIrjzM-GN_FQW64;fHhOwE7!GO!
zjlQIw)OzCXpw{TGCM3WbH8N{SsZlE?z>J_qK-6f9Yq>zfo_ at ZPoU7#}k141DFm0Qy
zg#s#dj8*0M6deDlY~jrL&CQD!9y`DJWclff^U*qX`k9LxSKkB2GbzVMOrJa(Y)wBZ
z9a2(NjTZMla(?r|`7pkOC*)ec9L{~}ExY{xl$7p{Z*<6WjE4C+Tec))x-Fw}RHoe=
zfsLOB1QG!saLWoE5BOzg4$6urKshOvfZgn5qhlZY6TW_&i1wH at N9Cv`us>>vaFrYh
zRse*_N^l4ym at GB+$MyMSE}nVbOon5 at NW%=r{m=I`48f}=o_ms>Mo(b6W1wAJuf>F#
z4TF-{cHE&aNs$p{b3XJ8 at r>p6m0>e5?B*SFm_K_S#$9^i{3T^oY7f^K3C{*A`yQ1*
z3hAhh*7lx#@b=IS<X6JI|L*KAr#>r{?**{@U&U*?PJka`Xxlbl at R<J&-z_8|2JEmJ
zr*XT-ngzh}L148UA*M6d#(tG#z9WZ0`raPX_>Mr{9(Q%J8*<VS?UTnR(Qk<b6Jz7!
z at rl43O;&)*W?wwtn2GBX at yPSTi5Y4PCIiIq%`|RL()Chz9D#!$>WZUI-w{+!*9%E5
zONf(2hceaxlw9CVhP4(kL?J$KJOFV>`VGt83d{aecE<p=y#+11a{j!sD>Z_TWQREL
z&j!xQIw|k7Po3X9e}!{@HT-w`zFIn)*AO)OzW$@l8CSI?&CrpJ!A4ifj<PA;n67DV
z2LD;rjVTdKQ at hv2v^y55S6tbnl!|WPI3cPpq5)QOpeTZdtQw-)g48uA-3eHmD9Mv&
z4DG9dc7|}!6SWbgxt!A at vCMgmX*Hox*RT!-wz^i^CWh3i1+Z&SnH9LIOOq&%iSAgl
z>ZpO>0y{6l&M#*2XP>%uDdl8-^>bG#697DRRq(e=zkFFfviDJmq<k98b?J#~m!7<`
z_w4I#YoW-;!#|tev&-N=l8*a2m{v)(uq^E!mUh}6%pV4S(2bDAbW;vxoU`+G-jj3M
z=azKX9&$&76jBUGH*20n>Z@*5b53NO+zAG%KWq=`kxS$?sK2nd`n=yOd#%~)_qy4{
z%*I&3#LOg+hQSmj6Ad#KM2+E~PN4zijC$g(Mkn#ucVe%@2sv5>vx3kBKEqT&FbrH@
z-_ge{xd!Kc@@`|-_Q>N;U3lgls*J%4tvHs4tNl_7%#@nBdp)wqe+j35dUcm!pO at Ob
zm~98OfoPC5hJzqEh0LxjMiDkpj!Z2J1Y8X>g}9kSFP<dwM$1VfVn*$ljQaWnX_#3D
zm`@8&2jq}Vd3w^t&a67E+nCdS&8 at lmY5#zK07kntS&PkD<5WUyd^9<f><`S|U at 9I9
z>caumx&~1#0c=e9gvv=^N{y1$8?=fR;2VEf(0?m~7(EL-Lt4jmfZnBA_x14ZbD3Qj
zc#qu+J`=*buQEgOHNn51Jj>|4mv at 2uTKHpcdT^I_|5HZpt873h8zMHZxi^GZ^6k#t
z&cCmf*BC)%soD-PT~hZTk0BX?duG^<_;ITxM>j_VWEcICtsg?wlv}cDV=SLv^^lWt
zf-I;eMg`w;7+qcV^+mVW&L|iH`sp?M*8rj2_<amT#g}Y5mc{8(ClK=dy5_mqSaO9M
zZNIaqIjL3~F`9+ZoRgf*qk+=qcoe+sZ3ccD4BUKGh>(3WLx}LPG{}Cr8Qx~!Kpg}Q
zej=Rw&^PUJ?5OnImt(C?V_F at Mc346F7=R)g^P|}TO2k=>U%7)V(cf;|^V at l8{`Myc
zt$#n*39b3<OXoS`*Tb%#yz|=+OV3}JQu_zWKUV53{c7<Ca8^$l`4LAb=mvca8TiQ8
z6fBOq+K3<VL$=m$yKh#n*NSW5&GZ&jhqx0yJ|$c7z1-5*wB%23UOa#4F=FbwhvElw
zsMA2Ho7BS()KiStyfZ at R@K^GKGM-*ZS-bzfTv6LwCRV^_>d0~vGDBI$&iGlaEG)Q%
zCgi|q%?pdip8`Rwnj$yPsFS?{S#XOib#m#lsKsBxYfCD2PG%_ec)*(j0Be25^toPN
z&yoc-QkHrVORp&0mu<=8IMV#3T6dmY2NXUNFWG#ACLg}}etalPkn&-nl~6IW)qa}~
zXh%kVGpzOB;lm}_4{odeUdLZn-_ZX4@^_SiQbwK|`nu4!2|lmOQati?{_{kMJ-(MU
z!Xp-Ng%BkXI=M~@>h16yUY(?^sPR(&S8#QnMhdtopG7Ux&zAgar1!hoQhaUUZJz`C
zTzU4w#g;Q0k6}l%f2Qe>zc2L3$;?hVB)fWk<0>cK3eQ|!-WA?wW%mBUV*pijjP>|_
zN8E-*^k!0sQ5d2g{7h*LLC)cL9E->Q%*m{l-I|FHKW)i>AZ<78>jX4*Qcs_-;}n-f
zgBk-qmr(_u!*0kK;%Q4{Ogt at -tw%C!2dG`Zt1f3cT)V5ND2sya$+=dCGtRicWz;8Y
zSAx+zNs;mH+iZwn*|+Pc|1C`V-<kWX_^md$6t?$~*ZNZ5Q(s{*MSd%M*S~%JF0(!*
zC+^EE%}cidQuHn at a_bh{^N=6MGviA4yCrG}e#tMuGah*;i{b*cNx`~(vQNwbyKI-q
z%i>**;+Lre9J7FH7HUDZSrP(FrfbLi;n*xCdz0zJj3;C9NKhY0>T#E5Mym~ezZmCS
z=uNAn>2ONfSVf~>+#vZRj{_{+Y;!=J7PsqG{v$m4(rdYulu7TZ_F at MPj3}IbwOje^
z at Ott!yG;5$S-C%xT$@+d;bGA(I_&m+eu(haPI**mQ4ZR}u+W~i4>(#U9&o3n*(D(<
zXa;4Uv|1~ypKt)`)R8F4K5UmAR)I7E)`djEv_s8C)`q0_dB#-7^Cnv_OJOaS`USzM
z0sSP8qg5LrMC$Ff9g at x2RygP2mcYQQWV{g+Ngy5~*zli*Qy;irJ|FCIGmkd?N#%r8
zT0e6r&F8l at I~F!z+9$(zOkCJy(r*P1-j_)w9BZdH-M*PMu_RV-v$oT9LR^|(=@GRS
zSdL!oo#D%&Y=aW{F)`zIQubg$F_x&;eoIzg=v>;Dnof)9B++jP at W@)aW=X&wkrgcv
z9JYrop7^j^@%6)Uq;a$Xd^y%QmYCzgvG`b8E7UChfyVyEK8;oug1Ls-lT0O(4Kvvo
ziz9-TcrfluG_IopNg0v~B<)4P0I>`)-!OZ%*(hKi%_)r at Qu}ddTmwAPCDNgg$OILd
zM~I}$T4SsPm7rb at fJmh86H@ds?J0$zr2AMJX(LNTTTm)7gr*kGOdC?DR8||+q@$sA
zOTBbQtQV(sC0$HhNh%Z%Vp^RDH5okI3t?#35t?#9tR9$9i<#63s8hB!K(MM5N)!<h
zm$(AJ=q7PIFzH(|t2?^!Gw8<8Hw$9L2QFWF&qj3N(xo&cl~<mVcZXk1IQW_Hg_V0%
zL*#eD$%iiPs>W{y58YQaa at zngG3_X0g_uc*uRNv^X8}5MJCL?)i{2D{yT^?vt{oIC
zE4CY*a7%(6T9!k|+8nWj?#>)>huu*P6NpoZS@}9ad;mGVGtwMbjnXuHqx2Iu>ZgL3
zDiEb0o19F{iR5^4ykU+vPQ)i-)=mbH<H6B*g#<uM-AC)y%P|;uA)b%Xm)Ur>F&mpb
zjj3cJF%$79z}Sp7Rbx>5mKvrW^v1n(E+w6fS_9Q!iA^n_g$dP2=t~Rg+NqQlcr?30
zrKL4NMy+vcqczd$O<I#ih=`FqOu7cqLpY8 at S`n(&asoZpa9ksmbb6IG&SGDBWS}Hr
ztr%C5vg%;IL750ujPr at fHBb%+hg0<_B^6fz!21$_tm%eGNxB`y_$Z2TwP`fk&Td|K
z^5TV!pfB6B7r#<i6x;d@^Dkf{w6?Qx>1iO!r@}vY`=wo#xEky>#$7Icd+|?;- at 22V
z-Y)uXi>Db8f)>gP7E at 4{E?>Qg5>yowk#=P<nkXF73Iq<8q at rkeV@BMl!)T159=Kl8
zXfkX$Byyvc2xx?L#j<w7(G)Z7rs<+_WM^^UegaQ!G_$5x!DWxy`lyW95xlz9T$`D+
zlXgmxLW%}7-3DC4It%uhG%uil&Kv-PGqVC@(5PWj&l~6WxJm>Wb%u1Oi`KaLUe^PF
zazHz4NDQIhX at -dKO>>1^)^vGI44Q6BbsXF1cQDqVk9>VZB4t6ptvgzdOt!S9V+0=<
zI)-$bxoyQ|f*Wv|HY-G2J97J3<o3=TW8WOm8`mh#T?(EGo5Fj!v?Sl!IzIQIyM&jK
zPlsRl at -uQ99$yb0xzlxax%fS|b8y8iW2+!6%Tu5^me^UnV?}V{sU86+ at K3m@qHVV|
zeX2D16ge1eVbPEu7Ne0DB=TwOMGKTiKvP!poGHIy^d7(0?p2Vz*Ut-NUgjL;U_llX
zax3Uo;um~<pX^s4vW$b+$40-vDT>3__pUGQb$k6>9PMq)#nXYAOr{!>F++C<gHEeS
zvtS!w&;k5j%LCwWycTPgH87kdAI;MWWiK`g-Ez**yn`@_?noHmjh&`tK)C9i6~Oq^
z4Fh3xt<~m*crMQ$hTc4v1IJ*7O9JaE(vBurSczT$ohuf9pT8M;(m5G_moTeg+N4^#
zN0{%-1S!OMFn3Ts-TKVpcXOkXeQ;y*ie%)!hQ&jhyR!U1 at a8+RoGhI#{akY(wr*(~
z0k8rW0RdZ-tf}D3@!k}S+yEnxC`|_xf*KK8-TG}mZrcsnVTPq2 at PmwFB*_SjB=V6%
zz>I3e$2!0mh%CZJ_A%y!#W8^Oa=MRGbPd(m*@)H;d%d(9)({Dz*W5W$YpxMP9Tft4
z4_UhJ_;t&X=~XzBeVood8MNRtJwS;J`a$+Fpg5f`ZkQt at J#UyX)=$+)dTbYwjC4y^
z6S4qj&<Nj&gghF62XpO0AGD_QkUGS}EKTp>TT|hC7^x#N9i2*ibC4qXR at cO5KGlyF
zGM%Y(0cJnPSiN|^v3fJp9IOAj{UE^X!Go#y4Nq at gczOf*{%-gUKX_$VzTbcMSgn+v
zDE&%PzHQshVd-$Q07bsa9^cz*;oFEKO(cx6IX~|-|0esq_E9M2qH64yozbfCvX+Ps
zx<g_P`a>*c#jdzR4%C0huV`oYVSfY!=2!e-!7tP9rTxA~f+O^2HIBwdA<2=(@wk4n
zVT0879!uDGG){ZBXyKyEB2Bk1BxY|s8|)!rNA+TwgdJ{nBrs7t91MZSlC()|ASSmQ
z1H_ui_eOWnm6)!iGwBRWC#iU_6P>y&hVn+BU at M>%LYpMir#5{k4pLpI`pI0(KK0A3
zFR3SvTiF<coe~o!>Y0@^XuN1;lX~gkHoQ{*%9?9KqMjsYQcuAhP%p`G3P3FD?~(Bf
zJ1u;x+5sHBYd(5#<MGRvHiEyC;I9hc at 0*#r{CV5oRnxYk at C_SJUw#ZR|F^Jr{_3un
zKOt{@U-27@?;?v*D8Ie(N9Ff78_mh`N)|UD&7K~cO_k8$7WD4YOtQ9Twpj!8b8V@*
z`kXZ+%6tyDFVz3k`xB`H6D>f|Dsjy<OQ=ES+U7aIaSFtfr)pk>=U20*@drw-#HHG<
z4l3l9tS%;P;RRUOj1_OB`Pq`6zk at F-ufKBn;zo4p^5$dbY1a*2pUtGk?NP##{~TUC
zoO-J4*~^zMz?I(%|8(_TyIcWy-ksgQReZLo{6#UYM(NwvT`%=u>6HPC0ZYx<n9QhC
z*(Xa at 6&$@@L9=}`ns6(Y@(3G+jYkBfhFF3OVqJg8F0)TaR6`ss6vV;)fb5UWB9)N&
z*vuxg!E~cOMFDPHm3Sl}#E637cqlR2<KAp>Od(@ZZ%|0mvNQKt6XOk#82<3D>N;Ev
z)8lXt4);@ax=-4D1;69cQBCk?F-#nXnKC^XupX<#_1uLdfEQxuvhy{r$@OtK72m{s
zl4h7FRAALeG!?Cy2u~S<HS__+ASvNn1r;JGX$=}6O*OGa&yf|^4xYDMOmC at K1Mxc+
zrmDA;hI%*>N7t+1JF8N`V6JHy5nqE^TC at e^k{V3gLT<#Snz1DxLovR-X%t_r7?1Bj
zm at evfp9w#DJT;50^in>tsa<-%A5Q<-yLVONW5L_*j!AY~&<Y-dsNjXB6duK<S!`M*
zY&&M&f^WR3`5rfjBXJ-Vyo+dA)=b%1zn2`b+b>HF at vq1+OFH<ZJ;_PbD6E4pDaKPW
z(}^(b)3gYhMWpJ?vEW!j+(Ed}IDzE(oCwUZ<XC{sJkVH77Gjd_dy<*NOgCmIT|_gG
zX=Y3$Q^7<tZ!#L2kz at q;qBABM#Hm_~tP`~oo^}&(kfTrI#`dJ5At{lEh9C655 at 9x&
z0zqiWms&|e%POH|LTDLigo3%GFReXpkJWT?tcINd|1?e|j3~vWph(wPgTOY1uwd;x
zRsz*Pg_MzAmnKmUNfJ|G4jY{z9VmLFL;T)oo*M-#a2|)S&!;+=xAdg8U?X<);1|(@
z4>t9n_`36(e{=ETQyUkbNDD4$(&CG?HQHlJuSW^8r8iuA?83#*U3;e%s<IECzx3x4
zpdlYR_D#F$@DHyMq883oyh1)PmeE4!;Xpj&ZdUUS%W~KsP4ih|C9R&UIdj at QAZIMo
zV%}iiXw94C&Hf>49+HO|4>im~@mm^iZkRVV-Wb0rHgDqV^$qj7_)OzWVjc+A;!}ZH
zZLB71fjO;fF(K;7gnR|65gbPyg2NP`>j#rV0b%HJyxf4SuyKW;G}#~TQ$w>i-h+<B
zV@#nj!;MrAP=GZ43~C8NCL at 8IR7wF3PIC~*3<)M|EaCHt><fzg!M-#o&BbZ{K%-Bh
zL+utMxNNoq;OEj9b0 at 0Q$T9VuI~!TU6*k)9{7&y;!{i&9 at G$t?Mn0(*8u<qMbV^S1
z5G6RtB#d#BVG^pB#m^?VUjEqGnB4ZjIB7y%L$urAmRgB^^Nr at kAVEH<1kGq$gYIfj
z4%wJf&&~DqVt2XWUqYLnZ)#KS;q&j at xN!O6<=}NY_T+cWaYCZAO?$Env;H9b%%|P1
z{`_ii_U^WX58n=n+8kCCy_br^ba%U6Gzfe(W+w?HE%|0*8b2rVWHbCeyI&jfmfU_|
z7JnbGIF+OJxHHFnnj5s}*-6qEx~3@(ZDBCfp^{U~uA)GflC at -wwItQ1Q_Q<sWuPV&
zt3p!aD0r)WI9_S2(7c+^--;Rq2Vxpqm#Rz2QcNrBd_(m|yBY#Bi2n2jrYCOZv=UHM
zVmgzqnA|Llthz=L<1}n82DFF<C`Xz>AT^;f(=Pg)5=}uM`FxT}9)frp#YO>Ht8xU$
zrD-x6`Jj-b1_VLs71L~nYLH$!6&)8-r2<HyY5GIDkK^=6m$x~G9RaL(wK13%EDjzK
zQ{#xJq~6Zgj!!}$6<c-~9ws5-YfQ%Nm=;xrnPymZPtxm&OhCikyTh+7%*z*Bx29jf
zZAlY&w8&?}_tf6Is}Ao7&fHOl_muuk>GM134OIr}Adcn%i04aEuZwrVQ97()Sul#+
zus6QuKmdI*;D|_6XAIQ}HzVX3_Siinhpna`%rv3#v^Ud0_DTGZOu9+36^=isPq;~S
zPUD;&5zqkcsX>rnl{%#ep}6Gg3JQ8iMF?Rnag8I8Rgavu!O?Q%03Q$*V2D<hO&b2<
z1#L~ZK_Vc13XOo2v9O#c1R>gjOQTsNp>r*p=s*gBcrf&-nHS(@PV%m(4_#I%!3=3f
zX0DKJ1usgQ&#5OUy0YaLG#IY8yHd6_+e~7M+Y*nkKE4B>-?({=c|(_|HNNw*W+~fu
z5>lO|V<e<LeDJ$5`?5QL|1kVW_4=;FlDiX9my3T~eC~D}OfFqrKl&m at Cu?<qnyk)N
zXd)^ID5ma6W{}gdDW>U7L8Tj at 2yZE&dV*XsQ)ynxjp08$L*J3rpS5!m%}KLC!IHP2
zVBnabBxYx3#)4h6tnI_yERyJO^8{pdvKBI@;n|E&<v!)7)F+V#BfsQF{cTB;DzlX2
zEVtX`o3gc?Rz>W)(?HgBD=Ms8!gd<%IM&b_X?q={F5RFs-{ZQFwCix3*Ja7!3s2jf
zDhikCOqC(Mn9xnhA&z{$UOG*Qpdq$H5voGfx&qazg at eYor~2ZQSQgN$rTlHtB~*-S
zO4=!BTt%4<h-6@>PM`;n+c-i;F2!)-8`E+d6eK9a+wT`K|8+|<W|(YW!tsCXz`YUk
zcKAEFZ`sv^_uZWl`M-<*P<&rg6UfY9MAT?_CdakAnpGA_ANd5*9g!Qi2w{S8$512%
z=oz1T?5vi{=&Hh^gADf*ILiSAh)ND<OWLwqCUy{_2Wl3?&npmujTNt at 3wxL_+NLv_
zjy8 at qjt6xT)4}nW_<1E+X^@d7C!H7!d9sw4g=DX$qNkgQtnrvAxnZJYB+w`$iD+^$
zqsdq>7LcYMk0)X?5ll43*r?fRQeKUoB(?9INiCq-U}9ij31hwEuhqU|g7Kd^RUkFV
zn0fpzwzxH^Yg$@2atH<*%O8Ul)I2v0bO2E&P8iLmK-~jgA#X8s8X=HcQfo{MKq*x2
z#DOZ&A9{`WxDsS<wY9uE{P|2IkF-6}``w~*32w*7e-z3O-x2EmVEtXiEA&Ed7JsSq
zhvjSKhnw+n#%5fG!lAVI76^a0SPe!~BF%laMI#Un(K|~6>Xf9>i8O;0(cE5|(reYo
zC5>}6n9+b5l2b#McG7CBj7`(Ov4z^qQv~GlRls8jh#3RvHKgVc7FWkPS+#|pu*hj7
zEusGU&h0ku%v1I!L~<-P;_q7-7h&n{`|)6gSAQrw^Xxn(gwySAwph8J&87*)_E%>o
zR)ir1_s?d!<@vVHm73gt at Y;nZH4guO!XLYJhx;$d`m-tb3#FeZeYpH&`K`+ROD<zu
zd^XJi_^j7dfX5GOrh;cAzT{z>JcT&ctP&45G*h9(>H<k~4zSkcVV~8cg|g43Y}aG!
zZHT8$2rc0vSF!0;h%jCHdpntOawGh#ZKfrxc6gbLq at NvTZpp8}kiu&;X*P3mz13bC
z6gr2#vh*IvABQtD-?M9HeoxNa9f9iK{FuD~OB at c86uH#Yc9W&Rt2E8 at 5ME>o03ds0
z4qsuHgbdp$p;t>=;xzUk09o^^^d-p&cT7v~$Lw*bQ*rmlwGNiXqtvz<gcU2ne)1A#
zE|^M2pEtwFP|%<7>V=+0XQNKmEUun5<s`4;H!ES2`|uRjI-Ry{V36C<6gZ{o(;_Hg
z$}pzV!KpX at lbrf;`w*P6!%uO>tLyKd3x8qoM|U~(WqIVjEpd8Vj4;K0O~I at D_1;v}
zXojkYwAl2HKx&LPUzT>S85G}z-}ZeD+Z_o7A)Pv{ZC+UG{c_OLN=Qo_T(k<dn*qEx
z_7=-;Pumxn at hDcS_9rZDu}uQPK1zNwKAeE6mxB3tM(2W!#Y4~6v8;_+Xxd}ai3ymu
ziH at bsql;NfD`rZh1ulv%DG{IEH}mb_<WFVuZ at h5v@u#$r+B`^G at YQHCdgPhSmoHIy
z(<Z~0a{$v9OMUV`GQZk;R?ypK;$wr0{P*y)PyYBWGyl7+-*;9>#%C=ShPd0~raN(N
zy`E(Gn4R)w){zOeW}i=;7E?zZ4sD-bWYJo at 1EMUt1vgLr!|!oZPSJ=&WY=w<M}0{$
z3D<1**m^biWLU(|2Ax_v(H3&dqvi^Chq=Yfx!Yrr0f|X4Y8-T<G#LiFlwl5oB|=A`
z3&aEx*tEStWJ_+rw~uD-Glxj|^=+D1{mYhinQGl?e?o$cv^6K(UV&kM5}xb$L~tPG
zzsPsW+TBxVcE>4=$+iW_2_h6FED at I3wfKm8vl$=Jl_jYhGu-=aJ<WMiBY<2XKCuyB
z;0gu67N(SKL3yJnxZUCtVG<Ti=;Cl#!mQ=-^wWH}- at os}8EHP;AGF|7ThElwip!u3
z%}Mha`P1-Ujox{-hOGTiakKPerEg?5!^hJJZd|_0sjE}1^q5AEDNYH-*YOyd_|uL2
zowfDQ;>(Q5o7}COk2LZsxJdImB_7f0Vu%fHwEL*C4u-Rlx;_LRs at U|iC4Y~gel1%%
zvvKjU3zx2(zZk{WvX>uAy9}BM at Q)OS<VVt`FV5L{^9`Nd;lc64ncFqVf0TRjdAm}|
zZnZfgu3j0{$cah(eh-~pZr;vYtr6M<EfwySId3Q_3UG}>><p2UXA!Idg<?W=Kam}#
z;$=a`zTRhdOGs=4`^k_NV|#74GhLn+L10^KkF6_$rYL6XeU2G&1as1Df!risUAM5-
zseo9sqh%DpRZsyP6~1T<Ndw!20zQvP^O#)qUZJ$$=RF=;T@$@d-t3x*m*L`XzG^m5
z at X=!S!`UAwl;l&HZ|HhLz(=j?7nqW9UIO{^@QuTEmw(^<TKwaef%L;NV`r`51r!eE
z%-Bgg;;EtayB-hR at 9^zeQxw{?bPVo(7_Ib6`YyF2lXixPhts*r%=Mw0eMAy#)Jksx
zf?63Z=}B86OBwm{Yqf2CTcPE{*?$%Gl8uRI>sPe*z{X=2E_3c*gx~T at Z`gg9-;j;_
zx>jJF!{)a7yen&DvD?Rwqt(C;r+|bUG9r at E$4>i{u!cN?3Ux<*HmwA93c(Hn=WrFO
zp64MbfU>0KOjb1?u`;+B2f#d^622U3NSZ(H>`UdI&o<GXZMEUey2x&+H-IlswA?dB
zTAF>4&A{eo+Q(^T``Cd;5$x`C$h`bz_}Aa{rd_s7y+)EVbOmnIbPCmYVj0JbHm#GA
z;70J43M&R(X8c|dhu`NkY$0CJq_xv|)a0WqAKGfb7^FkpA-BKTcE3dQ!bT3U!fT<(
zTs2POCP_pci;o1nt3l^jlaHb;>$hmKIe2>Zr6_u->!nht6}LwCag%v{kPj|&1V7$-
zA^+pGLQG1sQ6nNr3JGiZB;TlMR;ds`cy~ikYYoCU`|(=%`moU&)HGMbM!uAUAJ=4J
zjju+Sd{?uk#|c{6tMO&CzQ&N^)3PO5`2ElR3Hb8iYzHW;ocYM!r&JHisUFTnJM&Nj
z`Fwc&*|%oaB>3lg!M6rqeJ#bmceIkN3iViA6Fb?I>=;Eosrd<f)-tL>M}L6R*K%dq
zuE9gu8|<3zKv!)Vb=O?G7<`A-T#TvMcH4mhJDny?tzyhgJ2U6^yF;2lWV(}sATn*s
zJO)u5BgZw>$XgsdQat7k(>LK3{azwjeEPVplSFcnC7D4XoomWqw!K`_{BbF$@kL6n
zMq(~j9up?Ef_Vt{l(|9c>qCUHv*rM3I%y1_Z)@N*my?<n5A(K`cdb5qv!+2+i>)=C
zX$^nxkquwcA~l7X8UEn2C0&TA<5flv7=zKf)iz0s+BP%!?ivsxUkLTYJD)9C<`Q4k
z%o*hIk{2#MtFKRC5>Z-4m?Khuq4h&&K7^Fp);C{%2h&|BCtSR6?Mig&b5}Mtr7Hg;
zTweUN%KAI>x*rZ6xg+J~Uu>Pd(S|^Jy_vA|tZ25EZgKokc1$8?2D9Bav4pKETfN`c
zCdN+4qOC5=5qr#5Pcji9c2)gK33IWeY8{gi;wpozaimc_98(`?R5e9#AgS(4_R;HD
z-Pc$OmXhi+Q1wt;J*49>;Sl~vsz(`|$C6$u4)L)^s>_coe%Jil_Dy|q@&nQP<GzRb
zYJHFF>wN_BUHkfKy|w=Diu*s=cdGmJNXPT#xExf|UdN!S4Ueo*U{A_PmA=PDxxrel
z5jLti09%8q<_2;QM!K%0<FKk~)7pUO(5*HL3VMjN+A212O>CgZK4+^Mh2&nW=HFXb
zExfl{%#>a%zgVrTmR~Gps)hF!UM#S0l?kDlYA%z{aAezR_Qh<b+V*1pz4;fbxnIt{
zS6s^LEjf%1eBDl)<Evi1_n8o&_!nkB#iRpA?$&~G`qF~AX!ZQ&r3>m$zZh2IKT<XL
z7b?Dg6Rh7y4Vb5B>08#s*MLj|J=~H#pot%g<jkr+W!KUvH+I#rmd<U8F`XJ_sC7+E
zt{m6m;W2l at X+_bWip{CUS^!yXoC;1eRfjr2%xf%SwYJob=(I?*siHx`=uo^8EH});
z>8Wt^CFbH$b*4_3Xt$H;dcHj=CG}DRX+3Y4j1d<JR$kIpK~p(h4ygE<fS1 at MM1>_x
zuqg$Vpgm?E$@?UtXoLYUlmIQ5PeFds8F~jXRS|Gzy|f;cZj^6SZY_ca*DEd}v8P at U
z94skT)KVWHqFFV>*tIFtY$i>7ikL~0_ at X60Qt+T+O`7lvoM7`9Mn|vJzl_>`89d~a
z|2rRrNC;U8+f%|<bE8Ov3Hh(c{tKA`uf(H*c#T%L at XW?Ln&6XJmvcdDeuNhdn5nY?
z;buDPvTg0c`K#|_=m+vw;ZOZwBm1QwcwB$a27ULDdG&^TNA_GkDr}o#RN3m-G96pB
z?ap(ibF2GY_c_zE)pM>pQWEuSo1X3ZcJG#{pX)o<w{3dQ^=|iXn}Mx?sDHaY7!5{4
z+a}r`IX4oSh_BIYGk$J-d;A<^Y-^mg?eVR#bM?{fF^C?yHL`6+&JAykoHHXFHxZ?W
zjBi0kw}!XtL(xdYzG!P`duYoHM?>fMg`uebb3IQO6SYUx$W)`s3#G`Ew=3r=TWsvu
z<{7Hn?OWyTdSSb;RoF86rDVJCMEE)7t1eCA?pYJrzH8skA-YjFOSB~)Iz-3ut1P;{
z4&asN{wf at j>n*Q5cQ%8=Z8oz7@;^iQzVEEOup at w;VCp^sus7uJ8TzekD`BdRKGf!b
z=9b%;#DKH(#+xPMn8xYNa at x*E<3^_g&pERUke43T!FK|%TTa2dg|fZdn*+`ANqre=
zdsx>*4f&epx}GN;T-hvFospWDgPoS-HrurT1bSqD3K*AbH#=-?t-h?2NpS at SDW_PV
z<8m4vK*5X_xTusRrJiB4tQqtQRFmWt3WlXMW|P?ZO6p2Pc3w-=<m(UIGgB*(CSSh?
zK)uV?eDlpxywC?H`@h2VmVdd++%L-Xole2)#c#S@;>@m`fwlaoS#EVC>Ag9q#T?M}
zvND;QJD_DZn0>I~80%~&+Jzl3+fqYfKcxiU2{R~7*iKNUena;uqy}5>@AOq)@%1IW
zO1qdP5(t*-ETz#B>lguF;5uqM3Kq&Yba{s!B=6(tpgg#9-a$-_#e^(t=Run{%Y?TQ
zay;`oE#r8Ze|)y&CsD?)eU&n1FbS_bX9x$CX-}lem^L4Y{B^kg;*ad|YatkYy7*4s
z{CTGZiHo9)3un}wwaWS|)U`p$O8Qo}zL&t-h92q^4Xw{n8{<CLXEi0v_BoyM63V%G
zESP>4h-Yk$$dyP!N-mnwqYHk0I;C!XhUfQ1d1?=QaRr;MJND1gUkd-%=d~%f<kn}^
zWS9K<9=1!xuJ6%WUd6A^Xg^T9Ji5nN7Pk&1o`E7)mi5_GzD=s at bLn;m<tWbIt5+$z
z_4$$%T;4spm*;d@`^+5N=1JF~8Ow9*<sY9Wzc1gTq at UL}^}z2^uF3Co at VBg<SM~f-
zxD~&!%kJS|;vKwbwaM^rzN4PO!Wj^ugS~q+bJ51_8p|6O{Q9i6s1CAD+p&veeGll?
zM{L(-)pXrP0-aU3JM5Hdd#E0-3+uYyKFW61E!&-jOk7uVS)c9qT1Z=;?RLbGPzq_j
zX3x!19kVsdI^P}g=qzL28jn~U3hB<xsxlYc`YhseJJc39KUHUrW2>mRwANa*>$8a4
z7Tu$B1;_hqVL$NMWjQYES{!_x<sY9dxrsXG{(mxwP4#|Hd4%_1sCwU?u6(;~=6{F&
z<G-&=&+9dh-`C at z<0EJCPIbx*YiSocRPyPlAJ#F*-1bOM=QE;TdYtM`yE8*oM`6vG
z;ku`Jm>k21pU at QK5Y<vQ3sj!9%+V7wIOmy6>Fa~Er`ly}hG<3g2RZ*B!}oxgA?j^@
ziQ|~2CI>iA8&wbTqLF1`YMM2J%d%hdmO~3%XV#m+X-~zR<407;tPeT5f4P3Y=glNs
zUpv*hIlfB}BggSRPm3)Y!axgvX9yifY-R`{NuK at GBy5iDZ652AHN%=N&p4tcuTL!c
zZURK|X+(1HPQGLJ{ZE>sOcnp%mxq8K>h&_Wv*bH(?-lu*@WbyYv?GhMUaTv)-&Ef3
zaWZvA3kn5i#(Ck7$LWmK9djpGACYk)J2N?LXDKY3QHsp~QZuSk`<8rtl-EM}{nm_W
zX9~O=+i#h1LjyNWD*R<eH4ku*b$DwJc{9Sd9FqE|Hb@@gcMfv?f-|FYp2QKyQ>k{7
ztm|}(an57jq#faR(gDQ&A=@u~?B|Uy4jmXJjpA|2qgC5}9eY0tkJs|h-1W3MeN at X4
z at OTtn3!r)ot4fSe9}T=R#7*k=mXudAGJe~N_q;8A8QJFFJhgc~dK>SRx^U&G%T2tO
z`B(-^bFmbqs()5<jXUqox$yW?=P!zpzYVv4`1_UN6}|FI(0PBf5j}vV!Qz+!RKWAL
z$Nq|Rs6*@Th4BME8W<6s!4wU^2s`eePM4^kStzh5>ZhkeW}qa@{G6R0pgBnP+o*rP
zU$l#yPp;kWVSUol_Tf4H)*k-i{96-l!mjl5?I(2IvPjf7VJ6lmZ!PxC++d=LEcUa0
zW8%hQ-}sI3^>MSJ)QsI&>>V|u>!WV5Z+Lys4aj1jrtiDg7yG)_YiBz+o<2=iv{7F{
zTA6JU4U?^skozYYjDwmU#Gy&Z{iy{)(Fc at GeEPPe8zKDI-LFW<X|R21b3<e8 at XuP{
z{EcGI4(D$hojWg;_`C4K at B4^yzE7|Bhf=$Ek7M0=35-lXfUUO-zX=l10_2#&oJbel
zF_a;khTj8>ya+n##$|%zChVk}^k#g at GR4H2aqXp<fzDXw^7#5Vr4N~72=MLay&2<`
z>2?lPOEaNtpAsYo9ra{KY<&z*ApPv`^L?%d%1eQ54a$sPsc_vgmb%FC1<?qnKCX(~
zCaCUOn$j58$5W*pfnPsy=f!ZOCYVR{#A7MDGLf=tu~gr&3?1O%H~h`!lbrbX;kj at B
zE#=d&Ugit0 at pdQK^FUF`whDi!gxR_?)0+AlVO{%F#=M!*eC-}*ruJIq)j;)q5&PIq
zBMJ-a!uvF=;Y}YiGVSV9Q<lLjoG<uFF_SunXULi<rdL?_G1<4)EsTIk at UQ;vB=}d1
ztxu(mP at Z)FhGDz*Ay-%j;7LKuq)r#gIWq~jq|MhS at o+b@{C?I_VS(;cM0SSyS-6&e
zjkH~cQ2v$Y{wCj-a_x!T;oW>OLRG#TJ~Qz)1M3Erb+5?&d$HSX6+8KWqL(a|T?@6L
zjYf33cFvnfr}AKphC<(Bxk75;xm9jCZwuB$>JRZ4k<RC-GI%;1DP$iFce}dnbI}kp
z+JsrJLxVR4Zw=g79O_%|Hr;Mzc)*g2^^3#IVw15O(a at M1^ONg~Lz6eA41;=b+DzY?
zG>d~Hw?@_ at vp6)oK4AK8tqk^>y6Iti&kbD`2YPPRZ}ghQ{(9P at WQV$Mbeig|#Q{(t
z^_!J`O8JiaP9I-Y at cl6JGk1K`y>I5A1^<=jz7IFvbWXQz<(*gI8~KOu#-o`k3{5qA
zA$ZIEt>ws>G^K~j)mM9Gp=rGdSE<&d)tjNb6nw>*K?B3O*^d>4B?c>s`@-7H;bxAw
zs9#gfCv7xv(pncw)SvcUv#wo}C$XZuBu0*L{0WKennVMqoaV}+0g|2MQ=)+*_MqF(
zI&bap6EZy*`9bNGXt3)#;Rk{(O5UTBL-Zo+eGX9`6KWhoS_*4Y?$?@O1^3V)4T{2B
zQD3+ou4ix9p6m@>&UNyA3)-E%L9x&-4(s!`*k~XvUkX2&ezxR4Ab|h%S^^+F`O0(O
zK+^tE-W7Q^6WmTtyjkZ-Y+jW>UJkboJ*fOoW5JKVMuA5n at UdF&Xn<~hhkG5&d6Khu
zuQD#L!<vC^p^oLv0R8S3+b}qZZ<^;hmq{6)gb%SLpKQ$_=|{iHc3nTk^RK$tTlmA9
zf&EFT50PTF$5}^Ctee4;_J}>e at 9p(dYa?tQuze}S>Ok5>fzOQjkmEE-j!WNBOc~sg
zPu^=C?}klT(!Z}f_f7eJUT$$WfDKPSap9_VW&C3p{lt$dTfSD=90U(tDBkN#*b0JO
zI)hMQj9Jtcc1+U(j>Pqnvm0=cjCeCouiaYLb+a%iV-^>%NWsufIJ2M*Wm2HR>mlgc
z<FzS1;`k98xk1k7|Fj`}QlF;*)Ah2y?$Qp-c~S?`!*N}XIG9qpCLX$=ydBGfIOkIX
z$-3tE%S3&OJB!ZDYYGhevR7vt=D03c$hTRukao#HQ9}<HSwI;r?3~AR3eNfV>+a{b
z<o99cU%rN-Wm0|~DA!Yd-chtWzWM(R&;9k!DMP!Ip<j?wcZa;YFKCmQGg?!|a85v7
z7T>Go52fVw`K!6!g3ZtPz_nO2nf1I;9s^pEidUbZ0wA|C*>8C(4abkz37K?eVhT(%
ziw_6BvY7EDp{tJlOi{B3#f)o60Gu6PYWlG81vjfceqz#&$uQ>+2<2JUYis0QM1N1;
zy1~2MoHiS9AC~)LU3)V!-b|%tQgT!JxV&r@=Kc9=FfZs-pJOUryQ5TEU$=Sw$;+FZ
z`bxO?nLkv%wd;jGCHDUIagW+ZEQuN4v4az7h$Lo$)?hp270XQ68P?}zzdy)x9JI_&
z;&|;QT=7u9OMSZTR_tLgi1rsAw$o$G)N?BmjW4-*I0FU}8iu*<kQ+c%%>)R>wmUOX
j_G$sm1nTA5oEZoGacA(w>5}rtwn%+4aQZ;N0Y3j9NZ_NG

literal 0
HcmV?d00001

diff --git a/file.c b/file.c
index b1e258b..ef56724 100644
--- a/file.c
+++ b/file.c
@@ -16,6 +16,8 @@
 #define O_BINARY 0
 #endif
 
+extern void datatrak_import(const char *file, struct dive_table *table);
+
 int readfile(const char *filename, struct memblock *mem)
 {
 	int ret, fd;
@@ -380,6 +382,11 @@ int parse_file(const char *filename)
 		}
 	}
 
+	if (fmt && (!strcasecmp(fmt + 1, "LOG"))) {
+		datatrak_import(filename, &dive_table);
+		return 0;
+	}
+
 	parse_file_buffer(filename, &mem);
 	free(mem.buffer);
 	return 0;
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index dfe8a23..305b6cd 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -1208,7 +1208,9 @@ void MainWindow::on_actionImportDiveLog_triggered()
 	QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Open dive log file"), lastUsedDir(),
 		tr("Dive log files (*.xml *.uddf *.udcf *.csv *.jlb *.dld *.sde *.db);;"
 			"XML files (*.xml);;UDDF/UDCF files(*.uddf *.udcf);;JDiveLog files(*.jlb);;"
-			"Suunto Files(*.sde *.db);;CSV Files(*.csv);;All Files(*)"));
+			"Suunto Files(*.sde *.db);;CSV Files(*.csv);;"
+			"Datatrak/WLog Files(*.log);;"
+			"All Files(*)"));
 
 	if (fileNames.isEmpty())
 		return;
diff --git a/subsurface.pro b/subsurface.pro
index 724e021..f2d9867 100644
--- a/subsurface.pro
+++ b/subsurface.pro
@@ -101,7 +101,8 @@ HEADERS = \
 	qt-ui/statistics/statisticswidget.h \
 	qt-ui/statistics/statisticsbar.h \
 	qt-ui/statistics/yearstatistics.h \
-	qt-ui/diveshareexportdialog.h
+	qt-ui/diveshareexportdialog.h \
+	datatrak.h
 
 android: HEADERS -= \
 	qt-ui/usermanual.h \
@@ -192,7 +193,8 @@ SOURCES =  \
 	qt-ui/statistics/yearstatistics.cpp \
 	qt-ui/statistics/statisticsbar.cpp \
 	qt-ui/statistics/monthstatistics.cpp \
-	qt-ui/diveshareexportdialog.cpp
+	qt-ui/diveshareexportdialog.cpp \
+	datatrak.c
 
 android: SOURCES += android.cpp
 else: win32: SOURCES += windows.c
-- 
1.7.10.4



More information about the subsurface mailing list