Fix math traces failing after normal scope updates randomly set current destination trace

master
Timothy Pearson 7 years ago
parent 964f9570c0
commit a08c8fe35d

@ -2679,10 +2679,10 @@ void ScopePart::processMathTraces() {
} }
} }
m_traceWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); m_traceWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues);
m_traceWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); m_traceWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions);
m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues);
m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions);
} }
#ifdef ENABLE_FFT #ifdef ENABLE_FFT
else if (m_mathOperator[traceno] == "FFT") { else if (m_mathOperator[traceno] == "FFT") {
@ -2750,10 +2750,10 @@ void ScopePart::processMathTraces() {
free(ffts_input); free(ffts_input);
free(ffts_output); free(ffts_output);
m_traceWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); m_traceWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues);
m_traceWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); m_traceWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions);
m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues);
m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions);
} }
#endif // ENABLE_FFT #endif // ENABLE_FFT
else { else {
@ -2764,10 +2764,10 @@ void ScopePart::processMathTraces() {
outputValues[i] = 0; outputValues[i] = 0;
} }
m_traceWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); m_traceWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues);
m_traceWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); m_traceWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions);
m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues);
m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions);
} }
} }
} }

Loading…
Cancel
Save