comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-09-16 13:37:47 -04:00
Code Issues Projects Releases Wiki Activity

FOCUS: Force center of main Waterfall/Spectrum on active demod on session load

Browse Source
This commit is contained in:
vsonnier 2016-06-30 19:48:04 +02:00
parent cf90a829b0
commit 314a95c3c8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/AppFrame.cpp
View File

@ -1294,6 +1294,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
demodWaterfallCanvas->setCenterFrequency(centerFreq); demodWaterfallCanvas->setCenterFrequency(centerFreq);
demodSpectrumCanvas->setCenterFrequency(centerFreq); demodSpectrumCanvas->setCenterFrequency(centerFreq);
} }
std::string dSelection = demodModeSelector->getSelectionLabel(); std::string dSelection = demodModeSelector->getSelectionLabel();
#ifdef ENABLE_DIGITAL_LAB #ifdef ENABLE_DIGITAL_LAB
std::string dSelectionadv = demodModeSelectorAdv->getSelectionLabel(); std::string dSelectionadv = demodModeSelectorAdv->getSelectionLabel();
@ -1811,6 +1812,13 @@ bool AppFrame::loadSession(std::string fileName) {
if (focusDemod) { if (focusDemod) {
wxGetApp().bindDemodulators(&demodsLoaded); wxGetApp().bindDemodulators(&demodsLoaded);
wxGetApp().getDemodMgr().setActiveDemodulator(focusDemod, false); wxGetApp().getDemodMgr().setActiveDemodulator(focusDemod, false);
long long focusCenterFreq = focusDemod->getFrequency();
//on loading, force center of the main Waterfall / Spectrum on the active demodulator:
waterfallCanvas->setCenterFrequency(focusCenterFreq);
spectrumCanvas->setCenterFrequency(focusCenterFreq);
} }
} }
} catch (DataTypeMismatchException &e) { } catch (DataTypeMismatchException &e) {