comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2026-06-21 07:09:03 -04:00
Code Issues Projects Releases Wiki Activity

More AppFrame cleanup, active/current modem verbage adjustments

Browse Source
This commit is contained in:
Charles J. Cliffe
2019-02-11 22:59:43 -05:00
parent abaf458ea1
commit 9ed085123a
14 changed files with 390 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/visual/TuningCanvas.cpp
+4 -4
View File
@@ -62,7 +62,7 @@ TuningCanvas::~TuningCanvas() {
bool TuningCanvas::changed() {
auto activeDemod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
auto activeDemod = wxGetApp().getDemodMgr().getCurrentModem();
long long current_freq = 0;
if (activeDemod != nullptr) {
@@ -93,7 +93,7 @@ void TuningCanvas::OnPaint(wxPaintEvent& WXUNUSED(event)) {
glContext->DrawBegin();
auto activeDemod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
auto activeDemod = wxGetApp().getDemodMgr().getCurrentModem();
freq = 0;
if (activeDemod != nullptr) {
@@ -171,7 +171,7 @@ void TuningCanvas::StepTuner(ActiveState state, int exponent, bool up) {
amount *= 2;
}
auto activeDemod = wxGetApp().getDemodMgr().getLastActiveDemodulator();
auto activeDemod = wxGetApp().getDemodMgr().getCurrentModem();
if (state == TUNING_HOVER_FREQ && activeDemod) {
long long freq = activeDemod->getFrequency();
long long diff = abs(wxGetApp().getFrequency() - freq);
@@ -328,7 +328,7 @@ void TuningCanvas::OnMouseMoved(wxMouseEvent& event) {
}
if (hoverState == TUNING_HOVER_BW || hoverState == TUNING_HOVER_FREQ) {
wxGetApp().getDemodMgr().setActiveDemodulator(wxGetApp().getDemodMgr().getLastActiveDemodulator());
wxGetApp().getDemodMgr().setActiveDemodulator(wxGetApp().getDemodMgr().getCurrentModem());
} else {
wxGetApp().getDemodMgr().setActiveDemodulator(nullptr);
}