mirror of
				https://github.com/f4exb/sdrangel.git
				synced 2025-11-04 05:30:32 -05:00 
			
		
		
		
	SSB modulator: use settings in GUI (2)
This commit is contained in:
		
							parent
							
								
									cf78f9199c
								
							
						
					
					
						commit
						f3513f9d9a
					
				@ -230,6 +230,10 @@ bool SSBModGUI::handleMessage(const Message& message)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
void SSBModGUI::channelMarkerChanged()
 | 
					void SSBModGUI::channelMarkerChanged()
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 | 
					    m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
 | 
				
			||||||
 | 
					    m_settings.m_udpAddress = m_channelMarker.getUDPAddress();
 | 
				
			||||||
 | 
					    m_settings.m_udpPort = m_channelMarker.getUDPReceivePort();
 | 
				
			||||||
 | 
					    displaySettings();
 | 
				
			||||||
	applySettings();
 | 
						applySettings();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -711,23 +715,41 @@ void SSBModGUI::applySettings()
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
 | 
							ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		m_ssbMod->configure(m_ssbMod->getInputMessageQueue(),
 | 
					        m_ssbMod->configure(m_ssbMod->getInputMessageQueue(),
 | 
				
			||||||
			ui->BW->value() * 100.0f,
 | 
					            m_settings.m_bandwidth,
 | 
				
			||||||
			ui->lowCut->value() * 100.0f,
 | 
					            m_settings.m_lowCutoff,
 | 
				
			||||||
			ui->toneFrequency->value() * 10.0f,
 | 
					            m_settings.m_toneFrequency,
 | 
				
			||||||
            ui->volume->value() / 10.0f,
 | 
					            m_settings.m_volumeFactor,
 | 
				
			||||||
			m_spanLog2,
 | 
					            m_spanLog2,
 | 
				
			||||||
			ui->audioBinaural->isChecked(),
 | 
					            m_settings.m_audioBinaural,
 | 
				
			||||||
			ui->audioFlipChannels->isChecked(),
 | 
					            m_settings.m_audioFlipChannels,
 | 
				
			||||||
			ui->dsb->isChecked(),
 | 
					            m_settings.m_dsb,
 | 
				
			||||||
			ui->audioMute->isChecked(),
 | 
					            m_settings.m_audioMute,
 | 
				
			||||||
			ui->playLoop->isChecked(),
 | 
					            m_settings.m_playLoop,
 | 
				
			||||||
			ui->agc->isChecked(),
 | 
					            m_settings.m_agc,
 | 
				
			||||||
			ui->agcOrder->value() / 100.0,
 | 
					            m_settings.m_agcOrder,
 | 
				
			||||||
			m_agcTimeConstant[ui->agcTime->value()],
 | 
					            m_agcTimeConstant[ui->agcTime->value()], // TBD
 | 
				
			||||||
            ui->agcThreshold->value(),
 | 
					            ui->agcThreshold->value(),
 | 
				
			||||||
            ui->agcThresholdGate->value(),
 | 
					            ui->agcThresholdGate->value(),
 | 
				
			||||||
            ui->agcThresholdDelay->value() * 10);
 | 
					            ui->agcThresholdDelay->value() * 10);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					//		m_ssbMod->configure(m_ssbMod->getInputMessageQueue(),
 | 
				
			||||||
 | 
					//			ui->BW->value() * 100.0f,
 | 
				
			||||||
 | 
					//			ui->lowCut->value() * 100.0f,
 | 
				
			||||||
 | 
					//			ui->toneFrequency->value() * 10.0f,
 | 
				
			||||||
 | 
					//            ui->volume->value() / 10.0f,
 | 
				
			||||||
 | 
					//			m_spanLog2,
 | 
				
			||||||
 | 
					//			ui->audioBinaural->isChecked(),
 | 
				
			||||||
 | 
					//			ui->audioFlipChannels->isChecked(),
 | 
				
			||||||
 | 
					//			ui->dsb->isChecked(),
 | 
				
			||||||
 | 
					//			ui->audioMute->isChecked(),
 | 
				
			||||||
 | 
					//			ui->playLoop->isChecked(),
 | 
				
			||||||
 | 
					//			ui->agc->isChecked(),
 | 
				
			||||||
 | 
					//			ui->agcOrder->value() / 100.0,
 | 
				
			||||||
 | 
					//			m_agcTimeConstant[ui->agcTime->value()],
 | 
				
			||||||
 | 
					//            ui->agcThreshold->value(),
 | 
				
			||||||
 | 
					//            ui->agcThresholdGate->value(),
 | 
				
			||||||
 | 
					//            ui->agcThresholdDelay->value() * 10);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user