piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Work on spectrum

Browse Source
This commit is contained in:
3djc
2019-12-07 15:04:32 +01:00
parent 8dff7f090e
commit 5a1109b064
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/radio_spectrum_analyser.cpp
+8 -12
View File
@@ -84,14 +84,18 @@ class ScaleWindow: public Window
void paint(BitmapBuffer * dc) override
{
/*for (uint32_t frequency =
dc->drawSolidFilledRect(0, 0, width(), height(), CURVE_AXIS_COLOR);
for (uint32_t frequency =
((reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2) / 10000000) * 10000000 + 10000000;; frequency += 10000000) {
int offset = frequency - (reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2);
int x = offset / reusableBuffer.spectrumAnalyser.step;
if (x >= LCD_W - 1)
break;
if ((frequency / 1000000) % 2 == 0) {
//dc->drawNumber(x, 2, frequency / 1000000, FONT(XS) | CENTERED);
dc->drawNumber(x, 2, frequency / 1000000, FONT(XS) | CENTERED);
}
}*/
}
}
};
@@ -123,22 +127,14 @@ class SpectrumWindow : public Window
}
#endif
constexpr coord_t SCALE_HEIGHT = 12;
coord_t SCALE_TOP = height() - SCALE_HEIGHT - MENU_FOOTER_HEIGHT;
coord_t BARGRAPH_HEIGHT = height() - SCALE_HEIGHT;
coord_t SCALE_TOP = height() - MENU_FOOTER_HEIGHT;
// Draw fixed part (scale,..)
dc->drawSolidFilledRect(0, SCALE_TOP, width(), SCALE_HEIGHT, CURVE_AXIS_COLOR);
for (uint32_t frequency = ((reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2) / 10000000) * 10000000 + 10000000; ; frequency += 10000000) {
int offset = frequency - (reusableBuffer.spectrumAnalyser.freq - reusableBuffer.spectrumAnalyser.span / 2);
int x = offset / reusableBuffer.spectrumAnalyser.step;
if (x >= LCD_W - 1)
break;
dc->drawVerticalLine(x, 0, height(), STASHED, CURVE_AXIS_COLOR);
/*if ((frequency / 1000000) % 2 == 0) {
dc->drawNumber(x, SCALE_TOP - 2, frequency / 1000000, FONT(XS) | CENTERED);
}*/
}
for (uint8_t power = 20;; power += 20) {