comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-11-26 13:48:38 -05:00
Code Issues Projects Releases Wiki Activity

Fix waterfall canvas to interact with active demod

Browse Source
This commit is contained in:
Charles J. Cliffe 2014-12-06 21:10:29 -05:00
parent 119f7c71af
commit a3bda830a8
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/visual/WaterfallCanvas.cpp
View File

@ -205,9 +205,12 @@ void WaterfallCanvas::OnIdle(wxIdleEvent &event) {
void WaterfallCanvas::mouseMoved(wxMouseEvent& event) {
mTracker.OnMouseMoved(event);
DemodulatorInstance *demod = wxGetApp().getDemodTest();
DemodulatorInstance *demod = activeDemodulator;
if (mTracker.mouseDown()) {
if (demod == NULL) {
return;
}
if (dragState == WF_DRAG_BANDWIDTH_LEFT || dragState == WF_DRAG_BANDWIDTH_RIGHT) {
int bwDiff = (int) (mTracker.getDeltaMouseX() * (float)SRATE) * 2;
@ -318,11 +321,15 @@ void WaterfallCanvas::mouseReleased(wxMouseEvent& event) {
if (mTracker.getOriginDeltaMouseX() == 0 && mTracker.getOriginDeltaMouseY() == 0 && dragState == WF_DRAG_NONE) {
if (activeDemodulator == NULL) {
return;
}
float pos = mTracker.getMouseX();
int center_freq = wxGetApp().getFrequency();
DemodulatorInstance *demod = wxGetApp().getDemodTest();
DemodulatorInstance *demod = activeDemodulator;
int freq = center_freq - (int) (0.5 * (float) SRATE) + (int) ((float) pos * (float) SRATE);