fix locked view on zoomed view after demodulators are deactivated

This commit is contained in:
Charles J. Cliffe 2015-03-28 03:51:22 -04:00
parent 2e34060901
commit d95925a3c4
3 changed files with 9 additions and 1 deletions

View File

@ -517,7 +517,9 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
}
if (wxGetApp().getFrequency() != waterfallCanvas->getCenterFrequency()) {
spectrumCanvas->setCenterFrequency(wxGetApp().getFrequency());
if (!spectrumCanvas->getMouseTracker()->mouseDown()) {
spectrumCanvas->setCenterFrequency(wxGetApp().getFrequency());
}
waterfallCanvas->setCenterFrequency(wxGetApp().getFrequency());
demodWaterfallCanvas->setCenterFrequency(wxGetApp().getFrequency());
demodSpectrumCanvas->setCenterFrequency(wxGetApp().getFrequency());

View File

@ -73,6 +73,10 @@ unsigned int InteractiveCanvas::getBandwidth() {
}
}
MouseTracker *InteractiveCanvas::getMouseTracker() {
return &mouseTracker;
}
void InteractiveCanvas::OnKeyUp(wxKeyEvent& event) {
shiftDown = event.ShiftDown();
altDown = event.AltDown();

View File

@ -22,6 +22,8 @@ public:
void setBandwidth(unsigned int bandwidth_in);
unsigned int getBandwidth();
MouseTracker *getMouseTracker();
protected:
void OnKeyDown(wxKeyEvent& event);
void OnKeyUp(wxKeyEvent& event);