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

Use field numbers in CSV import instead of indexes

Browse source 
For the common user, a field number is more intuitive than field index.
So let's use that in numbering CSV import fields.

Fixes #388

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2013-12-29 07:52:44 +02:00 • committed by Dirk Hohndel
parent 7c8a39015a
commit 03666fb765
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/csvimportdialog.cpp
View file

@ -6,8 +6,8 @@
const CSVImportDialog::CSVAppConfig CSVImportDialog::CSVApps[CSVAPPS] = { const CSVImportDialog::CSVAppConfig CSVImportDialog::CSVApps[CSVAPPS] = {
{"", }, {"", },
{"APD Log Viewer", 0, 1, 15, 6, 17, 18, "Tab"}, {"APD Log Viewer", 1, 2, 16, 7, 18, 19, "Tab"},
{"XP5", 0, 1, 9, -1, -1, -1, "Tab"}, {"XP5", 1, 2, 10, -1, -1, -1, "Tab"},
{NULL,} {NULL,}
}; };
@ -43,13 +43,13 @@ CSVImportDialog::~CSVImportDialog()
delete ui; delete ui;
} }
#define VALUE_IF_CHECKED(x) (ui->x->isEnabled() ? ui->x->value() : -1) #define VALUE_IF_CHECKED(x) (ui->x->isEnabled() ? ui->x->value() - 1: -1)
void CSVImportDialog::on_buttonBox_accepted() void CSVImportDialog::on_buttonBox_accepted()
{ {
char *error = NULL; char *error = NULL;
parse_csv_file(ui->CSVFile->text().toUtf8().data(), ui->CSVTime->value(), parse_csv_file(ui->CSVFile->text().toUtf8().data(), ui->CSVTime->value() - 1,
ui->CSVDepth->value(), VALUE_IF_CHECKED(CSVTemperature), ui->CSVDepth->value() - 1, VALUE_IF_CHECKED(CSVTemperature),
VALUE_IF_CHECKED(CSVpo2), VALUE_IF_CHECKED(CSVpo2),
VALUE_IF_CHECKED(CSVcns), VALUE_IF_CHECKED(CSVcns),
VALUE_IF_CHECKED(CSVstopdepth), VALUE_IF_CHECKED(CSVstopdepth),

20
qt-ui/csvimportdialog.ui
View file

@ -68,10 +68,10 @@
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSpinBox" name="CSVTime"> <widget class="QSpinBox" name="CSVTime">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>0</number> <number>1</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -85,10 +85,10 @@
<item row="1" column="1"> <item row="1" column="1">
<widget class="QSpinBox" name="CSVDepth"> <widget class="QSpinBox" name="CSVDepth">
<property name="minimum"> <property name="minimum">
<number>0</number> <number>1</number>
</property> </property>
<property name="value"> <property name="value">
<number>1</number> <number>2</number>
</property> </property>
</widget> </widget>
</item> </item>
@ -101,6 +101,9 @@
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QSpinBox" name="CSVTemperature"> <widget class="QSpinBox" name="CSVTemperature">
<property name="minimum">
<number>1</number>
</property>
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -115,6 +118,9 @@
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QSpinBox" name="CSVpo2"> <widget class="QSpinBox" name="CSVpo2">
<property name="minimum">
<number>1</number>
</property>
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -132,6 +138,9 @@
</item> </item>
<item row="4" column="1"> <item row="4" column="1">
<widget class="QSpinBox" name="CSVcns"> <widget class="QSpinBox" name="CSVcns">
<property name="minimum">
<number>1</number>
</property>
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>
@ -149,6 +158,9 @@
</item> </item>
<item row="5" column="1"> <item row="5" column="1">
<widget class="QSpinBox" name="CSVstopdepth"> <widget class="QSpinBox" name="CSVstopdepth">
<property name="minimum">
<number>1</number>
</property>
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
</property> </property>