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

Fix trace point calculation on distance X axis

Browse Source
This commit is contained in:
Jan Käberich 2023-02-15 20:30:37 +01:00
parent 045cf6cc65
commit a2b8f2a00d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Software/PC_Application/LibreVNA-GUI/Traces/tracexyplot.cpp
View File

@ -1090,6 +1090,9 @@ double TraceXYPlot::nearestTracePoint(Trace *t, QPoint pixel, double *distance)
closestIndex = i; closestIndex = i;
} }
} }
if(xAxis.getType() == XAxis::Type::Distance) {
closestXpos = t->distanceToTime(closestXpos);
}
closestDistance = sqrt(closestDistance); closestDistance = sqrt(closestDistance);
if(closestIndex > 0) { if(closestIndex > 0) {
auto l1 = plotValueToPixel(traceToCoordinate(t, closestIndex - 1, yAxis[0]), 0); auto l1 = plotValueToPixel(traceToCoordinate(t, closestIndex - 1, yAxis[0]), 0);
@ -1111,12 +1114,10 @@ double TraceXYPlot::nearestTracePoint(Trace *t, QPoint pixel, double *distance)
closestXpos = t->sample(closestIndex).x + (t->sample(closestIndex+1).x - t->sample(closestIndex).x) * ratio; closestXpos = t->sample(closestIndex).x + (t->sample(closestIndex+1).x - t->sample(closestIndex).x) * ratio;
} }
} }
if(xAxis.getType() == XAxis::Type::Distance) {
closestXpos = t->distanceToTime(closestXpos);
}
if(distance) { if(distance) {
*distance = closestDistance; *distance = closestDistance;
} }
qDebug() << "Xpos: "<<closestXpos;
return closestXpos; return closestXpos;
} }