diff --git a/doc/img/Spectrum_Markers.png b/doc/img/Spectrum_Markers.png index 91fa1af55..568cffa1b 100644 Binary files a/doc/img/Spectrum_Markers.png and b/doc/img/Spectrum_Markers.png differ diff --git a/doc/img/Spectrum_Markers.xcf b/doc/img/Spectrum_Markers.xcf index a2ce9f48b..d8ecbe758 100644 Binary files a/doc/img/Spectrum_Markers.xcf and b/doc/img/Spectrum_Markers.xcf differ diff --git a/sdrgui/gui/glspectrum.cpp b/sdrgui/gui/glspectrum.cpp index 18fa682b8..b14fa650c 100644 --- a/sdrgui/gui/glspectrum.cpp +++ b/sdrgui/gui/glspectrum.cpp @@ -2272,8 +2272,6 @@ void GLSpectrum::wheelEvent(QWheelEvent *event) channelMarkerMove(event, 100); } else if (event->modifiers() & Qt::ControlModifier) { channelMarkerMove(event, 10); - } else if (event->modifiers() & Qt::AltModifier) { - frequencyZoom(event); } else { channelMarkerMove(event, 1); } @@ -2417,8 +2415,12 @@ void GLSpectrum::channelMarkerMove(QWheelEvent *event, int mul) c.setPos(cp_a); setCursor(c); } + + return; } } + + frequencyZoom(event); } void GLSpectrum::enterEvent(QEvent* event) @@ -2640,5 +2642,5 @@ void GLSpectrum::formatTextInfo(QString& info) getFrequencyZoom(centerFrequency, frequencySpan); 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))); } diff --git a/sdrgui/readme.md b/sdrgui/readme.md index 424955b5e..6a2aa8249 100644 --- a/sdrgui/readme.md +++ b/sdrgui/readme.md @@ -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). +