From 68f1ca16a1415c192e2d767fa39fd16962c78a83 Mon Sep 17 00:00:00 2001 From: Teuniz Date: Sat, 9 Jan 2016 16:31:49 +0100 Subject: [PATCH] Work in progress. --- global.h | 2 +- mainwindow.cpp | 4 ++++ signalcurve.cpp | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/global.h b/global.h index 820c5a2..799509b 100644 --- a/global.h +++ b/global.h @@ -35,7 +35,7 @@ #define PROGRAM_NAME "DSRemote" -#define PROGRAM_VERSION "0.32_1601091517" +#define PROGRAM_VERSION "0.32_1601091631" #define MAX_PATHLEN 4096 diff --git a/mainwindow.cpp b/mainwindow.cpp index d4dccd3..6f6c81b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -466,6 +466,10 @@ void UI_Mainwindow::close_connection() scrn_thread->set_device(NULL); + devparms.math_fft = 0; + + devparms.math_fft_split = 0; + waveForm->clear(); tmc_close(); diff --git a/signalcurve.cpp b/signalcurve.cpp index 3a69b1a..89a78b2 100644 --- a/signalcurve.cpp +++ b/signalcurve.cpp @@ -734,7 +734,12 @@ void SignalCurve::drawFFT(QPainter *painter, int curve_h_b, int curve_w_b) /////////////////////////////////// FFT: draw the curve /////////////////////////////////////////// - if((devparms->fftbufsz > 32) && devparms->chandisplay[devparms->math_fft_src] && (bufsize > 32)) + if(bufsize < 32) + { + return; + } + + if((devparms->fftbufsz > 32) && devparms->chandisplay[devparms->math_fft_src]) { painter->setClipping(true); painter->setClipRegion(QRegion(0, 0, curve_w, curve_h), Qt::ReplaceClip);