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

Zoom transition improvements, fix a nasty visual data overflow

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-12-13 16:07:28 -05:00
parent be8cde6ce3
commit aa821c8860
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/process/FFTVisualDataThread.cpp
View File

@ -27,6 +27,7 @@ void FFTVisualDataThread::run() {
DemodulatorThreadInputQueue *pipeIQDataIn = (DemodulatorThreadInputQueue *)getInputQueue("IQDataInput"); DemodulatorThreadInputQueue *pipeIQDataIn = (DemodulatorThreadInputQueue *)getInputQueue("IQDataInput");
SpectrumVisualDataQueue *pipeFFTDataOut = (SpectrumVisualDataQueue *)getOutputQueue("FFTDataOutput"); SpectrumVisualDataQueue *pipeFFTDataOut = (SpectrumVisualDataQueue *)getOutputQueue("FFTDataOutput");
pipeFFTDataOut->set_max_num_items(512);
fftDistrib.setInput(pipeIQDataIn); fftDistrib.setInput(pipeIQDataIn);
fftDistrib.attachOutput(&fftQueue); fftDistrib.attachOutput(&fftQueue);
wproc.setInput(&fftQueue); wproc.setInput(&fftQueue);

13
src/process/SpectrumVisualProcessor.cpp
View File

@ -18,6 +18,7 @@ SpectrumVisualProcessor::SpectrumVisualProcessor() : lastInputBandwidth(0), last
desiredInputSize.store(0); desiredInputSize.store(0);
fft_average_rate = 0.65; fft_average_rate = 0.65;
scaleFactor.store(1.0); scaleFactor.store(1.0);
lastView = false;
} }
SpectrumVisualProcessor::~SpectrumVisualProcessor() { SpectrumVisualProcessor::~SpectrumVisualProcessor() {
@ -334,7 +335,7 @@ void SpectrumVisualProcessor::process() {
fft_result[fftSizeInternal / 2 + i] = (c); fft_result[fftSizeInternal / 2 + i] = (c);
} }
if (newResampler) { if (newResampler && lastView) {
if (bwDiff < 0) { if (bwDiff < 0) {
for (int i = 0, iMax = fftSizeInternal; i < iMax; i++) { for (int i = 0, iMax = fftSizeInternal; i < iMax; i++) {
fft_result_temp[i] = fft_result_ma[(fftSizeInternal/4) + (i/2)]; fft_result_temp[i] = fft_result_ma[(fftSizeInternal/4) + (i/2)];
@ -350,9 +351,9 @@ void SpectrumVisualProcessor::process() {
} else { } else {
for (int i = 0, iMax = fftSizeInternal; i < iMax; i++) { for (int i = 0, iMax = fftSizeInternal; i < iMax; i++) {
if (i < fftSizeInternal/4) { if (i < fftSizeInternal/4) {
fft_result_temp[i] = 0; fft_result_temp[i] = fft_result_ma[fftSizeInternal/4];
} else if (i >= fftSizeInternal - fftSizeInternal/4) { } else if (i >= fftSizeInternal - fftSizeInternal/4) {
fft_result_temp[i] = 0; fft_result_temp[i] = fft_result_ma[fftSizeInternal - fftSizeInternal/4-1];
} else { } else {
fft_result_temp[i] = fft_result_ma[(i-fftSizeInternal/4)*2]; fft_result_temp[i] = fft_result_ma[(i-fftSizeInternal/4)*2];
} }
@ -361,9 +362,9 @@ void SpectrumVisualProcessor::process() {
fft_result_ma[i] = fft_result_temp[i]; fft_result_ma[i] = fft_result_temp[i];
if (i < fftSizeInternal/4) { if (i < fftSizeInternal/4) {
fft_result_temp[i] = 0; fft_result_temp[i] = fft_result_maa[fftSizeInternal/4];
} else if (i >= fftSizeInternal - fftSizeInternal/4) { } else if (i >= fftSizeInternal - fftSizeInternal/4) {
fft_result_temp[i] = 0; fft_result_temp[i] = fft_result_maa[fftSizeInternal - fftSizeInternal/4-1];
} else { } else {
fft_result_temp[i] = fft_result_maa[(i-fftSizeInternal/4)*2]; fft_result_temp[i] = fft_result_maa[(i-fftSizeInternal/4)*2];
} }
@ -483,6 +484,8 @@ void SpectrumVisualProcessor::process() {
iqData->decRefCount(); iqData->decRefCount();
iqData->busy_rw.unlock(); iqData->busy_rw.unlock();
busy_run.unlock(); busy_run.unlock();
lastView = is_view.load();
} }

1
src/process/SpectrumVisualProcessor.h
View File

@ -56,6 +56,7 @@ protected:
private: private:
long lastInputBandwidth; long lastInputBandwidth;
long lastBandwidth; long lastBandwidth;
bool lastView;
fftwf_complex *fftwInput, *fftwOutput, *fftInData, *fftLastData; fftwf_complex *fftwInput, *fftwOutput, *fftInData, *fftLastData;
unsigned int lastDataSize; unsigned int lastDataSize;