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, 12 insertions, 3 deletions
diff --git a/clients/tde/src/part/scope/part.cpp b/clients/tde/src/part/scope/part.cpp index fb056cd..cb38e07 100644 --- a/clients/tde/src/part/scope/part.cpp +++ b/clients/tde/src/part/scope/part.cpp @@ -20,11 +20,13 @@ * http://www.raptorengineeringinc.com */ -#define ENABLE_FFT - #include "define.h" #include "part.h" +#ifdef HAVE_FFTS +#define ENABLE_FFT 1 +#endif // HAVE_FFTS + #include <tdeaboutdata.h> //::createAboutData() #include <tdeaction.h> #include <tdelocale.h> @@ -2076,7 +2078,7 @@ void ScopePart::stopDAQ() { } #define WAVEFORM_MAGIC_NUMBER 1 -#define WAVEFORM_FILE_VERSION 3 +#define WAVEFORM_FILE_VERSION 4 void ScopePart::saveWaveforms() { TQString saveFileName = KFileDialog::getSaveFileName(TQString::null, "*.wfm|Waveform Files (*.wfm)", 0, i18n("Save waveforms...")); @@ -2112,6 +2114,7 @@ void ScopePart::saveWaveforms() { ds << m_mathFirstOperand[traceno]; ds << m_mathSecondOperand[traceno]; ds << m_mathOperator[traceno]; + ds << m_base->traceZoomWidget->traceOffset(traceno-1+m_maxNumberOfTraces); } for (int cursorno=0; cursorno<5; cursorno++) { ds << m_traceWidget->cursorPosition(cursorno); @@ -2171,6 +2174,12 @@ void ScopePart::recallWaveforms() { ds >> m_mathFirstOperand[traceno]; ds >> m_mathSecondOperand[traceno]; ds >> m_mathOperator[traceno]; + if (version >= 4) { + double offset; + ds >> offset; + m_traceWidget->setTraceOffset(traceno-1+m_maxNumberOfTraces, offset); + m_base->traceZoomWidget->setTraceOffset(traceno-1+m_maxNumberOfTraces, offset); + } } } for (int cursorno=0; cursorno<5; cursorno++) { |