mirror of
				https://github.com/f4exb/sdrangel.git
				synced 2025-11-03 13:11:20 -05:00 
			
		
		
		
	NFM demod: GUI: use buttons for volume and squelch to reduce screen space
This commit is contained in:
		
							parent
							
								
									1263eaeb1a
								
							
						
					
					
						commit
						0c4d4ee385
					
				@ -17,6 +17,7 @@
 | 
				
			|||||||
const int NFMDemodGUI::m_rfBW[] = {
 | 
					const int NFMDemodGUI::m_rfBW[] = {
 | 
				
			||||||
	5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000
 | 
						5000, 6250, 8330, 10000, 12500, 15000, 20000, 25000, 40000
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					const int NFMDemodGUI::m_nbRfBW = 9;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
NFMDemodGUI* NFMDemodGUI::create(PluginAPI* pluginAPI)
 | 
					NFMDemodGUI* NFMDemodGUI::create(PluginAPI* pluginAPI)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
				
			|||||||
@ -68,6 +68,7 @@ private:
 | 
				
			|||||||
	MovingAverage<Real> m_channelPowerDbAvg;
 | 
						MovingAverage<Real> m_channelPowerDbAvg;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	static const int m_rfBW[];
 | 
						static const int m_rfBW[];
 | 
				
			||||||
 | 
						static const int m_nbRfBW;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	explicit NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
 | 
						explicit NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
 | 
				
			||||||
	virtual ~NFMDemodGUI();
 | 
						virtual ~NFMDemodGUI();
 | 
				
			||||||
 | 
				
			|||||||
@ -6,8 +6,8 @@
 | 
				
			|||||||
   <rect>
 | 
					   <rect>
 | 
				
			||||||
    <x>0</x>
 | 
					    <x>0</x>
 | 
				
			||||||
    <y>0</y>
 | 
					    <y>0</y>
 | 
				
			||||||
    <width>295</width>
 | 
					    <width>287</width>
 | 
				
			||||||
    <height>189</height>
 | 
					    <height>156</height>
 | 
				
			||||||
   </rect>
 | 
					   </rect>
 | 
				
			||||||
  </property>
 | 
					  </property>
 | 
				
			||||||
  <property name="font">
 | 
					  <property name="font">
 | 
				
			||||||
@ -24,8 +24,8 @@
 | 
				
			|||||||
    <rect>
 | 
					    <rect>
 | 
				
			||||||
     <x>0</x>
 | 
					     <x>0</x>
 | 
				
			||||||
     <y>0</y>
 | 
					     <y>0</y>
 | 
				
			||||||
     <width>281</width>
 | 
					     <width>271</width>
 | 
				
			||||||
     <height>181</height>
 | 
					     <height>141</height>
 | 
				
			||||||
    </rect>
 | 
					    </rect>
 | 
				
			||||||
   </property>
 | 
					   </property>
 | 
				
			||||||
   <property name="windowTitle">
 | 
					   <property name="windowTitle">
 | 
				
			||||||
@ -254,7 +254,7 @@
 | 
				
			|||||||
     </layout>
 | 
					     </layout>
 | 
				
			||||||
    </item>
 | 
					    </item>
 | 
				
			||||||
    <item>
 | 
					    <item>
 | 
				
			||||||
     <layout class="QHBoxLayout" name="volumeLayout">
 | 
					     <layout class="QHBoxLayout" name="squelchLayout">
 | 
				
			||||||
      <item>
 | 
					      <item>
 | 
				
			||||||
       <widget class="QLabel" name="volumeLabel">
 | 
					       <widget class="QLabel" name="volumeLabel">
 | 
				
			||||||
        <property name="text">
 | 
					        <property name="text">
 | 
				
			||||||
@ -263,9 +263,12 @@
 | 
				
			|||||||
       </widget>
 | 
					       </widget>
 | 
				
			||||||
      </item>
 | 
					      </item>
 | 
				
			||||||
      <item>
 | 
					      <item>
 | 
				
			||||||
       <widget class="QSlider" name="volume">
 | 
					       <widget class="QDial" name="volume">
 | 
				
			||||||
        <property name="toolTip">
 | 
					        <property name="maximumSize">
 | 
				
			||||||
         <string>Volume</string>
 | 
					         <size>
 | 
				
			||||||
 | 
					          <width>24</width>
 | 
				
			||||||
 | 
					          <height>24</height>
 | 
				
			||||||
 | 
					         </size>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
        <property name="maximum">
 | 
					        <property name="maximum">
 | 
				
			||||||
         <number>100</number>
 | 
					         <number>100</number>
 | 
				
			||||||
@ -276,19 +279,22 @@
 | 
				
			|||||||
        <property name="value">
 | 
					        <property name="value">
 | 
				
			||||||
         <number>20</number>
 | 
					         <number>20</number>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
        <property name="orientation">
 | 
					 | 
				
			||||||
         <enum>Qt::Horizontal</enum>
 | 
					 | 
				
			||||||
        </property>
 | 
					 | 
				
			||||||
       </widget>
 | 
					       </widget>
 | 
				
			||||||
      </item>
 | 
					      </item>
 | 
				
			||||||
      <item>
 | 
					      <item>
 | 
				
			||||||
       <widget class="QLabel" name="volumeText">
 | 
					       <widget class="QLabel" name="volumeText">
 | 
				
			||||||
        <property name="minimumSize">
 | 
					        <property name="minimumSize">
 | 
				
			||||||
         <size>
 | 
					         <size>
 | 
				
			||||||
          <width>50</width>
 | 
					          <width>0</width>
 | 
				
			||||||
          <height>0</height>
 | 
					          <height>0</height>
 | 
				
			||||||
         </size>
 | 
					         </size>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
 | 
					        <property name="maximumSize">
 | 
				
			||||||
 | 
					         <size>
 | 
				
			||||||
 | 
					          <width>30</width>
 | 
				
			||||||
 | 
					          <height>16777215</height>
 | 
				
			||||||
 | 
					         </size>
 | 
				
			||||||
 | 
					        </property>
 | 
				
			||||||
        <property name="text">
 | 
					        <property name="text">
 | 
				
			||||||
         <string>2.0</string>
 | 
					         <string>2.0</string>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
@ -297,10 +303,19 @@
 | 
				
			|||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
       </widget>
 | 
					       </widget>
 | 
				
			||||||
      </item>
 | 
					      </item>
 | 
				
			||||||
     </layout>
 | 
					 | 
				
			||||||
    </item>
 | 
					 | 
				
			||||||
      <item>
 | 
					      <item>
 | 
				
			||||||
     <layout class="QHBoxLayout" name="squelchLayout">
 | 
					       <spacer name="horizontalSpacer_2">
 | 
				
			||||||
 | 
					        <property name="orientation">
 | 
				
			||||||
 | 
					         <enum>Qt::Horizontal</enum>
 | 
				
			||||||
 | 
					        </property>
 | 
				
			||||||
 | 
					        <property name="sizeHint" stdset="0">
 | 
				
			||||||
 | 
					         <size>
 | 
				
			||||||
 | 
					          <width>40</width>
 | 
				
			||||||
 | 
					          <height>20</height>
 | 
				
			||||||
 | 
					         </size>
 | 
				
			||||||
 | 
					        </property>
 | 
				
			||||||
 | 
					       </spacer>
 | 
				
			||||||
 | 
					      </item>
 | 
				
			||||||
      <item>
 | 
					      <item>
 | 
				
			||||||
       <widget class="QLabel" name="squelchLabel">
 | 
					       <widget class="QLabel" name="squelchLabel">
 | 
				
			||||||
        <property name="text">
 | 
					        <property name="text">
 | 
				
			||||||
@ -309,9 +324,12 @@
 | 
				
			|||||||
       </widget>
 | 
					       </widget>
 | 
				
			||||||
      </item>
 | 
					      </item>
 | 
				
			||||||
      <item>
 | 
					      <item>
 | 
				
			||||||
       <widget class="QSlider" name="squelch">
 | 
					       <widget class="QDial" name="squelch">
 | 
				
			||||||
        <property name="toolTip">
 | 
					        <property name="maximumSize">
 | 
				
			||||||
         <string>Squelch threshold (dB)</string>
 | 
					         <size>
 | 
				
			||||||
 | 
					          <width>24</width>
 | 
				
			||||||
 | 
					          <height>24</height>
 | 
				
			||||||
 | 
					         </size>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
        <property name="minimum">
 | 
					        <property name="minimum">
 | 
				
			||||||
         <number>-1000</number>
 | 
					         <number>-1000</number>
 | 
				
			||||||
@ -319,25 +337,31 @@
 | 
				
			|||||||
        <property name="maximum">
 | 
					        <property name="maximum">
 | 
				
			||||||
         <number>0</number>
 | 
					         <number>0</number>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
 | 
					        <property name="singleStep">
 | 
				
			||||||
 | 
					         <number>1</number>
 | 
				
			||||||
 | 
					        </property>
 | 
				
			||||||
        <property name="pageStep">
 | 
					        <property name="pageStep">
 | 
				
			||||||
         <number>1</number>
 | 
					         <number>1</number>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
        <property name="value">
 | 
					        <property name="value">
 | 
				
			||||||
         <number>-150</number>
 | 
					         <number>-150</number>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
        <property name="orientation">
 | 
					 | 
				
			||||||
         <enum>Qt::Horizontal</enum>
 | 
					 | 
				
			||||||
        </property>
 | 
					 | 
				
			||||||
       </widget>
 | 
					       </widget>
 | 
				
			||||||
      </item>
 | 
					      </item>
 | 
				
			||||||
      <item>
 | 
					      <item>
 | 
				
			||||||
       <widget class="QLabel" name="squelchText">
 | 
					       <widget class="QLabel" name="squelchText">
 | 
				
			||||||
        <property name="minimumSize">
 | 
					        <property name="minimumSize">
 | 
				
			||||||
         <size>
 | 
					         <size>
 | 
				
			||||||
          <width>50</width>
 | 
					          <width>0</width>
 | 
				
			||||||
          <height>0</height>
 | 
					          <height>0</height>
 | 
				
			||||||
         </size>
 | 
					         </size>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
 | 
					        <property name="maximumSize">
 | 
				
			||||||
 | 
					         <size>
 | 
				
			||||||
 | 
					          <width>40</width>
 | 
				
			||||||
 | 
					          <height>16777215</height>
 | 
				
			||||||
 | 
					         </size>
 | 
				
			||||||
 | 
					        </property>
 | 
				
			||||||
        <property name="toolTip">
 | 
					        <property name="toolTip">
 | 
				
			||||||
         <string>Squelch threshold (dB)</string>
 | 
					         <string>Squelch threshold (dB)</string>
 | 
				
			||||||
        </property>
 | 
					        </property>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user