FSK tweaks, minimum bandwidth adjust

This commit is contained in:
Charles J. Cliffe
2015-12-01 00:59:11 -05:00
parent 76d69ffd78
commit 0f8065f48a
12 changed files with 46 additions and 32 deletions
+6 -5
View File
@@ -17,8 +17,6 @@
#include <wx/numformatter.h>
#define MIN_BANDWIDTH 1500
wxBEGIN_EVENT_TABLE(WaterfallCanvas, wxGLCanvas)
EVT_PAINT(WaterfallCanvas::OnPaint)
EVT_KEY_DOWN(WaterfallCanvas::OnKeyDown)
@@ -44,6 +42,7 @@ WaterfallCanvas::WaterfallCanvas(wxWindow *parent, int *attribList) :
preBuf = false;
SetCursor(wxCURSOR_CROSS);
scaleMove = 0;
minBandwidth = 30000;
}
WaterfallCanvas::~WaterfallCanvas() {
@@ -179,8 +178,8 @@ void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
if (currentZoom < 1) {
bw = (long long) ceil((long double) bw * currentZoom);
if (bw < 30000) {
bw = 30000;
if (bw < minBandwidth) {
bw = minBandwidth;
}
if (mouseInView) {
long long mfreqA = getFrequencyAt(mpos);
@@ -852,4 +851,6 @@ void WaterfallCanvas::setLinesPerSecond(int lps) {
tex_update.unlock();
}
void WaterfallCanvas::setMinBandwidth(int min) {
minBandwidth = min;
}
+2
View File
@@ -30,6 +30,7 @@ public:
SpectrumVisualDataQueue *getVisualDataQueue();
void setLinesPerSecond(int lps);
void setMinBandwidth(int min);
private:
void OnPaint(wxPaintEvent& event);
@@ -75,6 +76,7 @@ private:
double lpsIndex;
bool preBuf;
std::mutex tex_update;
int minBandwidth;
// event table
wxDECLARE_EVENT_TABLE();
};