VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 01:18:38 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1141 from srcejon/spectrum_marker_gui_tweaks

Browse Source 
Spectrum Marker GUI small tweaks
This commit is contained in:
Edouard Griffiths 2022-02-10 14:06:02 +01:00 committed by GitHub
commit aca440935e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrgui/gui/glspectrumgui.ui
View File

@ -564,7 +564,7 @@
</iconset> </iconset>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>

5
sdrgui/gui/spectrummarkersdialog.cpp
View File

@ -110,6 +110,8 @@ void SpectrumMarkersDialog::displayHistogramMarker()
ui->markerColor->setStyleSheet(tr("QLabel { background-color : rgb(%1,%2,%3); }").arg(r).arg(g).arg(b)); ui->markerColor->setStyleSheet(tr("QLabel { background-color : rgb(%1,%2,%3); }").arg(r).arg(g).arg(b));
ui->showMarker->setChecked(m_histogramMarkers[m_histogramMarkerIndex].m_show); ui->showMarker->setChecked(m_histogramMarkers[m_histogramMarkerIndex].m_show);
} }
ui->fixedPower->setVisible(m_histogramMarkers[m_histogramMarkerIndex].m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypeManual);
ui->fixedPowerUnits->setVisible(m_histogramMarkers[m_histogramMarkerIndex].m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypeManual);
ui->markerFrequency->blockSignals(false); ui->markerFrequency->blockSignals(false);
ui->centerFrequency->blockSignals(false); ui->centerFrequency->blockSignals(false);
@ -380,6 +382,9 @@ void SpectrumMarkersDialog::on_powerMode_currentIndexChanged(int index)
SpectrumHistogramMarker::SpectrumMarkerType newType = (SpectrumHistogramMarker::SpectrumMarkerType) index; SpectrumHistogramMarker::SpectrumMarkerType newType = (SpectrumHistogramMarker::SpectrumMarkerType) index;
ui->fixedPower->setVisible(newType == SpectrumHistogramMarker::SpectrumMarkerTypeManual);
ui->fixedPowerUnits->setVisible(newType == SpectrumHistogramMarker::SpectrumMarkerTypeManual);
if ((m_histogramMarkers[m_histogramMarkerIndex].m_markerType != newType) if ((m_histogramMarkers[m_histogramMarkerIndex].m_markerType != newType)
&& (newType == SpectrumHistogramMarker::SpectrumMarkerTypePowerMax)) && (newType == SpectrumHistogramMarker::SpectrumMarkerTypePowerMax))
{ {

20
sdrgui/gui/spectrummarkersdialog.ui
View File

@ -35,6 +35,9 @@
<attribute name="title"> <attribute name="title">
<string>Hist</string> <string>Hist</string>
</attribute> </attribute>
<attribute name="toolTip">
<string>Histogram (spectrum line) markers</string>
</attribute>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -413,6 +416,11 @@
<height>16777215</height> <height>16777215</height>
</size> </size>
</property> </property>
<property name="toolTip">
<string>Man - Set marker power to fixed level
Cur - Marker will move according to current power at the marker frequency
Max - Marker will move according to the maximum power at the marker frequency</string>
</property>
<item> <item>
<property name="text"> <property name="text">
<string>Man</string> <string>Man</string>
@ -499,6 +507,9 @@
<attribute name="title"> <attribute name="title">
<string>Wat</string> <string>Wat</string>
</attribute> </attribute>
<attribute name="toolTip">
<string>Waterfall markers</string>
</attribute>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -1015,6 +1026,9 @@
<attribute name="title"> <attribute name="title">
<string>Anno</string> <string>Anno</string>
</attribute> </attribute>
<attribute name="toolTip">
<string>Annotation markers</string>
</attribute>
<widget class="QWidget" name="layoutWidget_2"> <widget class="QWidget" name="layoutWidget_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
@ -1712,7 +1726,11 @@
<item> <item>
<widget class="QComboBox" name="showSelect"> <widget class="QComboBox" name="showSelect">
<property name="toolTip"> <property name="toolTip">
<string>Select which set of markers to show</string> <string>Select which set of markers to show
None - Hide all markers
Spec - Show histogram and waterfall markers
Anno - Show annotation markers</string>
</property> </property>
<item> <item>
<property name="text"> <property name="text">