From a08c8fe35d42ff5dceec1149460a23758edeede0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 29 Jul 2017 04:29:01 -0500 Subject: [PATCH] Fix math traces failing after normal scope updates randomly set current destination trace --- clients/tde/src/part/scope/part.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp index 274480a..52cae83 100644 --- a/clients/tde/src/part/scope/part.cpp +++ b/clients/tde/src/part/scope/part.cpp @@ -2679,10 +2679,10 @@ void ScopePart::processMathTraces() { } } - m_traceWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); - m_traceWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); - m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); - m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); + m_traceWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues); + m_traceWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions); + m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues); + m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions); } #ifdef ENABLE_FFT else if (m_mathOperator[traceno] == "FFT") { @@ -2750,10 +2750,10 @@ void ScopePart::processMathTraces() { free(ffts_input); free(ffts_output); - m_traceWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); - m_traceWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); - m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); - m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); + m_traceWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues); + m_traceWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions); + m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues); + m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions); } #endif // ENABLE_FFT else { @@ -2764,10 +2764,10 @@ void ScopePart::processMathTraces() { outputValues[i] = 0; } - m_traceWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); - m_traceWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); - m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+m_currentOpChannel, outputValues); - m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+m_currentOpChannel, outputPositions); + m_traceWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues); + m_traceWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions); + m_base->traceZoomWidget->setSamples(m_maxNumberOfTraces-1+traceno, outputValues); + m_base->traceZoomWidget->setPositions(m_maxNumberOfTraces-1+traceno, outputPositions); } } }