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

Optionally interpolate markers

Browse source
This commit is contained in:
Jan Käberich 2022-01-07 12:37:47 +01:00
parent 367451dc04
commit 2f7449ed21
8 changed files with 210 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Software/PC_Application/Traces/Marker/marker.cpp
View file

@ -85,8 +85,8 @@ void Marker::assignTrace(Trace *t)
// Marker was just created and this is the first assignment to a trace.
// Use display format on graph from preferences
auto p = Preferences::getInstance();
if(p.Graphs.markerBehavior.showDataOnGraphs) {
if(p.Graphs.markerBehavior.showAllData) {
if(p.Marker.defaultBehavior.showDataOnGraphs) {
if(p.Marker.defaultBehavior.showAllData) {
for(auto f : applicableFormats()) {
formatGraph.insert(f);
}
@ -598,7 +598,7 @@ void Marker::traceDataChanged()
newdata = numeric_limits<complex<double>>::quiet_NaN();
} else {
// some data of the parent trace changed, check if marker data also changed
newdata = parentTrace->sample(parentTrace->index(position)).y;
newdata = parentTrace->interpolatedSample(position).y;
}
}
if (newdata != data) {
@ -839,8 +839,10 @@ void Marker::constrainPosition()
} else if(position < parentTrace->minX()) {
position = parentTrace->minX();
}
// set position to closest trace index
position = parentTrace->sample(parentTrace->index(position)).x;
if(!Preferences::getInstance().Marker.interpolatePoints) {
// marker interpolation disabled, set position to closest trace index
position = parentTrace->sample(parentTrace->index(position)).x;
}
}
traceDataChanged();
}