mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-05-12 06:49:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Set gaps when the x axis is NULL

Browse Source 
Gaps are requested to QCustomPlot when one of the coordinates of a point
is NaN. We were using that feature for the y axis, but not for the x axis
where null values where being converted to 0, which makes less sense than
making a gap, at least for consistency.

See issue #1977
This commit is contained in:
mgrojo
2019-08-26 23:19:33 +02:00
parent 1a0786c409
commit 6d9b8418ce
1 changed files with 36 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PlotDock.cpp
+36 -29
View File
@@ -331,36 +331,43 @@ void PlotDock::updatePlot(SqliteTableModel* model, BrowseDataTableSettings* sett
for(int j = 0; j < nrows; ++j)
{
tdata[j] = j;
// convert x type axis if it's datetime
switch (xtype) {
case QVariant::DateTime:
case QVariant::Date: {
QString s = model->data(model->index(j, x)).toString();
QDateTime d = QDateTime::fromString(s, Qt::ISODate);
xdata[j] = static_cast<double>(d.toMSecsSinceEpoch()) / 1000.0;
break;
}
case QVariant::Time: {
QString s = model->data(model->index(j, x)).toString();
QTime t = QTime::fromString(s);
xdata[j] = t.msecsSinceStartOfDay() / 1000.0;
break;
}
case QVariant::String: {
xdata[j] = j+1;
labels << model->data(model->index(j, x)).toString();
break;
}
default: {
// Get the x value for this point. If the selected column is -1, i.e. the row number, just use the current row number from the loop
// instead of retrieving some value from the model.
if(x == RowNumId)
xdata[j] = j+1;
else
xdata[j] = model->data(model->index(j, x)).toDouble();
}
}
// NULL values produce gaps in the graph. We use NaN values in
// that case as required by QCustomPlot.
if(x != RowNumId && model->data(model->index(j, x), Qt::EditRole).isNull())
xdata[j] = qQNaN();
else {
// convert x type axis if it's datetime
switch (xtype) {
case QVariant::DateTime:
case QVariant::Date: {
QString s = model->data(model->index(j, x)).toString();
QDateTime d = QDateTime::fromString(s, Qt::ISODate);
xdata[j] = static_cast<double>(d.toMSecsSinceEpoch()) / 1000.0;
break;
}
case QVariant::Time: {
QString s = model->data(model->index(j, x)).toString();
QTime t = QTime::fromString(s);
xdata[j] = t.msecsSinceStartOfDay() / 1000.0;
break;
}
case QVariant::String: {
xdata[j] = j+1;
labels << model->data(model->index(j, x)).toString();
break;
}
default: {
// Get the x value for this point. If the selected column is -1, i.e. the row number, just use the current row number from the loop
// instead of retrieving some value from the model.
if(x == RowNumId)
xdata[j] = j+1;
else
xdata[j] = model->data(model->index(j, x)).toDouble();
}
}
}
if (j != 0)
isSorted &= (xdata[j-1] <= xdata[j]);