comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-02-03 09:44:26 -05:00
Code Issues Projects Releases Wiki Activity

Crank up the waterfall zoom limits for more detail :)

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-08-11 20:37:46 -04:00
parent 8494ce3f18
commit f4640094b8
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AppFrame.cpp
View File

@ -719,7 +719,7 @@ void AppFrame::OnTimer(wxTimerEvent& event) {
} else { } else {
fftDistrib.setFFTSize(DEFAULT_FFT_SIZE); fftDistrib.setFFTSize(DEFAULT_FFT_SIZE);
} }
fftDistrib.setLinesPerSecond(15); fftDistrib.setLinesPerSecond(60);
fftDistrib.run(); fftDistrib.run();
wproc->setView(waterfallCanvas->getViewState()); wproc->setView(waterfallCanvas->getViewState());

3
src/CubicSDR.cpp
View File

@ -64,6 +64,7 @@ bool CubicSDR::OnInit() {
pipeIQVisualData->set_max_num_items(1); pipeIQVisualData->set_max_num_items(1);
pipeWaterfallIQVisualData = new DemodulatorThreadInputQueue(); pipeWaterfallIQVisualData = new DemodulatorThreadInputQueue();
pipeWaterfallIQVisualData->set_max_num_items(512);
spectrumDistributor.attachOutput(pipeDemodIQVisualData); spectrumDistributor.attachOutput(pipeDemodIQVisualData);
spectrumDistributor.attachOutput(pipeSpectrumIQVisualData); spectrumDistributor.attachOutput(pipeSpectrumIQVisualData);
@ -85,7 +86,7 @@ bool CubicSDR::OnInit() {
sdrThread->setOutputQueue("IQDataOutput",pipeSDRIQData); sdrThread->setOutputQueue("IQDataOutput",pipeSDRIQData);
sdrPostThread = new SDRPostThread(); sdrPostThread = new SDRPostThread();
sdrPostThread->setNumVisSamples(16384 * 2); sdrPostThread->setNumVisSamples(BUF_SIZE);
sdrPostThread->setInputQueue("IQDataInput", pipeSDRIQData); sdrPostThread->setInputQueue("IQDataInput", pipeSDRIQData);
sdrPostThread->setOutputQueue("IQVisualDataOutput", pipeIQVisualData); sdrPostThread->setOutputQueue("IQVisualDataOutput", pipeIQVisualData);
sdrPostThread->setOutputQueue("IQDataOutput", pipeWaterfallIQVisualData); sdrPostThread->setOutputQueue("IQDataOutput", pipeWaterfallIQVisualData);

12
src/process/SpectrumVisualProcessor.h
View File

@ -68,7 +68,7 @@ private:
class FFTDataDistributor : public VisualProcessor<DemodulatorThreadIQData, DemodulatorThreadIQData> { class FFTDataDistributor : public VisualProcessor<DemodulatorThreadIQData, DemodulatorThreadIQData> {
public: public:
FFTDataDistributor() : linesPerSecond(30) { FFTDataDistributor() : linesPerSecond(30), lineRateAccum(0.0) {
} }
void setFFTSize(int fftSize) { void setFFTSize(int fftSize) {
@ -88,6 +88,12 @@ protected:
DemodulatorThreadIQData *inp; DemodulatorThreadIQData *inp;
input->pop(inp); input->pop(inp);
int fftSize = this->fftSize;
if (fftSize > inp->data.size()) {
fftSize = inp->data.size();
}
// number of milliseconds contained in input // number of milliseconds contained in input
double inputTime = (double)inp->data.size() / (double)inp->sampleRate; double inputTime = (double)inp->data.size() / (double)inp->sampleRate;
// number of lines in input // number of lines in input
@ -98,7 +104,7 @@ protected:
if (inp) { if (inp) {
if (inp->data.size() >= fftSize) { if (inp->data.size() >= fftSize) {
for (int i = 0, iMax = inp->data.size()-fftSize; i < iMax; i += fftSize) { for (int i = 0, iMax = inp->data.size()-fftSize; i <= iMax; i += fftSize) {
lineRateAccum += lineRateStep; lineRateAccum += lineRateStep;
if (lineRateAccum >= 1.0) { if (lineRateAccum >= 1.0) {
@ -108,7 +114,7 @@ protected:
outp->data.assign(inp->data.begin()+i,inp->data.begin()+i+fftSize); outp->data.assign(inp->data.begin()+i,inp->data.begin()+i+fftSize);
distribute(outp); distribute(outp);
while (lineRateAccum > 1.0) { while (lineRateAccum >= 1.0) {
lineRateAccum -= 1.0; lineRateAccum -= 1.0;
} }
} }

1
src/visual/SpectrumCanvas.cpp
View File

@ -32,6 +32,7 @@ SpectrumCanvas::SpectrumCanvas(wxWindow *parent, int *attribList) :
glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this)); glContext = new PrimaryGLContext(this, &wxGetApp().GetContext(this));
mouseTracker.setVertDragLock(true); mouseTracker.setVertDragLock(true);
visualDataQueue.set_max_num_items(1);
SetCursor(wxCURSOR_SIZEWE); SetCursor(wxCURSOR_SIZEWE);
} }

4
src/visual/WaterfallCanvas.cpp
View File

@ -90,8 +90,8 @@ void WaterfallCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
centerFreq = getCenterFrequency(); centerFreq = getCenterFrequency();
bw = getBandwidth(); bw = getBandwidth();
bw = (long long) ceil((long double) bw * currentZoom); bw = (long long) ceil((long double) bw * currentZoom);
if (bw < 100000) { if (bw < 30000) {
bw = 100000; bw = 30000;
} }
if (mouseTracker.mouseInView()) { if (mouseTracker.mouseInView()) {
long long mfreqA = getFrequencyAt(mouseTracker.getMouseX()); long long mfreqA = getFrequencyAt(mouseTracker.getMouseX());