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

Marker extended for use on power domain traces

Browse source
This commit is contained in:
Jan Käberich 2021-07-10 12:16:28 +02:00
parent 67489084e9
commit b45645f04e
8 changed files with 213 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -498,20 +498,7 @@ void TraceXYPlot::draw(QPainter &p)
// only draw markers on primary YAxis and if the trace has at least one point
auto markers = t->getMarkers();
for(auto m : markers) {
// if(m->isTimeDomain() != (XAxis.type != XAxisType::Frequency)) {
// // wrong domain, skip this marker
// continue;
// }
double xPosition;
// if(m->isTimeDomain()) {
// if(XAxis.type == XAxisType::Distance) {
// xPosition = m->getTimeData().distance;
// } else {
// xPosition = m->getTimeData().time;
// }
// } else {
xPosition = m->getPosition();
// }
double xPosition = m->getPosition();
if (xPosition < XAxis.rangeMin || xPosition > XAxis.rangeMax) {
// marker not in graph range
continue;
@ -905,10 +892,10 @@ QPointF TraceXYPlot::traceToCoordinate(Trace *t, unsigned int sample, TraceXYPlo
ret.setY(Util::SparamTodB(data.y));
break;
case YAxisType::Step:
ret.setY(t->sample(sample, Trace::SampleType::TimeStep).y.real());
ret.setY(t->sample(sample, true).y.real());
break;
case YAxisType::Impedance: {
double step = t->sample(sample, Trace::SampleType::TimeStep).y.real();
double step = t->sample(sample, true).y.real();
if(abs(step) < 1.0) {
ret.setY(Util::SparamToImpedance(step).real());
}