diff options
Diffstat (limited to 'clients/tde/src/part/scope/part.cpp')
| -rw-r--r-- | clients/tde/src/part/scope/part.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp index 52851c0..15fc12f 100644 --- a/clients/tde/src/part/scope/part.cpp +++ b/clients/tde/src/part/scope/part.cpp @@ -699,9 +699,9 @@ void ScopePart::mainEventLoop() { m_channelActive[m_currentOpChannel] = (active != 0); } m_socket->clearFrameTail(); - + if (result == "ACK") { - if (m_currentOpChannel < (m_maxNumberOfTraces-1)) { + if (m_currentOpChannel < m_maxNumberOfTraces) { m_currentOpChannel++; SET_NEXT_STATE(ScopeState_ChannelActiveStateRequest) } @@ -805,7 +805,7 @@ void ScopePart::mainEventLoop() { if (m_socket->canReadFrame()) { PAT_WATCHDOG_TIMER setTickerMessage(i18n("Loading [Received allowed V/div list for channel %1]").arg(m_currentOpChannel)); - + // Get permitted volts/div settings, step 2 TQString result; ds >> result; @@ -817,9 +817,9 @@ void ScopePart::mainEventLoop() { } } m_socket->clearFrameTail(); - + if (result == "ACK") { - if (m_currentOpChannel < (m_maxNumberOfTraces-1)) { + if (m_currentOpChannel < m_maxNumberOfTraces) { m_currentOpChannel++; SET_NEXT_STATE(ScopeState_TracePermittedVoltsDivRequest) } @@ -1198,7 +1198,7 @@ void ScopePart::mainEventLoop() { SET_NEXT_STATE_DATA_WAITING(ScopeState_ChannelActiveStateUpdate+1) } else { - if (m_currentOpChannel < (m_maxNumberOfTraces-1)) { + if (m_currentOpChannel < m_maxNumberOfTraces) { m_currentOpChannel++; SET_NEXT_STATE(ScopeState_ChannelActiveStateUpdate) } @@ -1219,7 +1219,7 @@ void ScopePart::mainEventLoop() { if (m_socket->canReadFrame()) { PAT_WATCHDOG_TIMER setTickerMessage(i18n("Updating [Set channel %1 activity status]").arg(m_currentOpChannel)); - + // Set channel active, step 2 TQString result; ds >> result; @@ -1594,6 +1594,7 @@ void ScopePart::recallWaveforms() { ds >> offset; ds >> values; ds >> positions; + m_traceWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno], true); m_traceWidget->setSamples(traceno-1, values); m_traceWidget->setPositions(traceno-1, positions); m_traceWidget->setTraceOffset(traceno-1, offset); |