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

Improve peak hold usability; add 30 frame delay between resets; don't drag old data around

Browse Source
This commit is contained in:
Charles J. Cliffe 2016-01-02 01:38:17 -05:00
parent caa8074531
commit 62288e485f
3 changed files with 41 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/process/SpectrumVisualProcessor.cpp
View File

@ -22,6 +22,7 @@ SpectrumVisualProcessor::SpectrumVisualProcessor() : lastInputBandwidth(0), last
newFFTSize.store(0); newFFTSize.store(0);
lastView = false; lastView = false;
peakHold.store(false); peakHold.store(false);
peakReset.store(false);
} }
SpectrumVisualProcessor::~SpectrumVisualProcessor() { SpectrumVisualProcessor::~SpectrumVisualProcessor() {
@ -78,13 +79,12 @@ long SpectrumVisualProcessor::getBandwidth() {
} }
void SpectrumVisualProcessor::setPeakHold(bool peakHold_in) { void SpectrumVisualProcessor::setPeakHold(bool peakHold_in) {
fft_ceil_peak = fft_floor_maa; if (peakHold.load() && peakHold_in) {
fft_floor_peak = fft_ceil_maa; peakReset.store(PEAK_RESET_COUNT);
} else {
for (int i = 0, iMax = fft_result_peak.size(); i < iMax; i++) { peakHold.store(peakHold_in);
fft_result_peak[i] = fft_floor_maa; peakReset.store(1);
} }
peakHold.store(peakHold_in);
} }
bool SpectrumVisualProcessor::getPeakHold() { bool SpectrumVisualProcessor::getPeakHold() {
@ -175,7 +175,32 @@ void SpectrumVisualProcessor::process() {
iqData->busy_rw.lock(); iqData->busy_rw.lock();
busy_run.lock(); busy_run.lock();
bool doPeak = peakHold.load(); bool doPeak = peakHold.load() && (peakReset.load() == 0);
if (fft_result.size() != fftSizeInternal) {
if (fft_result.capacity() < fftSizeInternal) {
fft_result.reserve(fftSizeInternal);
fft_result_ma.reserve(fftSizeInternal);
fft_result_maa.reserve(fftSizeInternal);
fft_result_peak.reserve(fftSizeInternal);
}
fft_result.resize(fftSizeInternal);
fft_result_ma.resize(fftSizeInternal);
fft_result_maa.resize(fftSizeInternal);
fft_result_temp.resize(fftSizeInternal);
fft_result_peak.resize(fftSizeInternal);
}
if (peakReset.load() != 0) {
peakReset--;
if (peakReset.load() == 0) {
for (int i = 0, iMax = fftSizeInternal; i < iMax; i++) {
fft_result_peak[i] = fft_floor_maa;
}
fft_ceil_peak = fft_floor_maa;
fft_floor_peak = fft_ceil_maa;
}
}
std::vector<liquid_float_complex> *data = &iqData->data; std::vector<liquid_float_complex> *data = &iqData->data;
@ -227,18 +252,19 @@ void SpectrumVisualProcessor::process() {
if (freqDiff > 0) { if (freqDiff > 0) {
memmove(&fft_result_ma[0], &fft_result_ma[numShift], (fftSizeInternal-numShift) * sizeof(double)); memmove(&fft_result_ma[0], &fft_result_ma[numShift], (fftSizeInternal-numShift) * sizeof(double));
memmove(&fft_result_maa[0], &fft_result_maa[numShift], (fftSizeInternal-numShift) * sizeof(double)); memmove(&fft_result_maa[0], &fft_result_maa[numShift], (fftSizeInternal-numShift) * sizeof(double));
memmove(&fft_result_peak[0], &fft_result_peak[numShift], (fftSizeInternal-numShift) * sizeof(double)); // memmove(&fft_result_peak[0], &fft_result_peak[numShift], (fftSizeInternal-numShift) * sizeof(double));
memset(&fft_result_peak[fftSizeInternal-numShift], 0, numShift * sizeof(double)); // memset(&fft_result_peak[fftSizeInternal-numShift], 0, numShift * sizeof(double));
} else { } else {
memmove(&fft_result_ma[numShift], &fft_result_ma[0], (fftSizeInternal-numShift) * sizeof(double)); memmove(&fft_result_ma[numShift], &fft_result_ma[0], (fftSizeInternal-numShift) * sizeof(double));
memmove(&fft_result_maa[numShift], &fft_result_maa[0], (fftSizeInternal-numShift) * sizeof(double)); memmove(&fft_result_maa[numShift], &fft_result_maa[0], (fftSizeInternal-numShift) * sizeof(double));
memmove(&fft_result_peak[numShift], &fft_result_peak[0], (fftSizeInternal-numShift) * sizeof(double)); // memmove(&fft_result_peak[numShift], &fft_result_peak[0], (fftSizeInternal-numShift) * sizeof(double));
memset(&fft_result_peak[0], 0, numShift * sizeof(double)); // memset(&fft_result_peak[0], 0, numShift * sizeof(double));
} }
} }
} }
} }
} }
peakReset.store(PEAK_RESET_COUNT);
} }
if (shiftBuffer.size() != desired_input_size) { if (shiftBuffer.size() != desired_input_size) {
@ -270,6 +296,7 @@ void SpectrumVisualProcessor::process() {
lastBandwidth = resampleBw; lastBandwidth = resampleBw;
lastInputBandwidth = iqData->sampleRate; lastInputBandwidth = iqData->sampleRate;
newResampler = true; newResampler = true;
peakReset.store(PEAK_RESET_COUNT);
} }
@ -362,20 +389,6 @@ void SpectrumVisualProcessor::process() {
float fft_ceil = 0, fft_floor = 1; float fft_ceil = 0, fft_floor = 1;
if (fft_result.size() != fftSizeInternal) {
if (fft_result.capacity() < fftSizeInternal) {
fft_result.reserve(fftSizeInternal);
fft_result_ma.reserve(fftSizeInternal);
fft_result_maa.reserve(fftSizeInternal);
fft_result_peak.reserve(fftSizeInternal);
}
fft_result.resize(fftSizeInternal);
fft_result_ma.resize(fftSizeInternal);
fft_result_maa.resize(fftSizeInternal);
fft_result_temp.resize(fftSizeInternal);
fft_result_peak.resize(fftSizeInternal);
}
for (int i = 0, iMax = fftSizeInternal / 2; i < iMax; i++) { for (int i = 0, iMax = fftSizeInternal / 2; i < iMax; i++) {
float a = fftwOutput[i][0]; float a = fftwOutput[i][0];
float b = fftwOutput[i][1]; float b = fftwOutput[i][1];
@ -428,13 +441,6 @@ void SpectrumVisualProcessor::process() {
} }
} }
} }
if (newResampler) {
for (int i = 0, iMax = fftSizeInternal; i < iMax; i++) {
fft_result_peak[i] = fft_floor_maa;
}
fft_ceil_peak = fft_floor_maa;
fft_floor_peak = fft_ceil_maa;
}
for (int i = 0, iMax = fftSizeInternal; i < iMax; i++) { for (int i = 0, iMax = fftSizeInternal; i < iMax; i++) {
if (fft_result_maa[i] != fft_result_maa[i]) fft_result_maa[i] = fft_result[i]; if (fft_result_maa[i] != fft_result_maa[i]) fft_result_maa[i] = fft_result[i];

2
src/process/SpectrumVisualProcessor.h
View File

@ -6,6 +6,7 @@
#include <cmath> #include <cmath>
#define SPECTRUM_VZM 2 #define SPECTRUM_VZM 2
#define PEAK_RESET_COUNT 30
class SpectrumVisualData : public ReferenceCounter { class SpectrumVisualData : public ReferenceCounter {
public: public:
@ -88,6 +89,7 @@ private:
std::atomic_int desiredInputSize; std::atomic_int desiredInputSize;
std::mutex busy_run; std::mutex busy_run;
std::atomic_bool hideDC, peakHold; std::atomic_bool hideDC, peakHold;
std::atomic_int peakReset;
std::atomic<float> scaleFactor; std::atomic<float> scaleFactor;
std::atomic_bool fftSizeChanged; std::atomic_bool fftSizeChanged;
}; };

1
src/visual/SpectrumCanvas.cpp
View File

@ -260,6 +260,7 @@ void SpectrumCanvas::OnMouseRightReleased(wxMouseEvent& event) {
mouseTracker.setHorizDragLock(false); mouseTracker.setHorizDragLock(false);
if (!mouseTracker.getOriginDeltaMouseY()) { if (!mouseTracker.getOriginDeltaMouseY()) {
resetScaleFactor = true; resetScaleFactor = true;
wxGetApp().getSpectrumProcessor()->setPeakHold(wxGetApp().getSpectrumProcessor()->getPeakHold());
} }
mouseTracker.OnMouseRightReleased(event); mouseTracker.OnMouseRightReleased(event);
} }