mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-20 11:00:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

plot: Allow plotting of column when there is a NULL value in it

Browse Source 
This enables plotting even for those columns which contain NULL values.
To distinguish NULL from a numeric 0 there is nothing drawn for NULL
values, i.e. there is a gap in the graph.

See issue #822.
This commit is contained in:
Martin Kleusberg
2016-10-13 21:55:21 +02:00
parent 980429debd
commit 7570a0092d
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/MainWindow.cpp
View File

@@ -1798,12 +1798,10 @@ QVariant::Type guessdatatype(SqliteTableModel* model, int column)
for(int i = 0; i < std::min(10, model->rowCount()) && type != QVariant::String; ++i)
{
QVariant data = model->data(model->index(i, column), Qt::EditRole);
if(data.convert(QVariant::Double))
if(data.isNull() || data.convert(QVariant::Double))
{
type = QVariant::Double;
}
else
{
} else {
QString s = model->data(model->index(i, column)).toString();
QDate d = QDate::fromString(s, Qt::ISODate);
if(d.isValid())
@@ -1811,8 +1809,8 @@ QVariant::Type guessdatatype(SqliteTableModel* model, int column)
else
type = QVariant::String;
}
}
return type;
}
}
@@ -1955,7 +1953,11 @@ void MainWindow::updatePlot(SqliteTableModel *model, bool update)
xdata[i] = model->data(model->index(i, x)).toDouble();
}
ydata[i] = model->data(model->index(i, y)).toDouble();
QVariant pointdata = model->data(model->index(i, y), Qt::EditRole);
if(pointdata.isNull())
ydata[i] = qQNaN();
else
ydata[i] = pointdata.toDouble();
}
// set some graph styles