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

plot: only allow X column to be selected once

Browse Source
This commit is contained in:
Peinthor Rene
2014-04-23 19:54:07 +02:00
parent d084646595
commit fdbda563d4
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/MainWindow.cpp
+29 -9
View File
@@ -1389,11 +1389,11 @@ void MainWindow::updatePlot(SqliteTableModel *model, bool update)
uint itemdata = 0; uint itemdata = 0;
itemdata = i << 16; itemdata = i << 16;
itemdata |= columntype; itemdata |= columntype;
columnitem->setData(0, Qt::UserRole, itemdata); columnitem->setData(PlotColumnField, Qt::UserRole, itemdata);
columnitem->setText(0, model->headerData(i, Qt::Horizontal).toString()); columnitem->setText(PlotColumnField, model->headerData(i, Qt::Horizontal).toString());
columnitem->setCheckState(1, Qt::Unchecked); columnitem->setCheckState(PlotColumnY, Qt::Unchecked);
columnitem->setCheckState(2, Qt::Unchecked); columnitem->setCheckState(PlotColumnX, Qt::Unchecked);
ui->treePlotColumns->addTopLevelItem(columnitem); ui->treePlotColumns->addTopLevelItem(columnitem);
} }
} }
@@ -1401,7 +1401,8 @@ void MainWindow::updatePlot(SqliteTableModel *model, bool update)
ui->plotWidget->yAxis->setLabel("Y"); ui->plotWidget->yAxis->setLabel("Y");
ui->plotWidget->xAxis->setLabel("X"); ui->plotWidget->xAxis->setLabel("X");
connect(ui->treePlotColumns, SIGNAL(itemChanged(QTreeWidgetItem*,int)),this,SLOT(on_treePlotColumns_itemChanged(QTreeWidgetItem*,int))); connect(ui->treePlotColumns, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
this,SLOT(on_treePlotColumns_itemChanged(QTreeWidgetItem*,int)));
} }
// search for the x axis select // search for the x axis select
@@ -1409,7 +1410,7 @@ void MainWindow::updatePlot(SqliteTableModel *model, bool update)
for(int i = 0; i < ui->treePlotColumns->topLevelItemCount(); ++i) for(int i = 0; i < ui->treePlotColumns->topLevelItemCount(); ++i)
{ {
xitem = ui->treePlotColumns->topLevelItem(i); xitem = ui->treePlotColumns->topLevelItem(i);
if(xitem->checkState(2) == Qt::Checked) if(xitem->checkState(PlotColumnX) == Qt::Checked)
break; break;
xitem = 0; xitem = 0;
@@ -1422,7 +1423,7 @@ void MainWindow::updatePlot(SqliteTableModel *model, bool update)
ui->plotWidget->clearGraphs(); ui->plotWidget->clearGraphs();
if(xitem) if(xitem)
{ {
uint xitemdata = xitem->data(0, Qt::UserRole).toUInt(); uint xitemdata = xitem->data(PlotColumnField, Qt::UserRole).toUInt();
int x = xitemdata >> 16; int x = xitemdata >> 16;
int xtype = xitemdata & (uint)0xFF; int xtype = xitemdata & (uint)0xFF;
@@ -1442,7 +1443,7 @@ void MainWindow::updatePlot(SqliteTableModel *model, bool update)
for(int i = 0; i < ui->treePlotColumns->topLevelItemCount(); ++i) for(int i = 0; i < ui->treePlotColumns->topLevelItemCount(); ++i)
{ {
QTreeWidgetItem* item = ui->treePlotColumns->topLevelItem(i); QTreeWidgetItem* item = ui->treePlotColumns->topLevelItem(i);
if(item->checkState((1)) == Qt::Checked && ui->plotWidget->graphCount() < colors.size()) if(item->checkState((PlotColumnY)) == Qt::Checked && ui->plotWidget->graphCount() < colors.size())
{ {
uint itemdata = item->data(0, Qt::UserRole).toUInt(); uint itemdata = item->data(0, Qt::UserRole).toUInt();
int column = itemdata >> 16; int column = itemdata >> 16;
@@ -1484,7 +1485,26 @@ void MainWindow::updatePlot(SqliteTableModel *model, bool update)
ui->plotWidget->replot(); ui->plotWidget->replot();
} }
void MainWindow::on_treePlotColumns_itemChanged(QTreeWidgetItem *item, int column) void MainWindow::on_treePlotColumns_itemChanged(QTreeWidgetItem *changeitem, int column)
{ {
// make sure only 1 X axis is selected
if(column == PlotColumnX)
{
// disable change updates, or we get unwanted redrawing and weird behavior
disconnect(ui->treePlotColumns, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
this,SLOT(on_treePlotColumns_itemChanged(QTreeWidgetItem*,int)));
for(int i = 0; i < ui->treePlotColumns->topLevelItemCount(); ++i)
{
QTreeWidgetItem* item = ui->treePlotColumns->topLevelItem(i);
if(item->checkState(column) == Qt::Checked && item != changeitem)
{
item->setCheckState(column, Qt::Unchecked);
}
}
connect(ui->treePlotColumns, SIGNAL(itemChanged(QTreeWidgetItem*,int)),
this,SLOT(on_treePlotColumns_itemChanged(QTreeWidgetItem*,int)));
}
updatePlot(m_currentPlotModel, false); updatePlot(m_currentPlotModel, false);
} }
src/MainWindow.h
+7
View File
@@ -56,6 +56,13 @@ private:
int wal_autocheckpoint; int wal_autocheckpoint;
} pragmaValues; } pragmaValues;
enum PlotColumns
{
PlotColumnField = 0,
PlotColumnY = 1,
PlotColumnX = 2
};
Ui::MainWindow* ui; Ui::MainWindow* ui;
SqliteTableModel* m_browseTableModel; SqliteTableModel* m_browseTableModel;