comicsansg/CubicSDR
comicsansg/CubicSDR
1
0
Fork 0
mirror of https://github.com/cjcliffe/CubicSDR.git synced 2024-09-27 15:56:48 -04:00
Code Issues Projects Releases Wiki Activity

Waterfall demod manipulation/feedback tweaks

Browse Source
This commit is contained in:
Charles J. Cliffe 2015-05-11 20:55:54 -04:00
parent 7923235253
commit d3f1d5236c
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/visual/WaterfallCanvas.cpp
View File

@ -682,19 +682,20 @@ void WaterfallCanvas::OnMouseMoved(wxMouseEvent& event) {
long long currentBw = getBandwidth(); long long currentBw = getBandwidth();
long long globalBw = wxGetApp().getSampleRate(); long long globalBw = wxGetApp().getSampleRate();
long dist = abs(freqDiff); long dist = abs(freqDiff);
double bufferBw = 10000.0 * ((double)currentBw / (double)globalBw);
double maxDist = ((double)halfBw + (double)halfBw * 0.05 * ((double)currentBw / (double)globalBw)); double maxDist = ((double)halfBw + bufferBw);
if ((double)dist <= maxDist) { if ((double)dist <= maxDist) {
if ((freqDiff > 0 && demod->getDemodulatorType() == DEMOD_TYPE_USB) ||
(freqDiff < 0 && demod->getDemodulatorType() == DEMOD_TYPE_LSB)) {
continue;
}
if (dist < near_dist) { if (dist < near_dist) {
activeDemodulator = demod; activeDemodulator = demod;
near_dist = dist; near_dist = dist;
} }
if ((freqDiff > 0 && demod->getDemodulatorType() == DEMOD_TYPE_USB) ||
(freqDiff < 0 && demod->getDemodulatorType() == DEMOD_TYPE_LSB)) {
continue;
}
long edge_dist = abs(halfBw - dist); long edge_dist = abs(halfBw - dist);
if (edge_dist < near_dist) { if (edge_dist < near_dist) {
activeDemodulator = demod; activeDemodulator = demod;
@ -705,6 +706,7 @@ void WaterfallCanvas::OnMouseMoved(wxMouseEvent& event) {
if (activeDemodulator == NULL) { if (activeDemodulator == NULL) {
nextDragState = WF_DRAG_NONE; nextDragState = WF_DRAG_NONE;
SetCursor(wxCURSOR_CROSS);
return; return;
} }
@ -713,15 +715,16 @@ void WaterfallCanvas::OnMouseMoved(wxMouseEvent& event) {
long long freqDiff = activeDemodulator->getFrequency() - freqPos; long long freqDiff = activeDemodulator->getFrequency() - freqPos;
if (abs(freqDiff) > (activeDemodulator->getBandwidth() / 3)) { if (abs(freqDiff) > (activeDemodulator->getBandwidth() / 3)) {
SetCursor(wxCURSOR_SIZEWE);
if (freqDiff > 0) { if (freqDiff > 0) {
if (activeDemodulator->getDemodulatorType() != DEMOD_TYPE_USB) { if (activeDemodulator->getDemodulatorType() != DEMOD_TYPE_USB) {
nextDragState = WF_DRAG_BANDWIDTH_LEFT; nextDragState = WF_DRAG_BANDWIDTH_LEFT;
SetCursor(wxCURSOR_SIZEWE);
} }
} else { } else {
if (activeDemodulator->getDemodulatorType() != DEMOD_TYPE_LSB) { if (activeDemodulator->getDemodulatorType() != DEMOD_TYPE_LSB) {
nextDragState = WF_DRAG_BANDWIDTH_RIGHT; nextDragState = WF_DRAG_BANDWIDTH_RIGHT;
SetCursor(wxCURSOR_SIZEWE);
} }
} }