mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Attempt to detect date format on CSV import

Browse source 
This tries to detect the date format when initially reading a CSV file
for importing.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2016-01-31 14:37:57 +02:00 • committed by Dirk Hohndel
parent 16c082112c
commit d9072cdefd
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
desktop-widgets/divelogimportdialog.cpp
View file

@ -493,8 +493,14 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
} }
} }
if (triggeredBy == INITIAL || (triggeredBy == KNOWNTYPES && value == MANUAL) || triggeredBy == SEPARATOR) { if (triggeredBy == INITIAL || (triggeredBy == KNOWNTYPES && value == MANUAL) || triggeredBy == SEPARATOR) {
int count = -1;
QString line = f.readLine().trimmed();
QStringList columns;
if (line.length() > 0)
columns = line.split(separator);
// now try and guess the columns // now try and guess the columns
Q_FOREACH (QString columnText, currColumns) { Q_FOREACH (QString columnText, currColumns) {
count++;
/* /*
* We have to skip the conversion of 2 to ₂ for APD Log * We have to skip the conversion of 2 to ₂ for APD Log
* viewer as that would mess up the sensor numbering. We * viewer as that would mess up the sensor numbering. We
@ -513,6 +519,15 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
provider->removeRow(idx); provider->removeRow(idx);
headers.append(foundHeading); headers.append(foundHeading);
matchedSome = true; matchedSome = true;
if (foundHeading == QString::fromLatin1("Date") && columns.count() >= count) {
QString date = columns.at(count);
if (date.contains('-')) {
ui->DateFormat->setCurrentText("yyyy-mm-dd");
} else if (date.contains('/')) {
ui->DateFormat->setCurrentText("mm/dd/yyyy");
}
}
} else { } else {
headers.append(""); headers.append("");
} }