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

Clean a lot of code for a new and improved CSV import dialog

Browse source 
This mostly cleans out stuff that is going to be uneeded.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2015-01-06 14:12:29 -02:00 • committed by Dirk Hohndel
parent 37830bdb53
commit 48775c530e
3 changed files with 98 additions and 1380 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

187
qt-ui/divelogimportdialog.cpp
View file

@ -31,53 +31,10 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList *fn, QWidget *parent) : QDi
for (int i = 0; !CSVApps[i].name.isNull(); ++i) for (int i = 0; !CSVApps[i].name.isNull(); ++i)
ui->knownImports->addItem(CSVApps[i].name); ui->knownImports->addItem(CSVApps[i].name);
ui->CSVSeparator->addItem("Tab"); ui->CSVSeparator->addItems( QStringList() << tr("Separator") << tr("Tab") << ";" << ",");
ui->CSVSeparator->addItem(",");
ui->CSVSeparator->addItem(";");
ui->knownImports->setCurrentIndex(1); ui->knownImports->setCurrentIndex(1);
ui->ManualSeparator->addItem("Tab");
ui->ManualSeparator->addItem(",");
ui->ManualSeparator->addItem(";");
ui->knownImports->setCurrentIndex(1);
connect(ui->CSVDepth, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->CSVTime, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->CSVTemperature, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->temperatureCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports()));
connect(ui->CSVpo2, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->po2CheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports()));
connect(ui->CSVcns, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->cnsCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports()));
connect(ui->CSVndl, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->ndlCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports()));
connect(ui->CSVtts, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->ttsCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports()));
connect(ui->CSVstopdepth, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->stopdepthCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports()));
connect(ui->CSVpressure, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
connect(ui->pressureCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports()));
/* manually import CSV file */ /* manually import CSV file */
connect(ui->DiveNumberCheck, SIGNAL(clicked(bool)), this, SLOT(manualDiveNumber()));
connect(ui->DateCheck, SIGNAL(clicked(bool)), this, SLOT(manualDate()));
connect(ui->TimeCheck, SIGNAL(clicked(bool)), this, SLOT(manualTime()));
connect(ui->LocationCheck, SIGNAL(clicked(bool)), this, SLOT(manualLocation()));
connect(ui->GpsCheck, SIGNAL(clicked(bool)), this, SLOT(manualGps()));
connect(ui->MaxDepthCheck, SIGNAL(clicked(bool)), this, SLOT(manualMaxDepth()));
connect(ui->MeanDepthCheck, SIGNAL(clicked(bool)), this, SLOT(manualMeanDepth()));
connect(ui->BuddyCheck, SIGNAL(clicked(bool)), this, SLOT(manualBuddy()));
connect(ui->NotesCheck, SIGNAL(clicked(bool)), this, SLOT(manualNotes()));
connect(ui->TagsCheck, SIGNAL(clicked(bool)), this, SLOT(manualTags()));
connect(ui->WeightCheck, SIGNAL(clicked(bool)), this, SLOT(manualWeight()));
connect(ui->DurationCheck, SIGNAL(clicked(bool)), this, SLOT(manualDuration()));
connect(ui->CylinderSizeCheck, SIGNAL(clicked(bool)), this, SLOT(manualCylinderSize()));
connect(ui->StartPressureCheck, SIGNAL(clicked(bool)), this, SLOT(manualStartPressure()));
connect(ui->EndPressureCheck, SIGNAL(clicked(bool)), this, SLOT(manualEndPressure()));
connect(ui->O2Check, SIGNAL(clicked(bool)), this, SLOT(manualO2()));
connect(ui->HeCheck, SIGNAL(clicked(bool)), this, SLOT(manualHe()));
connect(ui->AirTempCheck, SIGNAL(clicked(bool)), this, SLOT(manualAirTemp()));
connect(ui->WaterTempCheck, SIGNAL(clicked(bool)), this, SLOT(manualWaterTemp()));
QShortcut *close = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this); QShortcut *close = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this);
connect(close, SIGNAL(activated()), this, SLOT(close())); connect(close, SIGNAL(activated()), this, SLOT(close()));
QShortcut *quit = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this); QShortcut *quit = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this);
@ -92,11 +49,11 @@ DiveLogImportDialog::~DiveLogImportDialog()
#define VALUE_IF_CHECKED(x) (ui->x->isEnabled() ? ui->x->value() - 1 : -1) #define VALUE_IF_CHECKED(x) (ui->x->isEnabled() ? ui->x->value() - 1 : -1)
void DiveLogImportDialog::on_buttonBox_accepted() void DiveLogImportDialog::on_buttonBox_accepted()
{ {
if (ui->tabWidget->currentIndex() == 0) { /*
for (int i = 0; i < fileNames.size(); ++i) { for (int i = 0; i < fileNames.size(); ++i) {
if (ui->knownImports->currentText() == QString("Seabear CSV")) { if (ui->knownImports->currentText() == QString("Seabear CSV")) {
parse_seabear_csv_file(fileNames[i].toUtf8().data(), ui->CSVTime->value() - 1, parse_seabear_csv_file(fileNames[i].toUtf8().data(), ui->CSVTime->value() - 1,
ui->CSVDepth->value() - 1, 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(CSVndl), VALUE_IF_CHECKED(CSVndl),
@ -107,7 +64,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
specialCSV.contains(ui->knownImports->currentIndex()) ? CSVApps[ui->knownImports->currentIndex()].name.toUtf8().data() : "csv", specialCSV.contains(ui->knownImports->currentIndex()) ? CSVApps[ui->knownImports->currentIndex()].name.toUtf8().data() : "csv",
ui->CSVUnits->currentIndex()); ui->CSVUnits->currentIndex());
/* Seabear CSV stores NDL and TTS in Minutes, not seconds */ // Seabear CSV stores NDL and TTS in Minutes, not seconds
struct dive *dive = dive_table.dives[dive_table.nr - 1]; struct dive *dive = dive_table.dives[dive_table.nr - 1];
for(int s_nr = 0 ; s_nr <= dive->dc.samples ; s_nr++) { for(int s_nr = 0 ; s_nr <= dive->dc.samples ; s_nr++) {
struct sample *sample = dive->dc.sample + s_nr; struct sample *sample = dive->dc.sample + s_nr;
@ -147,7 +104,7 @@ void DiveLogImportDialog::on_buttonBox_accepted()
VALUE_IF_CHECKED(WaterTemp)); VALUE_IF_CHECKED(WaterTemp));
} }
} }
*/
process_dives(true, false); process_dives(true, false);
MainWindow::instance()->refreshDisplay(); MainWindow::instance()->refreshDisplay();
@ -159,34 +116,12 @@ void DiveLogImportDialog::on_buttonBox_accepted()
ui->CSV->setEnabled(VAL >= 0);\ ui->CSV->setEnabled(VAL >= 0);\
ui->BOX->setChecked(VAL >= 0);\ ui->BOX->setChecked(VAL >= 0);\
ui->CSV->blockSignals(false); }) ui->CSV->blockSignals(false); })
void DiveLogImportDialog::on_knownImports_currentIndexChanged(int index) void DiveLogImportDialog::on_knownImports_currentIndexChanged(int index)
{ {
if (specialCSV.contains(index)) {
ui->groupBox_3->setEnabled(false);
} else {
ui->groupBox_3->setEnabled(true);
}
if (index == 0) if (index == 0)
return; return;
ui->CSVTime->blockSignals(true);
ui->CSVDepth->blockSignals(true);
ui->CSVTime->setValue(CSVApps[index].time);
ui->CSVDepth->setValue(CSVApps[index].depth);
ui->CSVTime->blockSignals(false);
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);
SET_VALUE_AND_CHECKBOX(CSVndl, ndlCheckBox, CSVApps[index].ndl);
SET_VALUE_AND_CHECKBOX(CSVtts, ttsCheckBox, CSVApps[index].tts);
SET_VALUE_AND_CHECKBOX(CSVstopdepth, stopdepthCheckBox, CSVApps[index].stopdepth);
SET_VALUE_AND_CHECKBOX(CSVpressure, pressureCheckBox, CSVApps[index].pressure);
ui->CSVSeparator->blockSignals(true);
int separator_index = ui->CSVSeparator->findText(CSVApps[index].separator);
if (separator_index != -1)
ui->CSVSeparator->setCurrentIndex(separator_index);
ui->CSVSeparator->blockSignals(false);
} }
void DiveLogImportDialog::unknownImports() void DiveLogImportDialog::unknownImports()
@ -194,107 +129,3 @@ void DiveLogImportDialog::unknownImports()
if (!specialCSV.contains(ui->knownImports->currentIndex())) if (!specialCSV.contains(ui->knownImports->currentIndex()))
ui->knownImports->setCurrentIndex(0); ui->knownImports->setCurrentIndex(0);
} }
#define SET_COLUMN(CHECK, VALUE) ({\
if (ui->CHECK->isChecked()) {\
ui->VALUE->setEnabled(true);\
ui->VALUE->setValue(++column);\
} else {\
ui->VALUE->setEnabled(false);\
--column;}\
})
void DiveLogImportDialog::manualDiveNumber()
{
SET_COLUMN(DiveNumberCheck, DiveNumber);
}
void DiveLogImportDialog::manualDate()
{
SET_COLUMN(DateCheck, Date);
}
void DiveLogImportDialog::manualTime()
{
SET_COLUMN(TimeCheck, Time);
}
void DiveLogImportDialog::manualLocation()
{
SET_COLUMN(LocationCheck, Location);
}
void DiveLogImportDialog::manualGps()
{
SET_COLUMN(GpsCheck, Gps);
}
void DiveLogImportDialog::manualMaxDepth()
{
SET_COLUMN(MaxDepthCheck, MaxDepth);
}
void DiveLogImportDialog::manualMeanDepth()
{
SET_COLUMN(MeanDepthCheck, MeanDepth);
}
void DiveLogImportDialog::manualBuddy()
{
SET_COLUMN(BuddyCheck, Buddy);
}
void DiveLogImportDialog::manualNotes()
{
SET_COLUMN(NotesCheck, Notes);
}
void DiveLogImportDialog::manualTags()
{
SET_COLUMN(TagsCheck, Tags);
}
void DiveLogImportDialog::manualWeight()
{
SET_COLUMN(WeightCheck, Weight);
}
void DiveLogImportDialog::manualDuration()
{
SET_COLUMN(DurationCheck, Duration);
}
void DiveLogImportDialog::manualCylinderSize()
{
SET_COLUMN(CylinderSizeCheck, CylinderSize);
}
void DiveLogImportDialog::manualStartPressure()
{
SET_COLUMN(StartPressureCheck, StartPressure);
}
void DiveLogImportDialog::manualEndPressure()
{
SET_COLUMN(EndPressureCheck, EndPressure);
}
void DiveLogImportDialog::manualO2()
{
SET_COLUMN(O2Check, O2);
}
void DiveLogImportDialog::manualHe()
{
SET_COLUMN(HeCheck, He);
}
void DiveLogImportDialog::manualAirTemp()
{
SET_COLUMN(AirTempCheck, AirTemp);
}
void DiveLogImportDialog::manualWaterTemp()
{
SET_COLUMN(WaterTempCheck, WaterTemp);
}

20
qt-ui/divelogimportdialog.h
View file

@ -23,26 +23,6 @@ slots:
void on_knownImports_currentIndexChanged(int index); void on_knownImports_currentIndexChanged(int index);
void unknownImports(); void unknownImports();
void manualDiveNumber();
void manualDate();
void manualTime();
void manualLocation();
void manualGps();
void manualMaxDepth();
void manualMeanDepth();
void manualBuddy();
void manualNotes();
void manualTags();
void manualWeight();
void manualDuration();
void manualCylinderSize();
void manualStartPressure();
void manualEndPressure();
void manualO2();
void manualHe();
void manualAirTemp();
void manualWaterTemp();
private: private:
bool selector; bool selector;
QStringList fileNames; QStringList fileNames;

1271
qt-ui/divelogimportdialog.ui
View file

File diff suppressed because it is too large Load diff