diff options
Diffstat (limited to 'clients/tde/src/part/scope/part.cpp')
| -rw-r--r-- | clients/tde/src/part/scope/part.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp index 94990b4..48d7211 100644 --- a/clients/tde/src/part/scope/part.cpp +++ b/clients/tde/src/part/scope/part.cpp @@ -681,7 +681,7 @@ void ScopePart::mainEventLoop() { m_socket->clearFrameTail(); if (result == "ACK") { - if (m_currentOpChannel < m_maxNumberOfTraces) { + if (m_currentOpChannel < (m_maxNumberOfTraces-1)) { m_currentOpChannel++; SET_NEXT_STATE(ScopeState_ChannelActiveStateRequest) } @@ -799,7 +799,7 @@ void ScopePart::mainEventLoop() { m_socket->clearFrameTail(); if (result == "ACK") { - if (m_currentOpChannel < m_maxNumberOfTraces) { + if (m_currentOpChannel < (m_maxNumberOfTraces-1)) { m_currentOpChannel++; SET_NEXT_STATE(ScopeState_TracePermittedVoltsDivRequest) } @@ -1178,7 +1178,7 @@ void ScopePart::mainEventLoop() { SET_NEXT_STATE_DATA_WAITING(ScopeState_ChannelActiveStateUpdate+1) } else { - if (m_currentOpChannel < m_maxNumberOfTraces) { + if (m_currentOpChannel < (m_maxNumberOfTraces-1)) { m_currentOpChannel++; SET_NEXT_STATE(ScopeState_ChannelActiveStateUpdate) } @@ -1646,20 +1646,20 @@ void ScopePart::updateGraticule() { if (m_maxNumberOfTraces > 3) m_base->traceZoomWidget->setTraceColor(3, TQColor(128, 128, 255)); for (int traceno=1; traceno<=m_maxNumberOfTraces; traceno++) { - m_traceWidget->setTraceEnabled(traceno-1, m_channelActive[traceno]); - m_traceWidget->setTraceName(traceno-1, TQString("Channel %1").arg(traceno)); - m_traceWidget->setTraceHorizontalUnits(traceno-1, "s"); - m_traceWidget->setTraceVerticalUnits(traceno-1, "V"); + m_traceWidget->setTraceEnabled(traceno-1, m_channelActive[traceno], TraceWidget::FullText, true); + m_traceWidget->setTraceName(traceno-1, TQString("Channel %1").arg(traceno), true); + m_traceWidget->setTraceHorizontalUnits(traceno-1, "s", true); + m_traceWidget->setTraceVerticalUnits(traceno-1, "V", true); - m_base->traceZoomWidget->setTraceEnabled(traceno-1, m_channelActive[traceno], false); - m_base->traceZoomWidget->setTraceName(traceno-1, TQString("Channel %1").arg(traceno)); - m_base->traceZoomWidget->setTraceHorizontalUnits(traceno-1, "s"); - m_base->traceZoomWidget->setTraceVerticalUnits(traceno-1, "V"); + m_base->traceZoomWidget->setTraceEnabled(traceno-1, m_channelActive[traceno], TraceWidget::SummaryText, true); + m_base->traceZoomWidget->setTraceName(traceno-1, TQString("Channel %1").arg(traceno), true); + m_base->traceZoomWidget->setTraceHorizontalUnits(traceno-1, "s", true); + m_base->traceZoomWidget->setTraceVerticalUnits(traceno-1, "V", true); - m_traceWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno]); - m_base->traceZoomWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno]); + m_traceWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno], true); + m_base->traceZoomWidget->setNumberOfSamples(traceno-1, m_samplesInTrace[traceno], (traceno<m_maxNumberOfTraces)?true:false); - m_traceWidget->setDisplayLimits(traceno-1, TQRectF(0.0, (m_voltsDiv[traceno]*m_vdivs)/2.0, (m_secsDiv[traceno]*m_hdivs), (m_voltsDiv[traceno]*m_vdivs)/-2.0)); + m_traceWidget->setDisplayLimits(traceno-1, TQRectF(0.0, (m_voltsDiv[traceno]*m_vdivs)/2.0, (m_secsDiv[traceno]*m_hdivs), (m_voltsDiv[traceno]*m_vdivs)/-2.0), (traceno<m_maxNumberOfTraces)?true:false); if (m_traceControlWidgetList[traceno-1]) { m_traceControlWidgetList[traceno-1]->setSelectedVoltsPerDiv(m_voltsDiv[traceno]); m_traceControlWidgetList[traceno-1]->setTraceEnabled(m_channelActive[traceno]); |