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

Switch Subsurface CSV import to use tab separator

Browse source 
As changing the export to use tabs, we need to switch the import to do
that as well. However, we also need to support comma separation as older
exports use that.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2015-01-24 17:03:15 +02:00 • committed by Dirk Hohndel
parent b8d02b4b27
commit fb367b22b0
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
qt-ui/divelogimportdialog.cpp
View file

@ -16,7 +16,7 @@ const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] =
{ "XP5", 0, 1, 9, -1, -1, -1, -1, -1, -1, "Tab" },
{ "SensusCSV", 9, 10, -1, -1, -1, -1, -1, -1, -1, "," },
{ "Seabear CSV", 0, 1, 5, -1, -1, 2, 3, 4, 6, ";" },
{ "SubsurfaceCSV", -1, -1, -1, -1, -1, -1, -1, -1, -1, "," },
{ "SubsurfaceCSV", -1, -1, -1, -1, -1, -1, -1, -1, -1, "Tab" },
{ NULL, }
};
@ -440,7 +440,21 @@ void DiveLogImportDialog::loadFileContents(int value, whatChanged triggeredBy)
}
if (triggeredBy == KNOWNTYPES && value != 0) {
// an actual known type
separator = CSVApps[value].separator;
if (value == 5) {
/*
* Subsurface CSV file needs separator detection
* as we used to default to comma but switched
* to tab.
*/
int tabs = firstLine.count('\t');
int commas = firstLine.count(',');
if (tabs > commas)
separator = "Tab";
else
separator = ",";
} else {
separator = CSVApps[value].separator;
}
if (ui->CSVSeparator->currentText() != separator || separator == "Tab") {
ui->CSVSeparator->blockSignals(true);