Skip to content

Feat: add logarithmic scale option for X and Y axes in Plot window #4158

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

Open
Negi2110 wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −6
Open

Feat: add logarithmic scale option for X and Y axes in Plot window #4158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 41 additions & 6 deletions src/PlotDock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ PlotDock::PlotDock(QWidget* parent)
m_showLegend(false),
m_stackedBars(false),
m_fixedFormat(false),
m_logScaleX(false),
m_logScaleY(false),
m_xtype(QVariant::Invalid)
{
ui->setupUi(this);
Expand Down Expand Up @@ -116,11 +118,24 @@ PlotDock::PlotDock(QWidget* parent)
fixedFormatsAction->setCheckable(true);
m_contextMenu->addAction(fixedFormatsAction);

connect(fixedFormatsAction, &QAction::toggled, this,
[=](bool fixed) {
m_fixedFormat = fixed;
adjustAxisFormat();
ui->plotWidget->replot();
QAction* logScaleXAction = new QAction(tr("Logarithmic scale (X)"), m_contextMenu);
logScaleXAction->setCheckable(true);
m_contextMenu->addAction(logScaleXAction);

connect(logScaleXAction, &QAction::toggled, this, [=](bool log) {
m_logScaleX = log;
updateLogScale();
ui->plotWidget->replot();
});

QAction* logScaleYAction = new QAction(tr("Logarithmic scale (Y)"), m_contextMenu);
logScaleYAction->setCheckable(true);
m_contextMenu->addAction(logScaleYAction);

connect(logScaleYAction, &QAction::toggled, this, [=](bool log) {
m_logScaleY = log;
updateLogScale();
ui->plotWidget->replot();
});

connect(ui->plotWidget, &QTableView::customContextMenuRequested, this,
Expand Down Expand Up @@ -544,6 +559,7 @@ void PlotDock::updatePlot(SqliteTableModel* model, BrowseDataTableSettings* sett
}

ui->plotWidget->rescaleAxes(true);
updateLogScale();
ui->plotWidget->legend->setVisible(m_showLegend);
// Legend with slightly transparent background brush:
ui->plotWidget->legend->setBrush(QColor(255, 255, 255, 150));
Expand Down Expand Up @@ -1048,7 +1064,26 @@ void PlotDock::adjustAxisFormat()
adjustOneAxisFormat(ui->plotWidget->yAxis, m_fixedFormat);
adjustOneAxisFormat(ui->plotWidget->yAxis2, m_fixedFormat);
}

void PlotDock::updateLogScale()
{
// Set scale type for X axis
ui->plotWidget->xAxis->setScaleType(
m_logScaleX ? QCPAxis::stLogarithmic : QCPAxis::stLinear);

// Set scale type for both Y axes
yAxes[0]->setScaleType(
m_logScaleY ? QCPAxis::stLogarithmic : QCPAxis::stLinear);
yAxes[1]->setScaleType(
m_logScaleY ? QCPAxis::stLogarithmic : QCPAxis::stLinear);

// Log scale breaks on zero/negative values — clamp range minimum to small positive
if(m_logScaleX && ui->plotWidget->xAxis->range().lower <= 0)
ui->plotWidget->xAxis->setRangeLower(1e-3);
if(m_logScaleY && yAxes[0]->range().lower <= 0)
yAxes[0]->setRangeLower(1e-3);
if(m_logScaleY && yAxes[1]->range().lower <= 0)
yAxes[1]->setRangeLower(1e-3);
}
void PlotDock::toggleStackedBars(bool stacked)
{
m_stackedBars = stacked;
Expand Down
3 changes: 3 additions & 0 deletions src/PlotDock.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ public slots:
bool m_showLegend;
bool m_stackedBars;
bool m_fixedFormat;
bool m_logScaleX;
bool m_logScaleY;
Palette m_graphPalette;
std::vector<QCPAxis *> yAxes;
std::vector<int> PlotColumnY;
Expand All @@ -112,6 +114,7 @@ public slots:
QVariant::Type guessDataType(SqliteTableModel* model, int column) const;
void adjustBars();
void adjustAxisFormat();
void updateLogScale();

private slots:
void columnItemChanged(QTreeWidgetItem* item, int column);
Expand Down
Loading