Merge pull request #131 from cjcliffe/waterfall_optimize

Waterfall optimize

CMakeLists.txt

@@ -263,6 +263,7 @@ SET (cubicsdr_sources
 	src/process/VisualProcessor.cpp
 	src/process/ScopeVisualProcessor.cpp
 	src/process/SpectrumVisualProcessor.cpp
+	src/process/FFTVisualDataThread.cpp
 	src/ui/GLPanel.cpp
 	external/rtaudio/RtAudio.cpp
 	external/lodepng/lodepng.cpp
@@ -316,6 +317,7 @@ SET (cubicsdr_headers
 	src/process/VisualProcessor.h
 	src/process/ScopeVisualProcessor.h
 	src/process/SpectrumVisualProcessor.h
+	src/process/FFTVisualDataThread.h
 	src/ui/GLPanel.h
 	src/ui/UITestCanvas.cpp
 	src/ui/UITestCanvas.h

src/AppFrame.cpp

@@ -133,15 +133,14 @@ AppFrame::AppFrame() :
             
     wxBoxSizer *wfSizer = new wxBoxSizer(wxHORIZONTAL);
 
-    wxGetApp().getWaterfallProcesor()->setup(2048);
     waterfallCanvas = new WaterfallCanvas(this, attribList);
     waterfallCanvas->setup(2048, 512);
-    
+
-    fftDistrib.setInput(wxGetApp().getWaterfallVisualQueue());
+    waterfallDataThread = new FFTVisualDataThread();
-    fftDistrib.attachOutput(&fftQueue);
+    t_FFTData = new std::thread(&FFTVisualDataThread::threadMain, waterfallDataThread);
-    
+
-    wxGetApp().getWaterfallProcesor()->setInput(&fftQueue);
+    waterfallDataThread->setInputQueue("IQDataInput", wxGetApp().getWaterfallVisualQueue());
-    wxGetApp().getWaterfallProcesor()->attachOutput(waterfallCanvas->getVisualDataQueue());
+    waterfallDataThread->setOutputQueue("FFTDataOutput", waterfallCanvas->getVisualDataQueue());
             
     waterfallSpeedMeter = new MeterCanvas(this, attribList);
     waterfallSpeedMeter->setHelpTip("Waterfall speed, click or drag to adjust (max 1024 lines per second)");
@@ -376,7 +375,7 @@ AppFrame::AppFrame() :
     int wflps =wxGetApp().getConfig()->getWaterfallLinesPerSec();
             
     waterfallSpeedMeter->setLevel(sqrt(wflps));
-    fftDistrib.setLinesPerSecond(wflps);
+    waterfallDataThread->setLinesPerSecond(wflps);
             
     ThemeMgr::mgr.setTheme(wxGetApp().getConfig()->getTheme());
 
@@ -400,7 +399,8 @@ AppFrame::AppFrame() :
 }
 
 AppFrame::~AppFrame() {
-
+    waterfallDataThread->terminate();
+    t_FFTData->join();
 }
 
 
@@ -486,7 +486,7 @@ void AppFrame::OnMenu(wxCommandEvent& event) {
         waterfallCanvas->setCenterFrequency(wxGetApp().getFrequency());
         spectrumCanvas->setBandwidth(wxGetApp().getSampleRate());
         spectrumCanvas->setCenterFrequency(wxGetApp().getFrequency());
-        fftDistrib.setLinesPerSecond(DEFAULT_WATERFALL_LPS);
+        waterfallDataThread->setLinesPerSecond(DEFAULT_WATERFALL_LPS);
         waterfallSpeedMeter->setLevel(sqrt(DEFAULT_WATERFALL_LPS));
         wxGetApp().getSpectrumProcesor()->setFFTAverageRate(0.65);
         spectrumAvgMeter->setLevel(0.65);
@@ -613,7 +613,7 @@ void AppFrame::OnClose(wxCloseEvent& event) {
     wxGetApp().getConfig()->setSnap(wxGetApp().getFrequencySnap());
     wxGetApp().getConfig()->setCenterFreq(wxGetApp().getFrequency());
     wxGetApp().getConfig()->setSpectrumAvgSpeed(wxGetApp().getSpectrumProcesor()->getFFTAverageRate());
-    wxGetApp().getConfig()->setWaterfallLinesPerSec(fftDistrib.getLinesPerSecond());
+    wxGetApp().getConfig()->setWaterfallLinesPerSec(waterfallDataThread->getLinesPerSecond());
     wxGetApp().getConfig()->save();
     event.Skip();
 }
@@ -746,6 +746,9 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
     
     if (spectrumAvgMeter->inputChanged()) {
         float val = spectrumAvgMeter->getInputValue();
+        if (val < 0.01) {
+            val = 0.01;
+        }
         spectrumAvgMeter->setLevel(val);
         proc->setFFTAverageRate(val);
 
@@ -766,51 +769,24 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
     
     dproc->run();
 
-    SpectrumVisualProcessor *wproc = wxGetApp().getWaterfallProcesor();
+    SpectrumVisualProcessor *wproc = waterfallDataThread->getProcessor();
 
-    int fftSize = wproc->getDesiredInputSize();
-    
-    if (fftSize) {
-        fftDistrib.setFFTSize(fftSize);
-    } else {
-        fftDistrib.setFFTSize(DEFAULT_FFT_SIZE);
-    }
-    
     if (waterfallSpeedMeter->inputChanged()) {
         float val = waterfallSpeedMeter->getInputValue();
         waterfallSpeedMeter->setLevel(val);
-        fftDistrib.setLinesPerSecond((int)ceil(val*val));
+        waterfallDataThread->setLinesPerSecond((int)ceil(val*val));
-        wxGetApp().getWaterfallVisualQueue()->set_max_num_items((int)ceil(val*val));
-
         GetStatusBar()->SetStatusText(wxString::Format(wxT("Waterfall max speed changed to %d lines per second."),(int)ceil(val*val)));
     }
 
-    fftDistrib.run();
-
     wproc->setView(waterfallCanvas->getViewState());
     wproc->setBandwidth(waterfallCanvas->getBandwidth());
     wproc->setCenterFrequency(waterfallCanvas->getCenterFrequency());
     
-    while (!wproc->isInputEmpty()) {
-        wproc->run();
-    }
-    
     waterfallCanvas->processInputQueue();
     demodWaterfallCanvas->processInputQueue();
-
   
-    if (this->IsVisible()) {
+    if (!this->IsActive()) {
-        waterfallCanvas->DoPaint();
+        std::this_thread::sleep_for(std::chrono::milliseconds(25));
-        demodWaterfallCanvas->DoPaint();
-#ifdef __APPLE__
-        usleep(5000);
-#endif
-    } else {
-#ifndef _WIN32
-        usleep(15000);
-#else
-        Sleep(15);
-#endif
     }
 
     event.RequestMore();

src/AppFrame.h

@@ -9,7 +9,8 @@
 #include "MeterCanvas.h"
 #include "TuningCanvas.h"
 #include "ModeSelectorCanvas.h"
-#include "UITestCanvas.h"
+#include "FFTVisualDataThread.h"
+//#include "UITestCanvas.h"
 
 #include <map>
 
@@ -94,8 +95,9 @@ private:
     
     std::string currentSessionFile;
     
-    FFTDataDistributor fftDistrib;
+    FFTVisualDataThread *waterfallDataThread;
-    DemodulatorThreadInputQueue fftQueue;
     
+    std::thread *t_FFTData;
+
     wxDECLARE_EVENT_TABLE();
 };

src/CubicSDR.cpp

@@ -13,7 +13,6 @@
 #endif
 
 #include "CubicSDR.h"
-#include "FrequencyDialog.h"
 
 #ifdef _OSX_APP_
 #include "CoreFoundation/CoreFoundation.h"
@@ -282,10 +281,6 @@ SpectrumVisualProcessor *CubicSDR::getDemodSpectrumProcesor() {
     return &demodSpectrumProcessor;
 }
 
-SpectrumVisualProcessor *CubicSDR::getWaterfallProcesor() {
-    return &waterfallProcessor;
-}
-
 VisualDataDistributor<DemodulatorThreadIQData> *CubicSDR::getSpectrumDistributor() {
     return &spectrumDistributor;
 }
@@ -393,8 +388,25 @@ int CubicSDR::getPPM() {
 }
 
 
-void CubicSDR::showFrequencyInput() {
+void CubicSDR::showFrequencyInput(FrequencyDialog::FrequencyDialogTarget targetMode) {
-    FrequencyDialog fdialog(appframe, -1, demodMgr.getActiveDemodulator()?_("Set Demodulator Frequency"):_("Set Center Frequency"), demodMgr.getActiveDemodulator(), wxPoint(-100,-100), wxSize(320, 75 ));
+    const wxString demodTitle("Set Demodulator Frequency");
+    const wxString freqTitle("Set Center Frequency");
+    const wxString bwTitle("Set Demodulator Bandwidth");
+
+    wxString title;
+    
+    switch (targetMode) {
+        case FrequencyDialog::FDIALOG_TARGET_DEFAULT:
+            title = demodMgr.getActiveDemodulator()?demodTitle:freqTitle;
+            break;
+        case FrequencyDialog::FDIALOG_TARGET_BANDWIDTH:
+            title = bwTitle;
+            break;
+        default:
+            break;
+    }
+    
+    FrequencyDialog fdialog(appframe, -1, title, demodMgr.getActiveDemodulator(), wxPoint(-100,-100), wxSize(320, 75 ), wxDEFAULT_DIALOG_STYLE, targetMode);
     fdialog.ShowModal();
 }
 

src/CubicSDR.h

@@ -16,6 +16,7 @@
 #include "DemodulatorMgr.h"
 #include "AppConfig.h"
 #include "AppFrame.h"
+#include "FrequencyDialog.h"
 
 #include "ScopeVisualProcessor.h"
 #include "SpectrumVisualProcessor.h"
@@ -58,7 +59,6 @@ public:
     ScopeVisualProcessor *getScopeProcessor();
     SpectrumVisualProcessor *getSpectrumProcesor();
     SpectrumVisualProcessor *getDemodSpectrumProcesor();
-    SpectrumVisualProcessor *getWaterfallProcesor();
     VisualDataDistributor<DemodulatorThreadIQData> *getSpectrumDistributor();
     
     DemodulatorThreadOutputQueue* getAudioVisualQueue();
@@ -78,7 +78,7 @@ public:
     void setPPM(int ppm_in);
     int getPPM();
 
-    void showFrequencyInput();
+    void showFrequencyInput(FrequencyDialog::FrequencyDialogTarget targetMode = FrequencyDialog::FDIALOG_TARGET_DEFAULT);
 
 private:
     AppFrame *appframe;
@@ -107,7 +107,6 @@ private:
 
     ScopeVisualProcessor scopeProcessor;
     SpectrumVisualProcessor spectrumProcessor;
-    SpectrumVisualProcessor waterfallProcessor;
     SpectrumVisualProcessor demodSpectrumProcessor;
     
     VisualDataDistributor<DemodulatorThreadIQData> spectrumDistributor;

src/FrequencyDialog.cpp

@@ -10,15 +10,22 @@ EVT_CHAR_HOOK(FrequencyDialog::OnChar)
 wxEND_EVENT_TABLE()
 
 FrequencyDialog::FrequencyDialog(wxWindow * parent, wxWindowID id, const wxString & title, DemodulatorInstance *demod, const wxPoint & position,
-        const wxSize & size, long style) :
+        const wxSize & size, long style, FrequencyDialogTarget targetMode) :
         wxDialog(parent, id, title, position, size, style) {
     wxString freqStr;
     activeDemod = demod;
+    this->targetMode = targetMode;
 
-    if (activeDemod) {
+    if (targetMode == FDIALOG_TARGET_DEFAULT) {
-        freqStr = frequencyToStr(activeDemod->getFrequency());
+        if (activeDemod) {
-    } else {
+            freqStr = frequencyToStr(activeDemod->getFrequency());
-        freqStr = frequencyToStr(wxGetApp().getFrequency());
+        } else {
+            freqStr = frequencyToStr(wxGetApp().getFrequency());
+        }
+    }
+            
+    if (targetMode == FDIALOG_TARGET_BANDWIDTH) {
+        freqStr = frequencyToStr(wxGetApp().getDemodMgr().getLastBandwidth());
     }
 
     dialogText = new wxTextCtrl(this, wxID_FREQ_INPUT, freqStr, wxPoint(6, 1), wxSize(size.GetWidth() - 20, size.GetHeight() - 70),
@@ -109,14 +116,23 @@ void FrequencyDialog::OnChar(wxKeyEvent& event) {
     case WXK_NUMPAD_ENTER:
         // Do Stuff
         freq = strToFrequency(dialogText->GetValue().ToStdString());
-        if (activeDemod) {
+            if (targetMode == FDIALOG_TARGET_DEFAULT) {
-            activeDemod->setTracking(true);
+                if (activeDemod) {
-            activeDemod->setFollow(true);
+                    activeDemod->setTracking(true);
-            activeDemod->setFrequency(freq);
+                    activeDemod->setFollow(true);
-            activeDemod->updateLabel(freq);
+                    activeDemod->setFrequency(freq);
-        } else {
+                    activeDemod->updateLabel(freq);
-            wxGetApp().setFrequency(freq);
+                } else {
-        }
+                    wxGetApp().setFrequency(freq);
+                }
+            }
+            if (targetMode == FDIALOG_TARGET_BANDWIDTH) {
+                if (activeDemod) {
+                    activeDemod->setBandwidth(freq);
+                } else {
+                    wxGetApp().getDemodMgr().setLastBandwidth(freq);
+                }
+            }
         Close();
         break;
     case WXK_ESCAPE:

src/FrequencyDialog.h

@@ -11,12 +11,13 @@
 class FrequencyDialog: public wxDialog
 {
 public:
-
+    typedef enum FrequencyDialogTarget { FDIALOG_TARGET_DEFAULT, FDIALOG_TARGET_CENTERFREQ, FDIALOG_TARGET_FREQ, FDIALOG_TARGET_BANDWIDTH } FrequencyDialogTarget;
     FrequencyDialog ( wxWindow * parent, wxWindowID id, const wxString & title,
                   DemodulatorInstance *demod = NULL,
                   const wxPoint & pos = wxDefaultPosition,
                   const wxSize & size = wxDefaultSize,
-                  long style = wxDEFAULT_DIALOG_STYLE );
+                  long style = wxDEFAULT_DIALOG_STYLE,
+                  FrequencyDialogTarget targetMode = FDIALOG_TARGET_DEFAULT);
 
     wxTextCtrl * dialogText;
 
@@ -28,5 +29,6 @@ private:
     void OnEnter ( wxCommandEvent &event );
     void OnChar ( wxKeyEvent &event );
     std::string& filterChars(std::string& s, const std::string& allowed);
+    FrequencyDialogTarget targetMode;
     DECLARE_EVENT_TABLE()
 };

src/process/FFTVisualDataThread.cpp

@@ -0,0 +1,64 @@
+#include "FFTVisualDataThread.h"
+#include "CubicSDR.h"
+
+FFTVisualDataThread::FFTVisualDataThread() : linesPerSecond(DEFAULT_WATERFALL_LPS) {
+    lpsChanged.store(true);
+}
+
+FFTVisualDataThread::~FFTVisualDataThread() {
+    
+}
+
+void FFTVisualDataThread::setLinesPerSecond(int lps) {
+    linesPerSecond.store(lps);
+    lpsChanged.store(true);
+}
+
+int FFTVisualDataThread::getLinesPerSecond() {
+    return linesPerSecond.load();
+}
+
+SpectrumVisualProcessor *FFTVisualDataThread::getProcessor() {
+    return &wproc;
+}
+
+void FFTVisualDataThread::run() {
+    DemodulatorThreadInputQueue *pipeIQDataIn = (DemodulatorThreadInputQueue *)getInputQueue("IQDataInput");
+    SpectrumVisualDataQueue *pipeFFTDataOut = (SpectrumVisualDataQueue *)getOutputQueue("FFTDataOutput");
+    
+    fftDistrib.setInput(pipeIQDataIn);
+    fftDistrib.attachOutput(&fftQueue);
+    wproc.setInput(&fftQueue);
+    wproc.attachOutput(pipeFFTDataOut);
+    wproc.setup(2048);
+
+    std::cout << "FFT visual data thread started." << std::endl;
+    
+    while(!terminated) {
+        
+        std::this_thread::sleep_for(std::chrono::milliseconds(12));
+        
+        int fftSize = wproc.getDesiredInputSize();
+        
+        if (fftSize) {
+            fftDistrib.setFFTSize(fftSize);
+        } else {
+            fftDistrib.setFFTSize(DEFAULT_FFT_SIZE);
+        }
+    
+        if (lpsChanged.load()) {
+            fftDistrib.setLinesPerSecond(linesPerSecond.load());
+            pipeIQDataIn->set_max_num_items(linesPerSecond.load());
+            lpsChanged.store(false);
+        }
+        
+        fftDistrib.run();
+        
+        while (!wproc.isInputEmpty()) {
+            wproc.run();
+        }
+    }
+    
+    std::cout << "FFT visual data thread terminated." << std::endl;
+}
+

src/process/FFTVisualDataThread.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "IOThread.h"
+#include "SpectrumVisualProcessor.h"
+
+class FFTVisualDataThread : public IOThread {
+public:
+    FFTVisualDataThread();
+    ~FFTVisualDataThread();
+    
+    void setLinesPerSecond(int lps);
+    int getLinesPerSecond();
+    SpectrumVisualProcessor *getProcessor();
+    
+    void run();
+    
+protected:
+    FFTDataDistributor fftDistrib;
+    DemodulatorThreadInputQueue fftQueue;
+    SpectrumVisualProcessor wproc;
+    
+    std::atomic_int linesPerSecond;
+    std::atomic_bool lpsChanged;
+};

src/process/SpectrumVisualProcessor.h

@@ -111,7 +111,10 @@ protected:
             
             if (inp) {
                 if (inp->data.size() >= fftSize) {
-                    for (int i = 0, iMax = inp->data.size()-fftSize; i <= iMax; i += fftSize) {
+                    if (lineRateAccum + (lineRateStep * floor((double)inp->data.size()/(double)fftSize)) < 1.0) {
+                         // move along, nothing to see here..
+                        lineRateAccum += (lineRateStep * inp->data.size()/fftSize);
+                    } else for (int i = 0, iMax = inp->data.size()-fftSize; i <= iMax; i += fftSize) {
                         lineRateAccum += lineRateStep;
                         
                         if (lineRateAccum >= 1.0) {

src/util/GLExt.cpp

@@ -32,9 +32,8 @@ void initGLExtensions() {
         return;
     }
 
-    const GLubyte *extensions = glGetString(GL_EXTENSIONS);
+//    const GLubyte *extensions = glGetString(GL_EXTENSIONS);
-
+//    std::cout << std::endl << "Supported GL Extensions: " << std::endl << extensions << std::endl << std::endl;
-    std::cout << std::endl << "Supported GL Extensions: " << std::endl << extensions << std::endl << std::endl;
 
 #ifdef __linux__
     const GLint interval = 2;

src/visual/TuningCanvas.cpp

@@ -297,7 +297,7 @@ void TuningCanvas::OnMouseMoved(wxMouseEvent& event) {
                 setStatusText("Click, wheel or drag a digit to change frequency; SPACE for direct input. Right click to set/clear snap. Hold ALT to change PPM. Hold SHIFT to disable carry.");
             break;
         case TUNING_HOVER_BW:
-                setStatusText("Click, wheel or drag a digit to change bandwidth.  Hold SHIFT to disable carry.");
+                setStatusText("Click, wheel or drag a digit to change bandwidth; SPACE for direct input.  Hold SHIFT to disable carry.");
             break;
         case TUNING_HOVER_CENTER:
                 setStatusText("Click, wheel or drag a digit to change center frequency; SPACE for direct input.  Hold SHIFT to disable carry.");
@@ -407,8 +407,12 @@ void TuningCanvas::setHelpTip(std::string tip) {
 void TuningCanvas::OnKeyDown(wxKeyEvent& event) {
     InteractiveCanvas::OnKeyDown(event);
 
-    if (event.GetKeyCode() == WXK_SPACE && (hoverState == TUNING_HOVER_CENTER || hoverState == TUNING_HOVER_FREQ)) {
+    if (event.GetKeyCode() == WXK_SPACE) {
-        wxGetApp().showFrequencyInput();
+        if (hoverState == TUNING_HOVER_CENTER || hoverState == TUNING_HOVER_FREQ) {
+            wxGetApp().showFrequencyInput(FrequencyDialog::FDIALOG_TARGET_DEFAULT);
+        } else if (hoverState == TUNING_HOVER_BW) {
+            wxGetApp().showFrequencyInput(FrequencyDialog::FDIALOG_TARGET_BANDWIDTH);
+        }
     }
 }
 

src/visual/WaterfallCanvas.cpp

@@ -88,12 +88,8 @@ void WaterfallCanvas::processInputQueue() {
 }
 
 void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
-//    event.Skip();
+//    wxClientDC dc(this);
-}
+    wxPaintDC dc(this);
-
-void WaterfallCanvas::DoPaint() {
-    wxClientDC dc(this);
-    //    wxPaintDC dc(this);
 
     const wxSize ClientSize = GetClientSize();
     long double currentZoom = zoom;
@@ -359,9 +355,9 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
     }
 }
 void WaterfallCanvas::OnIdle(wxIdleEvent &event) {
-//    Refresh();
+    Refresh();
-//    event.RequestMore();
+    event.RequestMore();
-    event.Skip();
+//    event.Skip();
 }
 
 void WaterfallCanvas::OnMouseMoved(wxMouseEvent& event) {

src/visual/WaterfallCanvas.h

@@ -28,7 +28,6 @@ public:
     void attachSpectrumCanvas(SpectrumCanvas *canvas_in);
     void processInputQueue();
     SpectrumVisualDataQueue *getVisualDataQueue();
-    void DoPaint();
 
 private:
     void OnPaint(wxPaintEvent& event);