[PATCH 2/5] CSV import: improve header parsing

Miika Turkia miika.turkia at gmail.com
Sun Sep 6 03:06:15 PDT 2015


The skipping of header field manipulation for APD was a bit too
aggressive, skipping the header fix up for all logs when on initial
state. Also, addition of APD2 was not taken into account.

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 qt-ui/divelogimportdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index 12e3666..baf91de 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -501,7 +501,7 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
 			 * also know that the column headers do not need this
 			 * conversion.
 			 */
-			if (triggeredBy == KNOWNTYPES && value != APD) {
+			if (apd == false) {
 				columnText.replace("\"", "");
 				columnText.replace("number", "#", Qt::CaseInsensitive);
 				columnText.replace("2", "₂", Qt::CaseInsensitive);
-- 
2.1.4



More information about the subsurface mailing list