Skip to content

Remember plot settings for each table #819

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MKleusberg merged 2 commits into from
Oct 14, 2016
Merged

Remember plot settings for each table #819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d9b1a2
Remember plot settings for each table
MKleusberg Oct 12, 2016
50db35b
Check for end of stream when loading project files
MKleusberg Oct 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 74 additions & 19 deletions src/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,9 @@ void MainWindow::populateTable()

// Encoding
m_browseTableModel->setEncoding(tableIt.value().encoding);

// Plot
updatePlot(m_browseTableModel, true, false);
} else {
// There aren't any information stored for this table yet, so use some default values

Expand All @@ -487,6 +490,9 @@ void MainWindow::populateTable()
// Encoding
m_browseTableModel->setEncoding(defaultBrowseTableEncoding);

// Plot
updatePlot(m_browseTableModel);

// The filters can be left empty as they are
}

Expand All @@ -499,9 +505,6 @@ void MainWindow::populateTable()
// Set the recordset label
setRecordsetLabel();

// update plot
updatePlot(m_browseTableModel);

QApplication::restoreOverrideCursor();
}

Expand Down Expand Up @@ -1794,7 +1797,7 @@ QVariant::Type guessdatatype(SqliteTableModel* model, int column)
}
}

void MainWindow::updatePlot(SqliteTableModel *model, bool update)
void MainWindow::updatePlot(SqliteTableModel *model, bool update, bool keepOrResetSelection)
{
// add columns to x/y selection tree widget
if(update)
Expand All @@ -1808,15 +1811,29 @@ void MainWindow::updatePlot(SqliteTableModel *model, bool update)
// save current selected columns, so we can restore them after the update
QString sItemX; // selected X column
QMap<QString, QColor> mapItemsY; // selected Y columns with color
for(int i = 0; i < ui->treePlotColumns->topLevelItemCount(); ++i)

if(keepOrResetSelection)
{
QTreeWidgetItem* item = ui->treePlotColumns->topLevelItem(i);
if(item->checkState(PlotColumnX) == Qt::Checked)
sItemX = item->text(PlotColumnField);
// Store the currently selected plot columns to restore them later
for(int i = 0; i < ui->treePlotColumns->topLevelItemCount(); ++i)
{
QTreeWidgetItem* item = ui->treePlotColumns->topLevelItem(i);
if(item->checkState(PlotColumnX) == Qt::Checked)
sItemX = item->text(PlotColumnField);

if(item->checkState(PlotColumnY) == Qt::Checked)
if(item->checkState(PlotColumnY) == Qt::Checked)
mapItemsY[item->text(PlotColumnField)] = item->backgroundColor(PlotColumnY);
}
} else {
// Get the plot columns to select from the stored browse table information
sItemX = browseTableSettings[ui->comboBrowseTable->currentText()].plotXAxis;

QMap<QString, PlotSettings> axesY = browseTableSettings[ui->comboBrowseTable->currentText()].plotYAxes;
QMap<QString, PlotSettings>::ConstIterator it = axesY.constBegin();
while(it != axesY.constEnd())
{
mapItemsY[item->text(PlotColumnField)] = item->backgroundColor(PlotColumnY);
mapItemsY.insert(it.key(), it.value().colour);
++it;
}
}

Expand Down Expand Up @@ -1964,6 +1981,7 @@ void MainWindow::on_treePlotColumns_itemChanged(QTreeWidgetItem *changeitem, int
this,SLOT(on_treePlotColumns_itemChanged(QTreeWidgetItem*,int)));

// make sure only 1 X axis is selected
QString current_table = ui->comboBrowseTable->currentText();
if(column == PlotColumnX)
{
for(int i = 0; i < ui->treePlotColumns->topLevelItemCount(); ++i)
Expand All @@ -1974,9 +1992,13 @@ void MainWindow::on_treePlotColumns_itemChanged(QTreeWidgetItem *changeitem, int
item->setCheckState(column, Qt::Unchecked);
}
}
}
else if(column == PlotColumnY)
{

// Save settings for this table
if(changeitem->checkState(column) == Qt::Checked)
browseTableSettings[current_table].plotXAxis = changeitem->text(PlotColumnField);
else
browseTableSettings[current_table].plotXAxis = QString();
} else if(column == PlotColumnY) {
if(changeitem->checkState(column) == Qt::Checked)
{
// get a default color
Expand All @@ -1985,10 +2007,17 @@ void MainWindow::on_treePlotColumns_itemChanged(QTreeWidgetItem *changeitem, int
if(color.isValid())
{
changeitem->setBackgroundColor(column, color);
}
else
{

// Save settings for this table
PlotSettings& plot_settings = browseTableSettings[current_table].plotYAxes[changeitem->text(PlotColumnField)];
plot_settings.colour = color;
plot_settings.lineStyle = ui->comboLineType->currentIndex();
plot_settings.pointShape = (ui->comboPointShape->currentIndex() > 0 ? (ui->comboPointShape->currentIndex()+1) : ui->comboPointShape->currentIndex());
} else {
changeitem->setCheckState(column, Qt::Unchecked);

// Save settings for this table
browseTableSettings[current_table].plotYAxes.remove(changeitem->text(PlotColumnField));
}
}
}
Expand All @@ -2012,14 +2041,22 @@ void MainWindow::on_treePlotColumns_itemDoubleClicked(QTreeWidgetItem *item, int
QColor curbkcolor = item->backgroundColor(column);
QColor precolor = !curbkcolor.isValid() ? (Qt::GlobalColor)(qrand() % 13 + 5) : curbkcolor;
QColor color = colordialog.getColor(precolor, this, tr("Choose a axis color"));
QString current_table = ui->comboBrowseTable->currentText();
if(color.isValid())
{
item->setCheckState(column, Qt::Checked);
item->setBackgroundColor(column, color);
}
else
{

// Save settings for this table
PlotSettings& plot_settings = browseTableSettings[current_table].plotYAxes[item->text(PlotColumnField)];
plot_settings.colour = color;
plot_settings.lineStyle = ui->comboLineType->currentIndex();
plot_settings.pointShape = (ui->comboPointShape->currentIndex() > 0 ? (ui->comboPointShape->currentIndex()+1) : ui->comboPointShape->currentIndex());
} else {
item->setCheckState(column, Qt::Unchecked);

// Save settings for this table
browseTableSettings[current_table].plotYAxes.remove(item->text(PlotColumnField));
}
}

Expand Down Expand Up @@ -2460,6 +2497,15 @@ void MainWindow::on_comboLineType_currentIndexChanged(int index)
graph->setLineStyle(lineStyle);
}
ui->plotWidget->replot();

// Save settings for this table
QMap<QString, PlotSettings>& graphs = browseTableSettings[ui->comboBrowseTable->currentText()].plotYAxes;
QMap<QString, PlotSettings>::Iterator it = graphs.begin();
while(it != graphs.end())
{
it.value().lineStyle = lineStyle;
++it;
}
}

void MainWindow::on_comboPointShape_currentIndexChanged(int index)
Expand All @@ -2476,6 +2522,15 @@ void MainWindow::on_comboPointShape_currentIndexChanged(int index)
graph->setScatterStyle(QCPScatterStyle(shape, 5));
}
ui->plotWidget->replot();

// Save settings for this table
QMap<QString, PlotSettings>& graphs = browseTableSettings[ui->comboBrowseTable->currentText()].plotYAxes;
QMap<QString, PlotSettings>::Iterator it = graphs.begin();
while(it != graphs.end())
{
it.value().pointShape = shape;
++it;
}
}

void MainWindow::jumpToRow(const QString& table, QString column, const QByteArray& value)
Expand Down
39 changes: 38 additions & 1 deletion src/MainWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,30 @@ class MainWindow : public QMainWindow

DBBrowserDB& getDb() { return db; }

struct PlotSettings
{
int lineStyle;
int pointShape;
QColor colour;

friend QDataStream& operator<<(QDataStream& stream, const MainWindow::PlotSettings& object)
{
stream << object.lineStyle;
stream << object.pointShape;
stream << object.colour;

return stream;
}
friend QDataStream& operator>>(QDataStream& stream, MainWindow::PlotSettings& object)
{
stream >> object.lineStyle;
stream >> object.pointShape;
stream >> object.colour;

return stream;
}
};

struct BrowseDataTableSettings
{
int sortOrderIndex;
Expand All @@ -42,6 +66,8 @@ class MainWindow : public QMainWindow
QMap<int, QString> displayFormats;
bool showRowid;
QString encoding;
QString plotXAxis;
QMap<QString, PlotSettings> plotYAxes;

friend QDataStream& operator<<(QDataStream& stream, const MainWindow::BrowseDataTableSettings& object)
{
Expand All @@ -52,6 +78,8 @@ class MainWindow : public QMainWindow
stream << object.displayFormats;
stream << object.showRowid;
stream << object.encoding;
stream << object.plotXAxis;
stream << object.plotYAxes;

return stream;
}
Expand All @@ -67,6 +95,15 @@ class MainWindow : public QMainWindow
stream >> object.showRowid;
stream >> object.encoding;

// Versions pre 3.10.0 didn't store the following information in their project files.
// To be absolutely sure that nothing strange happens when we read past the stream for
// those cases, check for the end of the stream here.
if(stream.atEnd())
return stream;

stream >> object.plotXAxis;
stream >> object.plotYAxes;

return stream;
}
};
Expand Down Expand Up @@ -218,7 +255,7 @@ private slots:
void loadExtension();
void reloadSettings();
void httpresponse(QNetworkReply* reply);
void updatePlot(SqliteTableModel* model, bool update = true);
void updatePlot(SqliteTableModel* model, bool update = true, bool keepOrResetSelection = true);
void on_treePlotColumns_itemChanged(QTreeWidgetItem *item, int column);
void on_treePlotColumns_itemDoubleClicked(QTreeWidgetItem *item, int column);
void on_butSavePlot_clicked();
Expand Down