[PATCH 10/11] Match ₂ to 2 and cylinder to cyl. on CSV import

Miika Turkia miika.turkia at gmail.com
Sat Jan 24 07:03:17 PST 2015


This improves the column name matching so our own columns are properly
supported.

See #814

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

diff --git a/qt-ui/divelogimportdialog.cpp b/qt-ui/divelogimportdialog.cpp
index ecd09bc..ada1fc4 100644
--- a/qt-ui/divelogimportdialog.cpp
+++ b/qt-ui/divelogimportdialog.cpp
@@ -419,6 +419,8 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
 		Q_FOREACH (QString columnText, currColumns) {
 			columnText.replace("\"", "");
 			columnText.replace("number", "#", Qt::CaseInsensitive);
+			columnText.replace("2", "₂", Qt::CaseInsensitive);
+			columnText.replace("cylinder", "cyl.", Qt::CaseInsensitive);
 			int idx = provider->mymatch(columnText);
 			if (idx >= 0) {
 				QString foundHeading = provider->data(provider->index(idx, 0), Qt::DisplayRole).toString();
-- 
1.9.1



More information about the subsurface mailing list