diff --git a/doc/img/MainWindow_spectrum_gui.png b/doc/img/MainWindow_spectrum_gui.png index 85390ab81..682c7ec0b 100644 Binary files a/doc/img/MainWindow_spectrum_gui.png and b/doc/img/MainWindow_spectrum_gui.png differ diff --git a/doc/img/MainWindow_spectrum_gui.xcf b/doc/img/MainWindow_spectrum_gui.xcf index 98f58ff23..604b476f3 100644 Binary files a/doc/img/MainWindow_spectrum_gui.xcf and b/doc/img/MainWindow_spectrum_gui.xcf differ diff --git a/doc/img/MainWindow_spectrum_gui_B.png b/doc/img/MainWindow_spectrum_gui_B.png index 218b927a5..996ca59a7 100644 Binary files a/doc/img/MainWindow_spectrum_gui_B.png and b/doc/img/MainWindow_spectrum_gui_B.png differ diff --git a/doc/img/MainWindow_spectrum_gui_B.xcf b/doc/img/MainWindow_spectrum_gui_B.xcf index 5c11e0c22..b0f1e6c84 100644 Binary files a/doc/img/MainWindow_spectrum_gui_B.xcf and b/doc/img/MainWindow_spectrum_gui_B.xcf differ diff --git a/doc/img/Spectrum_Markers_dialog.png b/doc/img/Spectrum_Markers_dialog.png new file mode 100644 index 000000000..8206bf399 Binary files /dev/null and b/doc/img/Spectrum_Markers_dialog.png differ diff --git a/doc/img/Spectrum_Markers_dialog.xcf b/doc/img/Spectrum_Markers_dialog.xcf new file mode 100644 index 000000000..bbd39f3ed Binary files /dev/null and b/doc/img/Spectrum_Markers_dialog.xcf differ diff --git a/doc/img/Spectrum_Markers_dialog_hist.png b/doc/img/Spectrum_Markers_dialog_hist.png new file mode 100644 index 000000000..bfc2ef8fa Binary files /dev/null and b/doc/img/Spectrum_Markers_dialog_hist.png differ diff --git a/doc/img/Spectrum_Markers_dialog_hist.xcf b/doc/img/Spectrum_Markers_dialog_hist.xcf new file mode 100644 index 000000000..6794faf3d Binary files /dev/null and b/doc/img/Spectrum_Markers_dialog_hist.xcf differ diff --git a/doc/img/Spectrum_Markers_dialog_wat.png b/doc/img/Spectrum_Markers_dialog_wat.png new file mode 100644 index 000000000..fb07641a6 Binary files /dev/null and b/doc/img/Spectrum_Markers_dialog_wat.png differ diff --git a/doc/img/Spectrum_Markers_dialog_wat.xcf b/doc/img/Spectrum_Markers_dialog_wat.xcf new file mode 100644 index 000000000..b08c77ed9 Binary files /dev/null and b/doc/img/Spectrum_Markers_dialog_wat.xcf differ diff --git a/sdrgui/readme.md b/sdrgui/readme.md index 1d8f2a790..02523a4e2 100644 --- a/sdrgui/readme.md +++ b/sdrgui/readme.md @@ -487,6 +487,10 @@ The server only sends data. Control including FFT details is done via the REST A +

3B.7. Spectrum markers dialog

+ +Opens the [spectrum markers dialog](spectrummarkers.md) +

3C. Spectrum display control line 3

![Spectrum GUI C](../doc/img/MainWindow_spectrum_gui_C.png) @@ -951,6 +955,10 @@ A status line is displayed at the left of the top margin. It displays the follow ![Spectrum Markers](../doc/img/Spectrum_Markers.png) +Note that spectrum markers appear only when spectrum display is active (shoes data) + +The spectrum markers can be set either with the mouse as explained next or with the [spectrum markers dialog](spectrummarkers.md) that can be opened with the markers button (3B.7). + Use Shift and mouse left click to set a new marker. There is a maximum of two markers with a different status: - The first marker will display frequency (2) and power (1) or time (5) on the scale side of the view. Frequency units are the same as displayed in the frequency scale. - The second marker will display frequency difference (3 or 6) and power difference (4) or time difference (7) from the first marker on the opposite side of the scales. Difference values may be suffixed with a multiplier character. @@ -969,8 +977,6 @@ Values may be suffixed by a multiplier character: Use mouse right click anywhere in the view to remove the last entered marker. Use shift and mouse right click to remove all markers. -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. -

Mouse scroll wheel

![Spectrum Mousewheel](../doc/img/MainWindow_spectrum_mousewheel.png) diff --git a/sdrgui/spectrummarkers.md b/sdrgui/spectrummarkers.md new file mode 100644 index 000000000..5e81659cc --- /dev/null +++ b/sdrgui/spectrummarkers.md @@ -0,0 +1,111 @@ +

Spectrum markers management

+ +The spectrum markers are controlled with this dialog. Note that spectrum markers will effectively show on the spectrum display only when it is active (shows some data). + +

General interface

+ +![Spectrum Markers dialog](../doc/img/Spectrum_Markers_dialog.png) + +

1. Sub-dialog selection

+ +The complete dialog is split into tabs: + + - **Hist** for histogram (spectrum line) markers + - **Wat** for waterfall markers + +

2. Markers set selection

+ +This lets you selects which markers are displayed + + - **None**: no markers are displayed + - **Spec**: spectrum markers are displayed + +

Histogram markers tab

+ +![Spectrum Markers histogram dialog](../doc/img/Spectrum_Markers_dialog_hist.png) + +

1. Marker frequency

+ +Use this frequency dial to set the marker frequency in Hz + +

2. Center marker frequency

+ +Push this button to move the marker at the center of the spectrum + +

3. Marker color

+ +The marker color is displayed here. You can click on the square to open a standard color selection dialog to select the marker color. Note that it selects the color of the text display of the marker the crosshairs remain in white color. + +

4. Marker show

+ +Toggles marker display on the spectrum + +

5. Marker selection

+ +Turn the dial button to select the marker being set up. The index of the marker appears at left. + +

6. Swap marker with reference marker (index 0)

+ +Push this button to swap the current marker with marker at index 0. The marker at index 0 is the reference marker. Note that the colors are not swapped so that the marker color is associated to its index and not the marker itself. + +

7. Add/Remove marker

+ + - Press the "+" button to add a new marker with a maximum of 4 markers. + - Press the "-" button to remove the current marker. When reference marker (index 0) is removed the marker at index 1 if it exists replaces it and thus is made the reference marker. + +

8. Power hold reset

+ +When the power max hold is selected (9) this button resets the max hold + +

9. Marker type

+ +This combo lets you select the type of marker: + + - **Man**: manual power set. The value is set with the next control (10) + - **Cur**: current power. The marker will move according to the current power at the marker frequency + - **Max**: max hold. The marker will move according to the maximum power at the marker frequency. Use button (8) to reset. + +

10. Manual (fixed) power

+ +Use this slider to adjust the power position of the marker. The units are in dB irrespective of the linear or log set of the spectrum display. + +

Waterfall markers tab

+ +![Spectrum Markers waterfall dialog](../doc/img/Spectrum_Markers_dialog_wat.png) + +

1. Marker frequency

+ +Use this frequency dial to set the marker frequency in Hz + +

2. Center marker frequency

+ +Push this button to move the marker at the center of the spectrum + +

3. Marker color

+ +The marker color is displayed here. You can click on the square to open a standard color selection dialog to select the marker color. Note that it selects the color of the text display of the marker the crosshairs remain in white color. + +

4. Marker show

+ +Toggles marker display on the spectrum + +

5. Marker selection

+ +Turn the dial button to select the marker being set up. The index of the marker appears at left. + +

6. Swap marker with reference marker (index 0)

+ +Push this button to swap the current marker with marker at index 0. The marker at index 0 is the reference marker. Note that the colors are not swapped so that the marker color is associated to its index and not the marker itself. + +

7. Add/Remove marker

+ + - Press the "+" button to add a new marker with a maximum of 4 markers. + - Press the "-" button to remove the current marker. When reference marker (index 0) is removed the marker at index 1 if it exists replaces it and thus is made the reference marker. + +

8. Time mantissa

+ +The time mark of the marker is given in seconds by mantissa M and exponent E so that t(s) = M × 10E. This part controls the mantissa component M that appears on the left. The slider lets you control the decimal part from .000 to .999 and the dial button the integer part from 0 to 9. + +

9. Time exponent

+ +This slider lets you control the exponent part E of the time mark so that t(s) = M × 10E. The value in exponential notation appears on the left.