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

Mousewheel fix for non-OSX, AM reset tweak

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-01-07 21:25:35 -05:00
parent 93e88a9208
commit aa13aa2e16
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/demod/DemodulatorThread.cpp
View File

@ -113,9 +113,9 @@ void DemodulatorThread::threadMain() {
audioResampler = inp->audioResampler; audioResampler = inp->audioResampler;
stereoResampler = inp->stereoResampler; stereoResampler = inp->stereoResampler;
ampmodem_reset(demodAM_USB); if (demodAM) {
ampmodem_reset(demodAM_LSB); ampmodem_reset(demodAM);
ampmodem_reset(demodAM_DSB_CSP); }
freqdem_reset(demodFM); freqdem_reset(demodFM);
} }
@ -352,18 +352,23 @@ void DemodulatorThread::threadMain() {
if (newDemodType != DEMOD_TYPE_NULL) { if (newDemodType != DEMOD_TYPE_NULL) {
switch (newDemodType) { switch (newDemodType) {
case DEMOD_TYPE_FM: case DEMOD_TYPE_FM:
freqdem_reset(demodFM);
break; break;
case DEMOD_TYPE_LSB: case DEMOD_TYPE_LSB:
demodAM = demodAM_USB; demodAM = demodAM_USB;
ampmodem_reset(demodAM);
break; break;
case DEMOD_TYPE_USB: case DEMOD_TYPE_USB:
demodAM = demodAM_LSB; demodAM = demodAM_LSB;
ampmodem_reset(demodAM);
break; break;
case DEMOD_TYPE_DSB: case DEMOD_TYPE_DSB:
demodAM = demodAM_DSB; demodAM = demodAM_DSB;
ampmodem_reset(demodAM);
break; break;
case DEMOD_TYPE_AM: case DEMOD_TYPE_AM:
demodAM = demodAM_DSB_CSP; demodAM = demodAM_DSB_CSP;
ampmodem_reset(demodAM);
break; break;
} }
demodulatorType = newDemodType; demodulatorType = newDemodType;

2
src/visual/TuningCanvas.cpp
View File

@ -95,7 +95,6 @@ void TuningCanvas::OnMouseMoved(wxMouseEvent& event) {
void TuningCanvas::OnMouseDown(wxMouseEvent& event) { void TuningCanvas::OnMouseDown(wxMouseEvent& event) {
InteractiveCanvas::OnMouseDown(event); InteractiveCanvas::OnMouseDown(event);
mouseTracker.setHorizDragLock(true);
mouseTracker.setVertDragLock(true); mouseTracker.setVertDragLock(true);
uxDown = 2.0 * (mouseTracker.getMouseX() - 0.5); uxDown = 2.0 * (mouseTracker.getMouseX() - 0.5);
@ -110,7 +109,6 @@ void TuningCanvas::OnMouseWheelMoved(wxMouseEvent& event) {
void TuningCanvas::OnMouseReleased(wxMouseEvent& event) { void TuningCanvas::OnMouseReleased(wxMouseEvent& event) {
InteractiveCanvas::OnMouseReleased(event); InteractiveCanvas::OnMouseReleased(event);
mouseTracker.setHorizDragLock(false);
mouseTracker.setVertDragLock(false); mouseTracker.setVertDragLock(false);
SetCursor (wxCURSOR_SIZEWE); SetCursor (wxCURSOR_SIZEWE);
} }

4
src/visual/WaterfallCanvas.cpp
View File

@ -680,7 +680,11 @@ void WaterfallCanvas::OnMouseWheelMoved(wxMouseEvent& event) {
InteractiveCanvas::OnMouseWheelMoved(event); InteractiveCanvas::OnMouseWheelMoved(event);
float movement = (float)event.GetWheelRotation() / (float)event.GetLinesPerAction(); float movement = (float)event.GetWheelRotation() / (float)event.GetLinesPerAction();
#ifdef __APPLE__
mouseZoom = 1.0f - movement/100.0f; mouseZoom = 1.0f - movement/100.0f;
#else
mouseZoom = 1.0f - movement/1000.0f;
#endif
} }
void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) { void WaterfallCanvas::OnMouseReleased(wxMouseEvent& event) {