mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-23 01:55:48 -05:00
Spectrum frequency zoom: do not combine mousewheel with Alt. Instead zooming active only outside channels center lines. Added documentation. For issue #773
This commit is contained in:
parent
e1b0c6d1e9
commit
7ea71996f0
Binary file not shown.
Before Width: | Height: | Size: 372 KiB After Width: | Height: | Size: 375 KiB |
Binary file not shown.
@ -2272,8 +2272,6 @@ void GLSpectrum::wheelEvent(QWheelEvent *event)
|
|||||||
channelMarkerMove(event, 100);
|
channelMarkerMove(event, 100);
|
||||||
} else if (event->modifiers() & Qt::ControlModifier) {
|
} else if (event->modifiers() & Qt::ControlModifier) {
|
||||||
channelMarkerMove(event, 10);
|
channelMarkerMove(event, 10);
|
||||||
} else if (event->modifiers() & Qt::AltModifier) {
|
|
||||||
frequencyZoom(event);
|
|
||||||
} else {
|
} else {
|
||||||
channelMarkerMove(event, 1);
|
channelMarkerMove(event, 1);
|
||||||
}
|
}
|
||||||
@ -2417,8 +2415,12 @@ void GLSpectrum::channelMarkerMove(QWheelEvent *event, int mul)
|
|||||||
c.setPos(cp_a);
|
c.setPos(cp_a);
|
||||||
setCursor(c);
|
setCursor(c);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
frequencyZoom(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
void GLSpectrum::enterEvent(QEvent* event)
|
void GLSpectrum::enterEvent(QEvent* event)
|
||||||
@ -2640,5 +2642,5 @@ void GLSpectrum::formatTextInfo(QString& info)
|
|||||||
getFrequencyZoom(centerFrequency, frequencySpan);
|
getFrequencyZoom(centerFrequency, frequencySpan);
|
||||||
|
|
||||||
info.append(tr("CF:%1 ").arg(displayScaled(centerFrequency, 'f', getPrecision(centerFrequency/frequencySpan), true)));
|
info.append(tr("CF:%1 ").arg(displayScaled(centerFrequency, 'f', getPrecision(centerFrequency/frequencySpan), true)));
|
||||||
info.append(tr("SP:%1 ").arg(displayScaled(frequencySpan, 'f', getPrecision(frequencySpan/100), true)));
|
info.append(tr("SP:%1 ").arg(displayScaled(frequencySpan, 'f', 3, true)));
|
||||||
}
|
}
|
||||||
|
@ -937,6 +937,16 @@ This shows the spectrum in the passband returned from the sampling device possib
|
|||||||
|
|
||||||
The spectrum display is controlled by the display control (4).
|
The spectrum display is controlled by the display control (4).
|
||||||
|
|
||||||
|
<h4>Status line</h4>
|
||||||
|
|
||||||
|
![Spectrum Statuss](../doc/img/Spectrum_Status.png)
|
||||||
|
|
||||||
|
A status line is displayed at the left of the top margin. It displays the following items from left to right:
|
||||||
|
|
||||||
|
- if frequency zooming is active the zooming factor
|
||||||
|
- `CF:` followed by the Center Frequency of the displayed spectrum possibly with multiplier suffix (G, M, k)
|
||||||
|
- `SP:` followed by the frequency SPan of the displayed spectrum possibly with multiplier suffix (M, k)
|
||||||
|
|
||||||
<h4>Spectrum markers</h4>
|
<h4>Spectrum markers</h4>
|
||||||
|
|
||||||
![Spectrum Markers](../doc/img/Spectrum_Markers.png)
|
![Spectrum Markers](../doc/img/Spectrum_Markers.png)
|
||||||
@ -961,6 +971,18 @@ Use mouse right click anywhere in the view to remove the last entered marker. Us
|
|||||||
|
|
||||||
Any change in the spectrum settings is not reflected in the markers. You have to clear them and make a new measurement if any critical setting of the spectrum is changed.
|
Any change in the spectrum settings is not reflected in the markers. You have to clear them and make a new measurement if any critical setting of the spectrum is changed.
|
||||||
|
|
||||||
|
<h4>Mouse scroll wheel</h4>
|
||||||
|
|
||||||
|
When the mouse is over the center line of a channel:
|
||||||
|
|
||||||
|
- scrolling will move the channel by +/- 10 Hz at each scroll up/down respectively
|
||||||
|
- combined with Ctrl it will move the channel by +/- 100 Hz
|
||||||
|
- combined with Shift it will move the channel by +/- 1 kHz
|
||||||
|
|
||||||
|
When the mouse is not over the center line of a channel it will zoom in/out along X (frequency) axis by a 0.5 step at each scroll up/down respectively between 1x (no zoom) and 10x. Note that in order to zoom on the center line of a channel you may move the mouse pointer in the top margin (center line moving is not active there but zooming is).
|
||||||
|
|
||||||
|
When zooming is active use Alt + left click to move the center frequency to the clicked point.
|
||||||
|
|
||||||
<h3>7. Status</h3>
|
<h3>7. Status</h3>
|
||||||
|
|
||||||
![Main Window status](../doc/img/MainWindow_status.png)
|
![Main Window status](../doc/img/MainWindow_status.png)
|
||||||
|
Loading…
Reference in New Issue
Block a user