kopia lustrzana https://github.com/f4exb/sdrangel
				
				
				
			AM and NFM Modulators: GUI fixes
							rodzic
							
								
									821b1566e8
								
							
						
					
					
						commit
						55de2d4501
					
				| 
						 | 
				
			
			@ -314,7 +314,7 @@
 | 
			
		|||
         <string>Audio input gain</string>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="maximum">
 | 
			
		||||
         <number>100</number>
 | 
			
		||||
         <number>20</number>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="pageStep">
 | 
			
		||||
         <number>1</number>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,7 @@
 | 
			
		|||
 | 
			
		||||
const PluginDescriptor AMModPlugin::m_pluginDescriptor = {
 | 
			
		||||
    QString("AM Modulator"),
 | 
			
		||||
    QString("2.5.0"),
 | 
			
		||||
    QString("2.5.1"),
 | 
			
		||||
    QString("(c) Edouard Griffiths, F4EXB"),
 | 
			
		||||
    QString("https://github.com/f4exb/sdrangel"),
 | 
			
		||||
    true,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -219,7 +219,7 @@ private:
 | 
			
		|||
        bool getAudioMute() const { return m_audioMute; }
 | 
			
		||||
        bool getPlayLoop() const { return m_playLoop; }
 | 
			
		||||
 | 
			
		||||
        static MsgConfigureNFMMod* create(Real rfBandwidth, Real afBandwidth, float fmDeviation, float toneFrequency, int volumeFactor, bool audioMute, bool playLoop)
 | 
			
		||||
        static MsgConfigureNFMMod* create(Real rfBandwidth, Real afBandwidth, float fmDeviation, float toneFrequency, float volumeFactor, bool audioMute, bool playLoop)
 | 
			
		||||
        {
 | 
			
		||||
            return new MsgConfigureNFMMod(rfBandwidth, afBandwidth, fmDeviation, toneFrequency, volumeFactor, audioMute, playLoop);
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -95,6 +95,7 @@ QByteArray NFMModGUI::serialize() const
 | 
			
		|||
	s.writeU32(5, m_channelMarker.getColor().rgb());
 | 
			
		||||
	s.writeS32(6, ui->toneFrequency->value());
 | 
			
		||||
	s.writeS32(7, ui->volume->value());
 | 
			
		||||
    s.writeBlob(8, ui->cwKeyerGUI->serialize());
 | 
			
		||||
	return s.final();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -135,6 +136,8 @@ bool NFMModGUI::deserialize(const QByteArray& data)
 | 
			
		|||
        ui->toneFrequency->setValue(tmp);
 | 
			
		||||
        d.readS32(7, &tmp, 10);
 | 
			
		||||
        ui->volume->setValue(tmp);
 | 
			
		||||
        d.readBlob(8, &bytetmp);
 | 
			
		||||
        ui->cwKeyerGUI->deserialize(bytetmp);
 | 
			
		||||
 | 
			
		||||
        blockApplySettings(false);
 | 
			
		||||
		m_channelMarker.blockSignals(false);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -354,7 +354,7 @@
 | 
			
		|||
         <string>Audio input gain</string>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="maximum">
 | 
			
		||||
         <number>100</number>
 | 
			
		||||
         <number>20</number>
 | 
			
		||||
        </property>
 | 
			
		||||
        <property name="pageStep">
 | 
			
		||||
         <number>1</number>
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,7 +23,7 @@
 | 
			
		|||
 | 
			
		||||
const PluginDescriptor NFMModPlugin::m_pluginDescriptor = {
 | 
			
		||||
    QString("NFM Modulator"),
 | 
			
		||||
    QString("2.5.0"),
 | 
			
		||||
    QString("2.5.1"),
 | 
			
		||||
    QString("(c) Edouard Griffiths, F4EXB"),
 | 
			
		||||
    QString("https://github.com/f4exb/sdrangel"),
 | 
			
		||||
    true,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue