comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-17 22:17:48 -04:00
Code Issues Projects Releases Wiki Activity

OPTION1: Boost line numbers of main and demod waterfall from 512/128 to 1024/256

Browse Source
This commit is contained in:
vsonnier 2017-02-05 11:43:45 +01:00
parent 4609386648
commit a161cf51f9
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppFrame.cpp
View File

@ -181,6 +181,8 @@ AppFrame::AppFrame() :
demodVisuals->Add(demodWaterfallCanvas, 6, wxEXPAND | wxALL, 0); demodVisuals->Add(demodWaterfallCanvas, 6, wxEXPAND | wxALL, 0);
wxGetApp().getDemodSpectrumProcessor()->attachOutput(demodWaterfallCanvas->getVisualDataQueue()); wxGetApp().getDemodSpectrumProcessor()->attachOutput(demodWaterfallCanvas->getVisualDataQueue());
demodWaterfallCanvas->getVisualDataQueue()->set_max_num_items(3); demodWaterfallCanvas->getVisualDataQueue()->set_max_num_items(3);
demodWaterfallCanvas->setLinesPerSecond((int)(DEFAULT_DEMOD_WATERFALL_LINES_NB / DEMOD_WATERFALL_DURATION_IN_SECONDS));
demodVisuals->SetMinSize(wxSize(128,-1)); demodVisuals->SetMinSize(wxSize(128,-1));

9
src/CubicSDRDefs.h
View File

@ -38,14 +38,19 @@ const char filePathSeparator =
#define DEFAULT_SCOPE_FFT_SIZE (DEFAULT_FFT_SIZE / 2) #define DEFAULT_SCOPE_FFT_SIZE (DEFAULT_FFT_SIZE / 2)
//Both must be a power of 2 to prevent terrible OpenGL performance. //Both must be a power of 2 to prevent terrible OpenGL performance.
#define DEFAULT_MAIN_WATERFALL_LINES_NB 512 #define DEFAULT_MAIN_WATERFALL_LINES_NB 1024
#define DEFAULT_DEMOD_WATERFALL_LINES_NB 128 #define DEFAULT_DEMOD_WATERFALL_LINES_NB 256
#define DEFAULT_DEMOD_TYPE "FM" #define DEFAULT_DEMOD_TYPE "FM"
#define DEFAULT_DEMOD_BW 200000 #define DEFAULT_DEMOD_BW 200000
#define DEFAULT_WATERFALL_LPS 30 #define DEFAULT_WATERFALL_LPS 30
//Dmod waterfall lines per second is adjusted
//so that the whole demod waterfall show DEMOD_WATERFALL_DURATION_IN_SECONDS
//seconds.
#define DEMOD_WATERFALL_DURATION_IN_SECONDS 4.0
#define CHANNELIZER_RATE_MAX 500000 #define CHANNELIZER_RATE_MAX 500000
#define MANUAL_SAMPLE_RATE_MIN 2000000 // 2MHz #define MANUAL_SAMPLE_RATE_MIN 2000000 // 2MHz

2
src/visual/WaterfallCanvas.cpp
View File

@ -42,7 +42,7 @@ WaterfallCanvas::WaterfallCanvas(wxWindow *parent, std::vector<int> dispAttrs) :
dragOfs(0), mouseZoom(1), zoom(1), freqMoving(false), freqMove(0.0), hoverAlpha(1.0) { dragOfs(0), mouseZoom(1), zoom(1), freqMoving(false), freqMove(0.0), hoverAlpha(1.0) {
glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this)); glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
linesPerSecond = 30; linesPerSecond = DEFAULT_WATERFALL_LPS;
lpsIndex = 0; lpsIndex = 0;
preBuf = false; preBuf = false;
SetCursor(wxCURSOR_CROSS); SetCursor(wxCURSOR_CROSS);