williamp/osmocom-analog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SDR: Improvement of spectrum view, peaks are drawn correctly

Browse Source
This commit is contained in:
Andreas Eversberg
2017-09-16 10:05:26 +02:00
parent 0b7b8f12c6
commit 274cb7992b
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/common/display_spectrum.c
View File

@@ -102,7 +102,7 @@ void display_spectrum(float *samples, int length)
int color = 9; /* default color */ int color = 9; /* default color */
int i, j, k, o; int i, j, k, o;
double I, Q, v; double I, Q, v;
int s, e; int s, e, l, n;
if (!spectrum_on) if (!spectrum_on)
return; return;
@@ -178,11 +178,31 @@ void display_spectrum(float *samples, int length)
*strchr(screen[0], '\0') = ')'; *strchr(screen[0], '\0') = ')';
o = (width - fft_size) / 2; /* offset from left border */ o = (width - fft_size) / 2; /* offset from left border */
for (j = 0; j < fft_size; j++) { for (j = 0; j < fft_size; j++) {
s = e = low[j]; s = l = n = low[j];
if (j > 0 && low[j - 1] > e) /* get last and next value */
e = low[j - 1] - 1; if (j > 0)
if (j < fft_size - 1 && low[j + 1] > e) l = (low[j - 1] + s) / 2;
e = low[j + 1] - 1; if (j < fft_size - 1)
n = (low[j + 1] + s) / 2;
if (s > l && s > n) {
/* current value is a minimum */
e = s;
s = (l < n) ? (l + 1) : (n + 1);
} else if (s < l && s < n) {
/* current value is a maximum */
e = (l > n) ? l : n;
} else if (l < n) {
/* last value is higher, next value is lower */
s = l + 1;
e = n;
} else if (l > n) {
/* last value is lower, next value is higher */
s = n + 1;
e = l;
} else {
/* current, last and next values are equal */
e = s;
}
if (s == e) { if (s == e) {
if ((s & 1) == 0) if ((s & 1) == 0)
screen[s >> 1][j + o] = '\''; screen[s >> 1][j + o] = '\'';
@@ -205,8 +225,8 @@ void display_spectrum(float *samples, int length)
screen_color[k][j + o] = 13; screen_color[k][j + o] = 13;
} }
} }
e = s;
s = heigh[j]; s = heigh[j];
e = low[j];
if ((s >> 1) < (e >> 1)) { if ((s >> 1) < (e >> 1)) {
if ((s & 1) == 0) if ((s & 1) == 0)
screen[s >> 1][j + o] = '|'; screen[s >> 1][j + o] = '|';
@@ -238,7 +258,10 @@ void display_spectrum(float *samples, int length)
screen_color[HEIGHT - 1][s] = 7; screen_color[HEIGHT - 1][s] = 7;
} }
} }
sprintf(print_frequency, "%.4f", sender->empfangsfrequenz / 1e6); if (fmod(sender->empfangsfrequenz, 1000.0))
sprintf(print_frequency, "%.4f", sender->empfangsfrequenz / 1e6);
else
sprintf(print_frequency, "%.3f", sender->empfangsfrequenz / 1e6);
for (o = 0; o < (int)strlen(print_frequency); o++) { for (o = 0; o < (int)strlen(print_frequency); o++) {
s = j + o + 1; s = j + o + 1;
if (s >= 0 && s < width) { if (s >= 0 && s < width) {