Merge pull request #143 from cjcliffe/master

update lab

src/visual/MeterCanvas.cpp

@@ -36,6 +36,7 @@ MeterCanvas::~MeterCanvas() {
 
 void MeterCanvas::setLevel(float level_in) {
     level = level_in;
+    Refresh();
 }
 float MeterCanvas::getLevel() {
     return level;
@@ -43,10 +44,12 @@ float MeterCanvas::getLevel() {
 
 void MeterCanvas::setMax(float max_in) {
     level_max = max_in;
+    Refresh();
 }
 
 void MeterCanvas::setInputValue(float slider_in) {
     userInputValue = inputValue = slider_in;
+    Refresh();
 }
 
 bool MeterCanvas::inputChanged() {
@@ -87,8 +90,11 @@ void MeterCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
 }
 
 void MeterCanvas::OnIdle(wxIdleEvent &event) {
-    Refresh();
-    event.RequestMore();
+	if (mouseTracker.mouseInView()) {
+	    Refresh();
+	} else {
+		event.Skip();
+	}
 }
 
 void MeterCanvas::OnMouseMoved(wxMouseEvent& event) {
@@ -107,15 +113,18 @@ void MeterCanvas::OnMouseDown(wxMouseEvent& event) {
     InteractiveCanvas::OnMouseDown(event);
     userInputValue = mouseTracker.getMouseY() * level_max;
     mouseTracker.setHorizDragLock(true);
+    Refresh();
 }
 
 void MeterCanvas::OnMouseWheelMoved(wxMouseEvent& event) {
     InteractiveCanvas::OnMouseWheelMoved(event);
+    Refresh();
 }
 
 void MeterCanvas::OnMouseReleased(wxMouseEvent& event) {
     InteractiveCanvas::OnMouseReleased(event);
     userInputValue = mouseTracker.getMouseY() * level_max;
+    Refresh();
 }
 
 void MeterCanvas::OnMouseLeftWindow(wxMouseEvent& event) {
@@ -127,6 +136,7 @@ void MeterCanvas::OnMouseLeftWindow(wxMouseEvent& event) {
 void MeterCanvas::OnMouseEnterWindow(wxMouseEvent& event) {
     InteractiveCanvas::mouseTracker.OnMouseEnterWindow(event);
     SetCursor(wxCURSOR_CROSS);
+    Refresh();
 }
 
 void MeterCanvas::setHelpTip(std::string tip) {

src/visual/ModeSelectorCanvas.cpp

@@ -79,8 +79,11 @@ void ModeSelectorCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
 }
 
 void ModeSelectorCanvas::OnIdle(wxIdleEvent &event) {
-    Refresh();
-    event.RequestMore();
+	if (mouseTracker.mouseInView()) {
+		Refresh();
+	} else {
+		event.Skip();
+	}
 }
 
 void ModeSelectorCanvas::OnMouseMoved(wxMouseEvent& event) {
@@ -120,6 +123,7 @@ void ModeSelectorCanvas::OnMouseReleased(wxMouseEvent& event) {
     currentSelection = selectedButton;
     
     SetCursor (wxCURSOR_HAND);
+    Refresh();
 }
 
 void ModeSelectorCanvas::OnMouseLeftWindow(wxMouseEvent& event) {
@@ -134,6 +138,7 @@ void ModeSelectorCanvas::OnMouseEnterWindow(wxMouseEvent& event) {
     if (!helpTip.empty()) {
         setStatusText(helpTip);
     }
+    Refresh();
 }
 
 void ModeSelectorCanvas::setHelpTip(std::string tip) {
@@ -142,6 +147,7 @@ void ModeSelectorCanvas::setHelpTip(std::string tip) {
 
 void ModeSelectorCanvas::setNumChoices(int numChoices_in) {
     numChoices = numChoices_in;
+    Refresh();
 }
 
 void ModeSelectorCanvas::addChoice(int value, std::string label) {
@@ -157,6 +163,7 @@ void ModeSelectorCanvas::setSelection(int value) {
         }
     }
     currentSelection = -1;
+    Refresh();
 }
 
 int ModeSelectorCanvas::getSelection() {

src/visual/WaterfallCanvas.cpp

@@ -39,7 +39,9 @@ WaterfallCanvas::WaterfallCanvas(wxWindow *parent, int *attribList) :
         dragOfs(0), mouseZoom(1), zoom(1), freqMove(0.0), freqMoving(false), hoverAlpha(1.0) {
 
     glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
-
+    linesPerSecond = 30;
+    lpsIndex = 0;
+    preBuf = false;
     SetCursor(wxCURSOR_CROSS);
 }
 
@@ -54,6 +56,7 @@ void WaterfallCanvas::setup(int fft_size_in, int waterfall_lines_in) {
     waterfall_lines = waterfall_lines_in;
 
     waterfallPanel.setup(fft_size, waterfall_lines);
+    gTimer.start();
 }
 
 WaterfallCanvas::DragState WaterfallCanvas::getDragState() {
@@ -74,23 +77,38 @@ void WaterfallCanvas::processInputQueue() {
     }
     glContext->SetCurrent(*this);
     
-    while (!visualDataQueue.empty()) {
-        SpectrumVisualData *vData;
-        
-        visualDataQueue.pop(vData);
-        
-        if (vData) {
-            waterfallPanel.setPoints(vData->spectrum_points);
-            waterfallPanel.step();
-            vData->decRefCount();
+    gTimer.update();
+    
+    double targetVis =  1.0 / (double)linesPerSecond;
+    lpsIndex += gTimer.lastUpdateSeconds();
+
+    if (linesPerSecond) {
+        if (lpsIndex >= targetVis) {
+            tex_update.lock();
+            while (lpsIndex >= targetVis) {
+                SpectrumVisualData *vData;
+                if (!visualDataQueue.empty()) {
+                    visualDataQueue.pop(vData);
+                    
+                    if (vData) {
+                        waterfallPanel.setPoints(vData->spectrum_points);
+                        waterfallPanel.step();
+                        vData->decRefCount();
+                    }
+                    lpsIndex-=targetVis;
+                } else {
+                	break;
+                }
+            }
+            tex_update.unlock();
         }
-    }
-}
+    }}
 
 void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
-//    wxClientDC dc(this);
     wxPaintDC dc(this);
 
+    processInputQueue();
+    
     const wxSize ClientSize = GetClientSize();
     long double currentZoom = zoom;
     
@@ -193,7 +211,9 @@ void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
     glContext->BeginDraw(0,0,0);
 
     waterfallPanel.calcTransform(CubicVR::mat4::identity());
+    tex_update.lock();
     waterfallPanel.draw();
+    tex_update.unlock();
 
     std::vector<DemodulatorInstance *> &demods = wxGetApp().getDemodMgr().getDemodulators();
 
@@ -391,7 +411,9 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
 void WaterfallCanvas::OnIdle(wxIdleEvent &event) {
     Refresh();
     event.RequestMore();
-//    event.Skip();
+    if (visualDataQueue.size() > linesPerSecond) {
+        processInputQueue();
+    }
 }
 
 void WaterfallCanvas::OnMouseMoved(wxMouseEvent& event) {
@@ -779,3 +801,17 @@ void WaterfallCanvas::updateCenterFrequency(long long freq) {
 
 }
 
+void WaterfallCanvas::setLinesPerSecond(int lps) {
+    linesPerSecond = lps;
+    while (!visualDataQueue.empty()) {
+        SpectrumVisualData *vData;
+        visualDataQueue.pop(vData);
+        
+        if (vData) {
+            vData->decRefCount();
+        }
+    }
+
+}
+
+

src/visual/WaterfallCanvas.h

@@ -10,7 +10,7 @@
 #include "MouseTracker.h"
 #include "SpectrumCanvas.h"
 #include "WaterfallPanel.h"
-
+#include "Timer.h"
 
 class WaterfallCanvas: public InteractiveCanvas {
 public:
@@ -29,6 +29,8 @@ public:
     void processInputQueue();
     SpectrumVisualDataQueue *getVisualDataQueue();
 
+    void setLinesPerSecond(int lps);
+
 private:
     void OnPaint(wxPaintEvent& event);
     void OnKeyDown(wxKeyEvent& event);
@@ -64,9 +66,13 @@ private:
     bool freqMoving;
     long double freqMove;
     float hoverAlpha;
-
+    int linesPerSecond;
+    
     SpectrumVisualDataQueue visualDataQueue;
-
+    Timer gTimer;
+    double lpsIndex;
+    bool preBuf;
+    std::mutex tex_update;
     // event table
 wxDECLARE_EVENT_TABLE();
 };