mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
609715ab69
The "report_error()" interface is a lot simpler, although some of the C++ code uses QStrings which make them a bit annoying, especially for the varargs model. Still, even with the explicit conversion to UTF8 and "char *", the report_error() model is much nicer. This also just makes refreshDisplay() do the error reporting in the UI automatically, so a number of error paths don't even have to worry. And the multi-line model of error reporting means that it all automatically does the right thing, and reports errors for each file rather than just for the last file that failed to open. So this removes closer to a hundred lines of cruft, while being a simpler interface and doing better error reporting. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
124 lines
4.5 KiB
C++
124 lines
4.5 KiB
C++
#include <QtDebug>
|
|
#include <QFileDialog>
|
|
#include "divelogimportdialog.h"
|
|
#include "mainwindow.h"
|
|
#include "ui_divelogimportdialog.h"
|
|
|
|
const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] = {
|
|
{ "", },
|
|
{ "APD Log Viewer", 1, 2, 16, 7, 18, 19, "Tab" },
|
|
{ "XP5", 1, 2, 10, -1, -1, -1, "Tab" },
|
|
{ "SensusCSV", 10, 11, -1, -1, -1, -1, "," },
|
|
{ NULL, }
|
|
};
|
|
|
|
DiveLogImportDialog::DiveLogImportDialog(QStringList *fn, QWidget *parent) : QDialog(parent),
|
|
selector(true),
|
|
ui(new Ui::DiveLogImportDialog)
|
|
{
|
|
ui->setupUi(this);
|
|
fileNames = *fn;
|
|
|
|
/* Add indexes of XSLTs requiring special handling to the list */
|
|
specialCSV << 3;
|
|
|
|
for (int i = 0; !CSVApps[i].name.isNull(); ++i)
|
|
ui->knownImports->addItem(CSVApps[i].name);
|
|
|
|
ui->CSVSeparator->addItem("Tab");
|
|
ui->CSVSeparator->addItem(",");
|
|
ui->CSVSeparator->addItem(";");
|
|
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->CSVstopdepth, SIGNAL(valueChanged(int)), this, SLOT(unknownImports()));
|
|
connect(ui->stopdepthCheckBox, SIGNAL(clicked(bool)), this, SLOT(unknownImports()));
|
|
}
|
|
|
|
DiveLogImportDialog::~DiveLogImportDialog()
|
|
{
|
|
delete ui;
|
|
}
|
|
|
|
#define VALUE_IF_CHECKED(x) (ui->x->isEnabled() ? ui->x->value() - 1 : -1)
|
|
void DiveLogImportDialog::on_buttonBox_accepted()
|
|
{
|
|
if (ui->tabWidget->currentIndex() == 0) {
|
|
for (int i = 0; i < fileNames.size(); ++i) {
|
|
parse_csv_file(fileNames[i].toUtf8().data(), ui->CSVTime->value() - 1,
|
|
ui->CSVDepth->value() - 1, VALUE_IF_CHECKED(CSVTemperature),
|
|
VALUE_IF_CHECKED(CSVpo2),
|
|
VALUE_IF_CHECKED(CSVcns),
|
|
VALUE_IF_CHECKED(CSVstopdepth),
|
|
ui->CSVSeparator->currentIndex(),
|
|
specialCSV.contains(ui->knownImports->currentIndex()) ? CSVApps[ui->knownImports->currentIndex()].name.toUtf8().data() : "csv",
|
|
ui->CSVUnits->currentIndex());
|
|
}
|
|
} else {
|
|
for (int i = 0; i < fileNames.size(); ++i) {
|
|
parse_manual_file(fileNames[i].toUtf8().data(),
|
|
ui->ManualSeparator->currentIndex(),
|
|
ui->Units->currentIndex(),
|
|
VALUE_IF_CHECKED(DiveNumber),
|
|
VALUE_IF_CHECKED(Date), VALUE_IF_CHECKED(Time),
|
|
VALUE_IF_CHECKED(Duration), VALUE_IF_CHECKED(Location),
|
|
VALUE_IF_CHECKED(Gps), VALUE_IF_CHECKED(MaxDepth),
|
|
VALUE_IF_CHECKED(MeanDepth), VALUE_IF_CHECKED(Buddy),
|
|
VALUE_IF_CHECKED(Notes), VALUE_IF_CHECKED(Weight),
|
|
VALUE_IF_CHECKED(Tags));
|
|
}
|
|
}
|
|
process_dives(true, false);
|
|
|
|
MainWindow::instance()->refreshDisplay();
|
|
}
|
|
|
|
#define SET_VALUE_AND_CHECKBOX(CSV, BOX, VAL) ({\
|
|
ui->CSV->blockSignals(true);\
|
|
ui->CSV->setValue(VAL);\
|
|
ui->CSV->setEnabled(VAL >= 0);\
|
|
ui->BOX->setChecked(VAL >= 0);\
|
|
ui->CSV->blockSignals(false); })
|
|
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)
|
|
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(CSVstopdepth, stopdepthCheckBox, CSVApps[index].stopdepth);
|
|
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()
|
|
{
|
|
if (!specialCSV.contains(ui->knownImports->currentIndex()))
|
|
ui->knownImports->setCurrentIndex(0);
|
|
}
|