comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2025-11-03 13:10:27 -05:00
Code Issues Projects Releases Wiki Activity

Waterfall keyboard control updates

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-08-15 04:47:01 -04:00
parent 8d03c9ef0e
commit 3e2570a26c
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/visual/WaterfallCanvas.cpp
View File

@ -252,10 +252,14 @@ void WaterfallCanvas::OnKeyUp(wxKeyEvent& event) {
ctrlDown = event.ControlDown(); ctrlDown = event.ControlDown();
switch (event.GetKeyCode()) { switch (event.GetKeyCode()) {
case 'A': case 'A':
zoom = 1.0; case WXK_UP:
case WXK_NUMPAD_UP:
zoom = 1.0;
break; break;
case 'Z': case 'Z':
zoom = 1.0; case WXK_DOWN:
case WXK_NUMPAD_DOWN:
zoom = 1.0;
break; break;
} }
} }
@ -269,16 +273,21 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
long long originalFreq; long long originalFreq;
switch (event.GetKeyCode()) { switch (event.GetKeyCode()) {
case 'A': case 'A':
zoom = 0.95; case WXK_UP:
case WXK_NUMPAD_UP:
zoom = 0.95;
break; break;
case 'Z': case 'Z':
zoom = 1.05; case WXK_DOWN:
case WXK_NUMPAD_DOWN:
zoom = 1.05;
break; break;
case WXK_RIGHT: case WXK_RIGHT:
freq = wxGetApp().getFrequency(); case WXK_NUMPAD_RIGHT:
freq = getCenterFrequency();
originalFreq = freq; originalFreq = freq;
if (shiftDown) { if (shiftDown) {
freq += wxGetApp().getSampleRate() * 10; freq += getBandwidth() * 10;
if (isView) { if (isView) {
setView(centerFreq + (freq - originalFreq), getBandwidth()); setView(centerFreq + (freq - originalFreq), getBandwidth());
if (spectrumCanvas) { if (spectrumCanvas) {
@ -286,7 +295,7 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
} }
} }
} else { } else {
freq += wxGetApp().getSampleRate() / 2; freq += getBandwidth() / 2;
if (isView) { if (isView) {
setView(centerFreq + (freq - originalFreq), getBandwidth()); setView(centerFreq + (freq - originalFreq), getBandwidth());
if (spectrumCanvas) { if (spectrumCanvas) {
@ -298,13 +307,14 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
setStatusText("Set center frequency: %s", freq); setStatusText("Set center frequency: %s", freq);
break; break;
case WXK_LEFT: case WXK_LEFT:
freq = wxGetApp().getFrequency(); case WXK_NUMPAD_LEFT:
freq = getCenterFrequency();
originalFreq = freq; originalFreq = freq;
if (shiftDown) { if (shiftDown) {
if ((freq - wxGetApp().getSampleRate() * 10) < wxGetApp().getSampleRate() / 2) { if ((freq - getBandwidth() * 10) < wxGetApp().getSampleRate() / 2) {
freq = wxGetApp().getSampleRate() / 2; freq = wxGetApp().getSampleRate() / 2;
} else { } else {
freq -= wxGetApp().getSampleRate() * 10; freq -= getBandwidth() * 10;
} }
if (isView) { if (isView) {
setView(centerFreq + (freq - originalFreq), getBandwidth()); setView(centerFreq + (freq - originalFreq), getBandwidth());
@ -313,10 +323,10 @@ void WaterfallCanvas::OnKeyDown(wxKeyEvent& event) {
} }
} }
} else { } else {
if ((freq - wxGetApp().getSampleRate() / 2) < wxGetApp().getSampleRate() / 2) { if ((freq - getBandwidth() / 2) < wxGetApp().getSampleRate() / 2) {
freq = wxGetApp().getSampleRate() / 2; freq = wxGetApp().getSampleRate() / 2;
} else { } else {
freq -= wxGetApp().getSampleRate() / 2; freq -= getBandwidth() / 2;
} }
if (isView) { if (isView) {
setView(centerFreq + (freq - originalFreq), getBandwidth()); setView(centerFreq + (freq - originalFreq), getBandwidth());