mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 07:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add the data() method

Browse source 
Now we can correctly visualize the file data, and changing
the separator will update on the fly.

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 16:37:36 -02:00 • committed by Dirk Hohndel
parent 58e21a6160
commit 74596cc193
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
qt-ui/divelogimportdialog.cpp
View file

@ -156,7 +156,15 @@ bool ColumnNameResult::setData(const QModelIndex &index, const QVariant &value,
QVariant ColumnNameResult::data(const QModelIndex &index, int role) const QVariant ColumnNameResult::data(const QModelIndex &index, int role) const
{ {
if (!index.isValid())
return QVariant();
if (role != Qt::DisplayRole)
return QVariant();
if (index.row() == 0) {
return (columnNames[index.column()]);
}
return QVariant(columnValues[index.row() -1][index.column()]);
} }
int ColumnNameResult::rowCount(const QModelIndex &parent) const int ColumnNameResult::rowCount(const QModelIndex &parent) const
@ -211,7 +219,7 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList fn, QWidget *parent) : QDia
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->addItems( QStringList() << tr("Separator") << tr("Tab") << ";" << ","); ui->CSVSeparator->addItems( QStringList() << tr("Tab") << ";" << ",");
ui->knownImports->setCurrentIndex(1); ui->knownImports->setCurrentIndex(1);
ColumnNameProvider *provider = new ColumnNameProvider(this); ColumnNameProvider *provider = new ColumnNameProvider(this);
@ -227,6 +235,8 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList fn, QWidget *parent) : QDia
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);
connect(quit, SIGNAL(activated()), parent, SLOT(close())); connect(quit, SIGNAL(activated()), parent, SLOT(close()));
connect(ui->CSVSeparator, SIGNAL(currentIndexChanged(int)), this, SLOT(loadFileContents()));
} }
DiveLogImportDialog::~DiveLogImportDialog() DiveLogImportDialog::~DiveLogImportDialog()
@ -243,7 +253,9 @@ void DiveLogImportDialog::loadFileContents() {
int rows = 0; int rows = 0;
while (rows < 10 || !f.atEnd()) { while (rows < 10 || !f.atEnd()) {
QString currLine = f.readLine(); QString currLine = f.readLine();
currColumns = currLine.split( ui->CSVSeparator->currentText() ); QString separator = ui->CSVSeparator->currentText() == tr("Tab") ? "\t"
: ui->CSVSeparator->currentText();
currColumns = currLine.split(separator);
fileColumns.append(currColumns); fileColumns.append(currColumns);
rows += 1; rows += 1;
} }