caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent crash on Y-axis autoscale when all trace values are identical

Browse Source
This commit is contained in:
Jan Käberich 2020-11-27 16:53:41 +01:00
parent d81b8168ad
commit 6893af1386
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Software/PC_Application/Traces/tracexyplot.cpp
View File

@ -462,6 +462,7 @@ void TraceXYPlot::updateAxisTicks()
}; };
auto createAutomaticTicks = [](vector<double>& ticks, double start, double stop, int minDivisions) -> double { auto createAutomaticTicks = [](vector<double>& ticks, double start, double stop, int minDivisions) -> double {
Q_ASSERT(stop > start);
ticks.clear(); ticks.clear();
double max_div_step = (stop - start) / minDivisions; double max_div_step = (stop - start) / minDivisions;
int zeros = floor(log10(max_div_step)); int zeros = floor(log10(max_div_step));
@ -561,15 +562,30 @@ void TraceXYPlot::updateAxisTicks()
} }
} }
} }
// add 5% overrange if(max >= min) {
auto range = max - min; auto range = max - min;
if(range == 0.0) {
// this could happen if all values in a trace are identical (e.g. imported ideal touchstone files)
if(max == 0.0) {
// simply use +/-1 range
max = 1.0;
min = -1.0;
} else {
// +/-5% around value
max += abs(max * 0.05);
min -= abs(max * 0.05);
}
} else {
// add 5% of range at both ends
min -= range * 0.05; min -= range * 0.05;
max += range * 0.05; max += range * 0.05;
}
YAxis[i].rangeMin = min; YAxis[i].rangeMin = min;
YAxis[i].rangeMax = max; YAxis[i].rangeMax = max;
YAxis[i].rangeDiv = createAutomaticTicks(YAxis[i].ticks, min, max, 8); YAxis[i].rangeDiv = createAutomaticTicks(YAxis[i].ticks, min, max, 8);
} }
} }
}
} }
QString TraceXYPlot::AxisTypeToName(TraceXYPlot::YAxisType type) QString TraceXYPlot::AxisTypeToName(TraceXYPlot::YAxisType type)