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

Add optional support for cns import from csv files

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Anton Lundin 2013-11-21 23:48:41 +01:00 • committed by Dirk Hohndel
parent 8dde12fa35
commit 5eccd73a30
6 changed files with 52 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qt-ui/csvimportdialog.cpp
View file

@ -6,8 +6,8 @@
const CSVImportDialog::CSVAppConfig CSVImportDialog::CSVApps[CSVAPPS] = {
{"", },
{"APD Log Viewer", 0, 1, 15, 6, "Tab"},
{"XP5", 0, 1, 9, -1, "Tab"},
{"APD Log Viewer", 0, 1, 15, 6, 17, "Tab"},
{"XP5", 0, 1, 9, -1, -1, "Tab"},
{NULL,}
};
@ -31,6 +31,8 @@ CSVImportDialog::CSVImportDialog(QWidget *parent) :
connect(ui->temperatureCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports(bool)));
connect(ui->CSVpo2, SIGNAL(valueChanged(int)), this, SLOT(unknownImports(int)));
connect(ui->po2CheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports(bool)));
connect(ui->CSVcns, SIGNAL(valueChanged(int)), this, SLOT(unknownImports(int)));
connect(ui->cnsCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports(bool)));
}
CSVImportDialog::~CSVImportDialog()
@ -46,6 +48,7 @@ void CSVImportDialog::on_buttonBox_accepted()
parse_csv_file(ui->CSVFile->text().toUtf8().data(), ui->CSVTime->value(),
ui->CSVDepth->value(), VALUE_IF_CHECKED(CSVTemperature),
VALUE_IF_CHECKED(CSVpo2),
VALUE_IF_CHECKED(CSVcns),
&error);
if (error != NULL) {
@ -88,6 +91,7 @@ void CSVImportDialog::on_knownImports_currentIndexChanged(int index)
ui->CSVDepth->blockSignals(false);
SET_VALUE_AND_CHECKBOX(CSVTemperature, temperatureCheckBox, CSVApps[index].temperature);
SET_VALUE_AND_CHECKBOX(CSVpo2, po2CheckBox, CSVApps[index].po2);
SET_VALUE_AND_CHECKBOX(CSVcns, cnsCheckBox, CSVApps[index].cns);
}
void CSVImportDialog::unknownImports(bool arg1)

1
qt-ui/csvimportdialog.h
View file

@ -38,6 +38,7 @@ private:
int depth;
int temperature;
int po2;
int cns;
QString separator;
};

25
qt-ui/csvimportdialog.ui
View file

@ -166,6 +166,23 @@
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QSpinBox" name="CSVcns">
<property name="enabled">
<bool>false</bool>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QCheckBox" name="cnsCheckBox">
<property name="text">
<string>Cns</string>
</property>
</widget>
</item>
</layout>
<zorder>label</zorder>
<zorder>label_2</zorder>
@ -175,6 +192,8 @@
<zorder>CSVTemperature</zorder>
<zorder>po2CheckBox</zorder>
<zorder>CSVpo2</zorder>
<zorder>cnsCheckBox</zorder>
<zorder>CSVcns</zorder>
</widget>
<widget class="QGroupBox" name="groupBox_4">
<property name="geometry">
@ -249,5 +268,11 @@
<receiver>CSVpo2</receiver>
<slot>setEnabled(bool)</slot>
</connection>
<connection>
<sender>cnsCheckBox</sender>
<signal>clicked(bool)</signal>
<receiver>CSVcns</receiver>
<slot>setEnabled(bool)</slot>
</connection>
</connections>
</ui>