comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-23 12:18:37 -05:00
Code Issues Projects Releases Wiki Activity

fix keyboard control code

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-08-16 16:43:19 -04:00
parent 3e2570a26c
commit cd129e0726
1 changed files with 35 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/visual/WaterfallCanvas.cpp
View File

@ -269,8 +269,9 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
DemodulatorInstance *activeDemod = wxGetApp().getDemodMgr().getActiveDemodulator(); DemodulatorInstance *activeDemod = wxGetApp().getDemodMgr().getActiveDemodulator();
long long freq; long long originalFreq = getCenterFrequency();
long long originalFreq; long long freq = originalFreq;
switch (event.GetKeyCode()) { switch (event.GetKeyCode()) {
case 'A': case 'A':
case WXK_UP: case WXK_UP:
@ -284,59 +285,19 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
break; break;
case WXK_RIGHT: case WXK_RIGHT:
case WXK_NUMPAD_RIGHT: case WXK_NUMPAD_RIGHT:
freq = getCenterFrequency();
originalFreq = freq;
if (shiftDown) { if (shiftDown) {
freq += getBandwidth() * 10; freq += getBandwidth() * 10;
if (isView) {
setView(centerFreq + (freq - originalFreq), getBandwidth());
if (spectrumCanvas) {
spectrumCanvas->setView(getCenterFrequency(), getBandwidth());
}
}
} else { } else {
freq += getBandwidth() / 2; freq += getBandwidth() / 2;
if (isView) {
setView(centerFreq + (freq - originalFreq), getBandwidth());
if (spectrumCanvas) {
spectrumCanvas->setView(getCenterFrequency(), getBandwidth());
} }
}
}
wxGetApp().setFrequency(freq);
setStatusText("Set center frequency: %s", freq);
break; break;
case WXK_LEFT: case WXK_LEFT:
case WXK_NUMPAD_LEFT: case WXK_NUMPAD_LEFT:
freq = getCenterFrequency();
originalFreq = freq;
if (shiftDown) { if (shiftDown) {
if ((freq - getBandwidth() * 10) < wxGetApp().getSampleRate() / 2) {
freq = wxGetApp().getSampleRate() / 2;
} else {
freq -= getBandwidth() * 10; freq -= getBandwidth() * 10;
}
if (isView) {
setView(centerFreq + (freq - originalFreq), getBandwidth());
if (spectrumCanvas) {
spectrumCanvas->setView(getCenterFrequency(), getBandwidth());
}
}
} else {
if ((freq - getBandwidth() / 2) < wxGetApp().getSampleRate() / 2) {
freq = wxGetApp().getSampleRate() / 2;
} else { } else {
freq -= getBandwidth() / 2; freq -= getBandwidth() / 2;
} }
if (isView) {
setView(centerFreq + (freq - originalFreq), getBandwidth());
if (spectrumCanvas) {
spectrumCanvas->setView(getCenterFrequency(), getBandwidth());
}
}
}
wxGetApp().setFrequency(freq);
setStatusText("Set center frequency: %s", freq);
break; break;
case 'D': case 'D':
case WXK_DELETE: case WXK_DELETE:
@ -363,6 +324,36 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
event.Skip(); event.Skip();
return; return;
} }
long long minFreq = wxGetApp().getSampleRate()/2;
if (freq < minFreq) {
freq = minFreq;
}
if (freq != originalFreq) {
if (isView) {
setView(freq, getBandwidth());
if (spectrumCanvas) {
spectrumCanvas->setView(freq, getBandwidth());
}
long long minFreq = wxGetApp().getFrequency()-(wxGetApp().getSampleRate()/2);
long long maxFreq = wxGetApp().getFrequency()+(wxGetApp().getSampleRate()/2);
if (freq < minFreq) {
wxGetApp().setFrequency(freq+(wxGetApp().getSampleRate()/2));
setStatusText("Set center frequency: %s", freq);
}
if (freq > maxFreq) {
wxGetApp().setFrequency(freq-(wxGetApp().getSampleRate()/2));
setStatusText("Set center frequency: %s", freq);
}
} else {
wxGetApp().setFrequency(freq);
setStatusText("Set center frequency: %s", freq);
}
}
} }
void WaterfallCanvas::OnIdle(wxIdleEvent &event) { void WaterfallCanvas::OnIdle(wxIdleEvent &event) {
Refresh(); Refresh();