From ef3a3ba59459c831bf85cffda1f64212365d11f2 Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Sun, 1 Mar 2015 11:13:01 -0500 Subject: [PATCH] Remove seam adjustment, no longer needed --- src/visual/SpectrumCanvas.cpp | 11 ++++------- src/visual/WaterfallCanvas.cpp | 9 ++++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/visual/SpectrumCanvas.cpp b/src/visual/SpectrumCanvas.cpp index 07cdd3f..e3986e9 100644 --- a/src/visual/SpectrumCanvas.cpp +++ b/src/visual/SpectrumCanvas.cpp @@ -129,13 +129,12 @@ void SpectrumCanvas::setData(DemodulatorThreadIQData *input) { int n; for (int i = 0, iMax = fft_size / 2; i < iMax; i++) { - n = (i == 0) ? 1 : i; - float a = out[n][0]; - float b = out[n][1]; + float a = out[i][0]; + float b = out[i][1]; float c = sqrt(a * a + b * b); - float x = out[fft_size / 2 + n][0]; - float y = out[fft_size / 2 + n][1]; + float x = out[fft_size / 2 + i][0]; + float y = out[fft_size / 2 + i][1]; float z = sqrt(x * x + y * y); fft_result[i] = (z); @@ -163,8 +162,6 @@ void SpectrumCanvas::setData(DemodulatorThreadIQData *input) { fft_floor_ma = fft_floor_ma + (fft_floor - fft_floor_ma) * 0.01; fft_floor_maa = fft_floor_maa + (fft_floor_ma - fft_floor_maa) * 0.01; - // fftwf_execute(plan[1]); - for (int i = 0, iMax = fft_size; i < iMax; i++) { float v = (log10(fft_result_maa[i] - fft_floor_maa) / log10(fft_ceil_maa - fft_floor_maa)); spectrum_points[i * 2] = ((float) i / (float) iMax); diff --git a/src/visual/WaterfallCanvas.cpp b/src/visual/WaterfallCanvas.cpp index 77f15cd..c6babc2 100644 --- a/src/visual/WaterfallCanvas.cpp +++ b/src/visual/WaterfallCanvas.cpp @@ -540,13 +540,12 @@ void WaterfallCanvas::setData(DemodulatorThreadIQData *input) { int n; for (int i = 0, iMax = fft_size / 2; i < iMax; i++) { - n = (i == 0) ? 1 : i; - float a = out[n][0]; - float b = out[n][1]; + float a = out[i][0]; + float b = out[i][1]; float c = sqrt(a * a + b * b); - float x = out[fft_size / 2 + n][0]; - float y = out[fft_size / 2 + n][1]; + float x = out[fft_size / 2 + i][0]; + float y = out[fft_size / 2 + i][1]; float z = sqrt(x * x + y * y); fft_result[i] = (z);