From 86ac7fdf47142d8ad26a27a36daa64a5ea435bdc Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Sun, 22 Mar 2015 17:13:47 +0200
Subject: Import support for new Seabear format

This add support for Seabear's new import format that is used by H3 and
T1. In the future also the Hudc  should switch to the new format. The
main difference to the old one is that time stamps are no longer
recorded in the samples, but intervali is specified in the header.

The header contains other useful information as well that we should
build support for. E.g. surface pressure, gas mixes, GF, and mode might
be useful additions later on.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-ui/divelogimportdialog.cpp | 52 +++++++++++++++++++++++++++++++++++++++++--
 qt-ui/divelogimportdialog.h   |  1 +
 2 files changed, 51 insertions(+), 2 deletions(-)

(limited to 'qt-ui')

diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index 9697cbf46..cccafdabf 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -316,6 +316,7 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList fn, QWidget *parent) : QDia
 	ui->setupUi(this);
 	fileNames = fn;
 	column = 0;
+	delta = "0";
 
 	/* Add indexes of XSLTs requiring special handling to the list */
 	specialCSV << 3;
@@ -375,7 +376,53 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
 	QString firstLine = f.readLine();
 	if (firstLine.contains("SEABEAR")) {
 		seabear = true;
-		firstLine = "Sample time;Sample depth;Sample NDL;Sample TTS;Sample stopdepth;Sample temperature;Sample pressure";
+
+		/*
+		 * Parse header - currently only interested in sample
+		 * interval, or if we have old format (if interval value
+		 * is missing from the header).
+		 */
+
+		while ((firstLine = f.readLine()).length() > 3 && !f.atEnd()) {
+			if (firstLine.contains("//Log interval: "))
+				delta = firstLine.remove(QString::fromLatin1("//Log interval: ")).trimmed();
+		}
+
+		/*
+		 * Parse CSV fields
+		 * The pO2 values from CCR diving are ignored later on.
+		 */
+
+		firstLine = f.readLine().trimmed();
+
+		currColumns = firstLine.split(';');
+		Q_FOREACH (QString columnText, currColumns) {
+			if (columnText == "Time") {
+				headers.append("Sample time");
+			} else if (columnText == "Depth") {
+				headers.append("Sample depth");
+			} else if (columnText == "Temperature") {
+				headers.append("Sample temperature");
+			} else if (columnText == "NDT") {
+				headers.append("Sample NDL");
+			} else if (columnText == "TTS") {
+				headers.append("Sample TTS");
+			} else if (columnText == "pO2_1") {
+				headers.append("Sample pO2_1");
+			} else if (columnText == "pO2_2") {
+				headers.append("Sample pO2_2");
+			} else if (columnText == "pO2_3") {
+				headers.append("Sample pO2_3");
+			} else if (columnText == "Ceiling") {
+				headers.append("Sample ceiling");
+			} else {
+				// We do not know about this value
+				qDebug() << "Seabear import found an un-handled field: " << columnText;
+				headers.append("");
+			}
+		}
+
+		firstLine = headers.join(";");
 		blockSignals(true);
 		ui->knownImports->setCurrentText("Seabear CSV");
 		blockSignals(false);
@@ -543,7 +590,8 @@ void DiveLogImportDialog::on_buttonBox_accepted()
 						       r.indexOf(tr("Sample pressure")),
 						       ui->CSVSeparator->currentIndex(),
 						       specialCSV.contains(ui->knownImports->currentIndex()) ? CSVApps[ui->knownImports->currentIndex()].name.toUtf8().data() : "csv",
-						       ui->CSVUnits->currentIndex()
+						       ui->CSVUnits->currentIndex(),
+						       delta.toUtf8().data()
 						       ) < 0)
 					return;
 
diff --git a/qt-ui/divelogimportdialog.h b/qt-ui/divelogimportdialog.h
index 9281b2b10..e7d068a81 100644
--- a/qt-ui/divelogimportdialog.h
+++ b/qt-ui/divelogimportdialog.h
@@ -95,6 +95,7 @@ private:
 	QList<int> specialCSV;
 	int column;
 	ColumnNameResult *resultModel;
+	QString delta;
 
 	struct CSVAppConfig {
 		QString name;
-- 
cgit v1.2.3-70-g09d2