jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-06 06:53:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Preparations for math functions on traces

Browse source
This commit is contained in:
Jan Käberich 2020-11-25 16:47:29 +01:00
parent 978842a2ff
commit 66f8b86159
21 changed files with 819 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Software/PC_Application/Traces/tracexyplot.cpp
View file

@ -654,8 +654,8 @@ QPointF TraceXYPlot::transformY(Trace *t, unsigned int sample, TraceXYPlot::YAxi
case YAxisType::Phase:
case YAxisType::VSWR: {
auto d = t->sample(sample);
ret.setY(transformY(d.S, type));
ret.setX(d.frequency);
ret.setY(transformY(d.y, type));
ret.setX(d.x);
}
break;
case YAxisType::Impulse:
@ -702,12 +702,12 @@ unsigned int TraceXYPlot::numTraceSamples(Trace *t)
QPoint TraceXYPlot::dataToPixel(Trace::Data d)
{
if(d.frequency < XAxis.rangeMin || d.frequency > XAxis.rangeMax) {
if(d.x < XAxis.rangeMin || d.x > XAxis.rangeMax) {
return QPoint();
}
auto y = transformY(d.S, YAxis[0].type);
auto y = transformY(d.y, YAxis[0].type);
QPoint p;
p.setX(Util::Scale<double>(d.frequency, XAxis.rangeMin, XAxis.rangeMax, plotAreaLeft, plotAreaLeft + plotAreaWidth));
p.setX(Util::Scale<double>(d.x, XAxis.rangeMin, XAxis.rangeMax, plotAreaLeft, plotAreaLeft + plotAreaWidth));
p.setY(Util::Scale<double>(y, YAxis[0].rangeMin, YAxis[0].rangeMax, plotAreaBottom, 0));
return p;
}
@ -842,5 +842,6 @@ QString TraceXYPlot::AxisUnit(TraceXYPlot::XAxisType type)
case XAxisType::Frequency: return "Hz"; break;
case XAxisType::Time: return "s"; break;
case XAxisType::Distance: return "m"; break;
default: return ""; break;
}
}