Merge pull request #1142 from srcejon/fix_1136

DATV Demod increase RF bandwidth to 50MHz

plugins/channelrx/demoddatv/datvdemodgui.cpp

@@ -248,7 +248,7 @@ DATVDemodGUI::DATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Ba
     ui->deltaFrequency->setValueRange(false, 8, -99999999, 99999999);
 
     ui->rfBandwidth->setColorMapper(ColorMapper(ColorMapper::GrayYellow));
-    ui->rfBandwidth->setValueRange(true, 7, 0, 9999999);
+    ui->rfBandwidth->setValueRange(true, 8, 0, 50000000);
 
     m_objChannelMarker.blockSignals(true);
     m_objChannelMarker.setColor(Qt::magenta);

plugins/channeltx/moddatv/datvmodgui.ui

@@ -24,6 +24,7 @@
   </property>
   <property name="font">
    <font>
+    <family>Liberation Sans</family>
     <pointsize>9</pointsize>
    </font>
   </property>
@@ -97,6 +98,7 @@
           </property>
           <property name="font">
            <font>
+            <family>Liberation Mono</family>
             <pointsize>12</pointsize>
            </font>
           </property>

sdrgui/gui/glspectrumgui.ui

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

sdrgui/gui/spectrummarkersdialog.cpp

@@ -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->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->centerFrequency->blockSignals(false);
@@ -380,6 +382,9 @@ void SpectrumMarkersDialog::on_powerMode_currentIndexChanged(int 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)
        && (newType == SpectrumHistogramMarker::SpectrumMarkerTypePowerMax))
     {

sdrgui/gui/spectrummarkersdialog.ui

@@ -35,6 +35,9 @@
       <attribute name="title">
        <string>Hist</string>
       </attribute>
+      <attribute name="toolTip">
+       <string>Histogram (spectrum line) markers</string>
+      </attribute>
       <widget class="QWidget" name="layoutWidget">
        <property name="geometry">
         <rect>
@@ -413,6 +416,11 @@
               <height>16777215</height>
              </size>
             </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>
              <property name="text">
               <string>Man</string>
@@ -499,6 +507,9 @@
       <attribute name="title">
        <string>Wat</string>
       </attribute>
+      <attribute name="toolTip">
+       <string>Waterfall markers</string>
+      </attribute>
       <widget class="QWidget" name="layoutWidget">
        <property name="geometry">
         <rect>
@@ -1015,6 +1026,9 @@
       <attribute name="title">
        <string>Anno</string>
       </attribute>
+      <attribute name="toolTip">
+       <string>Annotation markers</string>
+      </attribute>
       <widget class="QWidget" name="layoutWidget_2">
        <property name="geometry">
         <rect>
@@ -1712,7 +1726,11 @@
      <item>
       <widget class="QComboBox" name="showSelect">
        <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>
        <item>
         <property name="text">