jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-05 22:45:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve autoscaling when no traces are visible, fix display issue of long tick labels

Browse source
This commit is contained in:
Jan Käberich 2022-10-25 13:23:08 +02:00
parent 53702a8154
commit c343cdf69f
6 changed files with 36 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Software/PC_Application/LibreVNA-GUI/Traces/tracexyplot.cpp
View file

@ -279,6 +279,8 @@ int TraceXYPlot::sideMargin(bool YAxisEnabled)
void TraceXYPlot::axisSetupDialog()
{
auto setup = new XYplotAxisDialog(this);
setup->setAttribute(Qt::WA_DeleteOnClose);
connect(setup, &QDialog::finished, this, &TraceXYPlot::updateAxisTicks);
if(AppWindow::showGUI()) {
setup->show();
}
@ -691,7 +693,7 @@ void TraceXYPlot::draw(QPainter &p)
p.setPen(QPen(pref.Graphs.Color.axis, 1));
if(displayFullFreq) {
QRect bounding;
p.drawText(QRect(xCoord - pref.Graphs.fontSizeAxis*2, plotAreaBottom + 5, pref.Graphs.fontSizeAxis*4,
p.drawText(QRect(xCoord - pref.Graphs.fontSizeAxis*4, plotAreaBottom + 5, pref.Graphs.fontSizeAxis*8,
pref.Graphs.fontSizeAxis), Qt::AlignHCenter, tickValue, &bounding);
lastTickLabelEnd = bounding.x() + bounding.width();
} else {
@ -703,7 +705,7 @@ void TraceXYPlot::draw(QPainter &p)
tickValue.remove(0, tickValue.size() - displayLastDigits - unit.length());
QRect bounding;
p.drawText(QRect(xCoord - 40, plotAreaBottom + 5, 80, pref.Graphs.fontSizeAxis), Qt::AlignHCenter, tickValue, &bounding);
p.drawText(QRect(xCoord - pref.Graphs.fontSizeAxis*4, plotAreaBottom + 5, pref.Graphs.fontSizeAxis*8, pref.Graphs.fontSizeAxis), Qt::AlignHCenter, tickValue, &bounding);
lastTickLabelEnd = bounding.x() + bounding.width();
p.setPen(QPen(QColor("orange")));
p.drawText(QRect(0, plotAreaBottom + 5, bounding.x() - 1, pref.Graphs.fontSizeAxis), Qt::AlignRight, "..", &bounding);
@ -823,9 +825,7 @@ void TraceXYPlot::updateAxisTicks()
}
}
}
if(min < max) {
xAxis.set(xAxis.getType(), xAxis.getLog(), true, min, max, 0);
}
xAxis.set(xAxis.getType(), xAxis.getLog(), true, min, max, 0);
}
for(int i=0;i<2;i++) {