diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-15 17:06:21 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-07-15 17:06:21 -0500 |
| commit | 20f225bd5a557b9751439cb1857020f9ed367a6a (patch) | |
| tree | eb317f370c6feabf528c43a6b9b88f0fceb95235 /clients/tde | |
| parent | 274a42aacecfcbcbdd80e3845e3b01991b65f925 (diff) | |
| download | ulab-20f225bd5a557b9751439cb1857020f9ed367a6a.tar.gz ulab-20f225bd5a557b9751439cb1857020f9ed367a6a.zip | |
Fix scope and float array transfers
Diffstat (limited to 'clients/tde')
| -rw-r--r-- | clients/tde/src/part/scope/part.cpp | 42 |
1 files changed, 24 insertions, 18 deletions
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp index eb31eea..ae27923 100644 --- a/clients/tde/src/part/scope/part.cpp +++ b/clients/tde/src/part/scope/part.cpp @@ -135,6 +135,7 @@ bool ScopePart::closeURL() { } void ScopePart::processLockouts() { + // Largest area if (m_connectionActiveAndValid) { if ((m_commHandlerMode < 2) && (m_commHandlerState < 2)) { m_base->setEnabled(false); @@ -142,28 +143,32 @@ void ScopePart::processLockouts() { else { m_base->setEnabled(true); } - if ((m_commHandlerMode < 2) && (m_commHandlerState < 50)) { - m_base->groupOscilloscopeTraceControls->setEnabled(false); - } - else { - m_base->groupOscilloscopeTraceControls->setEnabled(true); - if (stopTraceUpdate) { - m_base->acqStop->setEnabled(false); - m_base->acqStart->setEnabled(true); - m_base->waveformSave->setEnabled(true); - m_base->waveformRecall->setEnabled(true); - } - else { - m_base->acqStop->setEnabled(true); - m_base->acqStart->setEnabled(false); - m_base->waveformSave->setEnabled(false); - m_base->waveformRecall->setEnabled(false); - } - } } else { m_base->setEnabled(false); } + + // Middle area + if ((m_commHandlerMode < 2) && (m_commHandlerState < 50)) { + m_base->groupOscilloscopeTraceControls->setEnabled(false); + } + else { + m_base->groupOscilloscopeTraceControls->setEnabled(true); + } + + // Least area + if (stopTraceUpdate) { + m_base->acqStop->setEnabled(false); + m_base->acqStart->setEnabled(true); + m_base->waveformSave->setEnabled(true); + m_base->waveformRecall->setEnabled(true); + } + else { + m_base->acqStop->setEnabled(true); + m_base->acqStart->setEnabled(false); + m_base->waveformSave->setEnabled(false); + m_base->waveformRecall->setEnabled(false); + } } void ScopePart::disconnectFromServerCallback() { @@ -765,6 +770,7 @@ void ScopePart::postProcessTrace() { void ScopePart::startDAQ() { stopTraceUpdate = false; + EXEC_NEXT_STATE_IMMEDIATELY } void ScopePart::stopDAQ() { |