@ -45,6 +45,7 @@
@@ -45,6 +45,7 @@
# include "wdsprxcwpeakdialog.h"
# include "wdsprxsquelchdialog.h"
# include "wdsprxeqdialog.h"
# include "wdsprxpandialog.h"
WDSPRxGUI * WDSPRxGUI : : create ( PluginAPI * pluginAPI , DeviceUISet * deviceUISet , BasebandSampleSink * rxChannel )
{
@ -238,6 +239,13 @@ void WDSPRxGUI::on_dnb_toggled(bool checked)
@@ -238,6 +239,13 @@ void WDSPRxGUI::on_dnb_toggled(bool checked)
applySettings ( ) ;
}
void WDSPRxGUI : : on_anf_toggled ( bool checked )
{
m_settings . m_anf = checked ;
m_settings . m_profiles [ m_settings . m_profileIndex ] . m_anf = m_settings . m_anf ;
applySettings ( ) ;
}
void WDSPRxGUI : : on_cwPeaking_toggled ( bool checked )
{
m_settings . m_cwPeaking = checked ;
@ -278,6 +286,7 @@ void WDSPRxGUI::on_rit_toggled(bool checked)
@@ -278,6 +286,7 @@ void WDSPRxGUI::on_rit_toggled(bool checked)
void WDSPRxGUI : : on_ritFrequency_valueChanged ( int value )
{
m_settings . m_ritFrequency = value ;
m_settings . m_profiles [ m_settings . m_profileIndex ] . m_ritFrequency = m_settings . m_ritFrequency ;
ui - > ritFrequencyText - > setText ( tr ( " %1 " ) . arg ( value ) ) ;
m_channelMarker . setShift ( m_settings . m_rit ? value : 0 ) ;
applySettings ( ) ;
@ -330,7 +339,7 @@ void WDSPRxGUI::on_profileIndex_valueChanged(int value)
@@ -330,7 +339,7 @@ void WDSPRxGUI::on_profileIndex_valueChanged(int value)
return ;
}
ui - > filt er IndexText - > setText ( tr ( " %1 " ) . arg ( value ) ) ;
ui - > pro fileIndexText- > setText ( tr ( " %1 " ) . arg ( value ) ) ;
m_settings . m_profileIndex = value ;
// Bandwidth setup
ui - > BW - > setMaximum ( 480 ) ;
@ -517,29 +526,32 @@ WDSPRxGUI::WDSPRxGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
@@ -517,29 +526,32 @@ WDSPRxGUI::WDSPRxGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_spectrumVis - > setGLSpectrum ( ui - > glSpectrum ) ;
m_wdspRx - > setMessageQueueToGUI ( getInputMessageQueue ( ) ) ;
CRightClickEnabler * audioMuteRightClickEnabler = new CRightClickEnabler ( ui - > audioMute ) ;
connect ( audioMuteRightClickEnabler , SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( audioSelect ( const QPoint & ) ) ) ;
m_audioMuteRightClickEnabler = new CRightClickEnabler ( ui - > audioMute ) ;
connect ( m_audioMuteRightClickEnabler , SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( audioSelect ( const QPoint & ) ) ) ;
m_agcRightClickEnabler = new CRightClickEnabler ( ui - > agc ) ;
connect ( m_agcRightClickEnabler , SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( agcSetupDialog ( const QPoint & ) ) ) ;
CRightClickEnabler * agcRightClickEnabler = new CRightClickEnabler ( ui - > agc ) ;
connect ( agcRightClickEnabler , SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( agcSetupDialog ( const QPoint & ) ) ) ;
m_dnb RightClickEnabler = new CRightClickEnabler ( ui - > dnb ) ;
connect ( m_dnb RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( dnb SetupDialog( const QPoint & ) ) ) ;
CRightClickEnabler * dnb RightClickEnabler = new CRightClickEnabler ( ui - > dnb ) ;
connect ( dnb RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( dnb SetupDialog ( const QPoint & ) ) ) ;
m_dnr RightClickEnabler = new CRightClickEnabler ( ui - > dnr ) ;
connect ( m_dnr RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( dnr SetupDialog ( const QPoint & ) ) ) ;
CRightClickEnabler * dnr RightClickEnabler = new CRightClickEnabler ( ui - > dnr ) ;
connect ( dnr RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( dnr SetupDialog( const QPoint & ) ) ) ;
m_cwPeak RightClickEnabler = new CRightClickEnabler ( ui - > cwPeaking ) ;
connect ( m_cwPeak RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( cwPeak SetupDialog( const QPoint & ) ) ) ;
CRightClickEnabler * cwPeak RightClickEnabler = new CRightClickEnabler ( ui - > cwPeaking ) ;
connect ( cwPeak RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( cwPeak SetupDialog( const QPoint & ) ) ) ;
m_squelch RightClickEnabler = new CRightClickEnabler ( ui - > squelch ) ;
connect ( m_squelch RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( squelch SetupDialog( const QPoint & ) ) ) ;
CRightClickEnabler * squelch RightClickEnabler = new CRightClickEnabler ( ui - > squelch ) ;
connect ( squelch RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( squelch SetupDialog( const QPoint & ) ) ) ;
m_equalizer RightClickEnabler = new CRightClickEnabler ( ui - > equalizer ) ;
connect ( m_equalizer RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( equalizer SetupDialog( const QPoint & ) ) ) ;
CRightClickEnabler * equalizer RightClickEnabler = new CRightClickEnabler ( ui - > equalizer ) ;
connect ( equalizer RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( equalizer SetupDialog( const QPoint & ) ) ) ;
m_pan RightClickEnabler = new CRightClickEnabler ( ui - > audioBinaural ) ;
connect ( m_pan RightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( pan SetupDialog( const QPoint & ) ) ) ;
CRightClickEnabler * demodRightClickEnabler = new CRightClickEnabler ( ui - > demod ) ;
connect ( demodRightClickEnabler , SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( demodSetupDialog ( const QPoint & ) ) ) ;
m_ demodRightClickEnabler = new CRightClickEnabler ( ui - > demod ) ;
connect ( m_ demodRightClickEnabler, SIGNAL ( rightClick ( const QPoint & ) ) , this , SLOT ( demodSetupDialog ( const QPoint & ) ) ) ;
ui - > deltaFrequencyLabel - > setText ( QString ( " %1f " ) . arg ( QChar ( 0x94 , 0x03 ) ) ) ;
ui - > deltaFrequency - > setColorMapper ( ColorMapper ( ColorMapper : : GrayGold ) ) ;
@ -599,6 +611,15 @@ WDSPRxGUI::WDSPRxGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
@@ -599,6 +611,15 @@ WDSPRxGUI::WDSPRxGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
WDSPRxGUI : : ~ WDSPRxGUI ( )
{
delete ui ;
delete m_audioMuteRightClickEnabler ;
delete m_agcRightClickEnabler ;
delete m_dnbRightClickEnabler ;
delete m_dnrRightClickEnabler ;
delete m_cwPeakRightClickEnabler ;
delete m_squelchRightClickEnabler ;
delete m_equalizerRightClickEnabler ;
delete m_panRightClickEnabler ;
delete m_demodRightClickEnabler ;
}
bool WDSPRxGUI : : blockApplySettings ( bool block )
@ -816,6 +837,7 @@ void WDSPRxGUI::displaySettings()
@@ -816,6 +837,7 @@ void WDSPRxGUI::displaySettings()
ui - > agcGainText - > setText ( s ) ;
ui - > dnr - > setChecked ( m_settings . m_dnr ) ;
ui - > dnb - > setChecked ( m_settings . m_dnb ) ;
ui - > anf - > setChecked ( m_settings . m_anf ) ;
ui - > cwPeaking - > setChecked ( m_settings . m_cwPeaking ) ;
ui - > squelch - > setChecked ( m_settings . m_squelch ) ;
ui - > squelchThreshold - > setValue ( m_settings . m_squelchThreshold ) ;
@ -850,10 +872,10 @@ void WDSPRxGUI::displaySettings()
@@ -850,10 +872,10 @@ void WDSPRxGUI::displaySettings()
ui - > spanLog2 - > blockSignals ( true ) ;
ui - > dsb - > blockSignals ( true ) ;
ui - > BW - > blockSignals ( true ) ;
ui - > filt er Index - > blockSignals ( true ) ;
ui - > pro fileIndex- > blockSignals ( true ) ;
ui - > filt er Index - > setValue ( m_settings . m_profileIndex ) ;
ui - > filt er IndexText - > setText ( tr ( " %1 " ) . arg ( m_settings . m_profileIndex ) ) ;
ui - > pro fileIndex- > setValue ( m_settings . m_profileIndex ) ;
ui - > pro fileIndexText- > setText ( tr ( " %1 " ) . arg ( m_settings . m_profileIndex ) ) ;
ui - > dsb - > setChecked ( m_settings . m_dsb ) ;
ui - > spanLog2 - > setValue ( 1 + ui - > spanLog2 - > maximum ( ) - m_settings . m_profiles [ m_settings . m_profileIndex ] . m_spanLog2 ) ;
@ -873,7 +895,7 @@ void WDSPRxGUI::displaySettings()
@@ -873,7 +895,7 @@ void WDSPRxGUI::displaySettings()
ui - > spanLog2 - > blockSignals ( false ) ;
ui - > dsb - > blockSignals ( false ) ;
ui - > BW - > blockSignals ( false ) ;
ui - > filt er Index - > blockSignals ( false ) ;
ui - > pro fileIndex- > blockSignals ( false ) ;
// The only one of the four signals triggering applyBandwidths will trigger it once only with all other values
// set correctly and therefore validate the settings and apply them to dependent widgets
@ -938,7 +960,7 @@ void WDSPRxGUI::agcSetup(int iValueChanged)
@@ -938,7 +960,7 @@ void WDSPRxGUI::agcSetup(int iValueChanged)
return ;
}
WDSPRxAGCDialog : : ValueChanged valueChanged = ( WDSPRxAGCDialog : : ValueChanged ) iValueChanged ;
auto valueChanged = ( WDSPRxAGCDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
@ -986,7 +1008,7 @@ void WDSPRxGUI::dnbSetup(int32_t iValueChanged)
@@ -986,7 +1008,7 @@ void WDSPRxGUI::dnbSetup(int32_t iValueChanged)
return ;
}
WDSPRxDNBDialog : : ValueChanged valueChanged = ( WDSPRxDNBDialog : : ValueChanged ) iValueChanged ;
auto valueChanged = ( WDSPRxDNBDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
@ -1035,7 +1057,6 @@ void WDSPRxGUI::dnrSetupDialog(const QPoint& p)
@@ -1035,7 +1057,6 @@ void WDSPRxGUI::dnrSetupDialog(const QPoint& p)
m_dnrDialog = new WDSPRxDNRDialog ( ) ;
m_dnrDialog - > move ( p ) ;
m_dnrDialog - > setSNB ( m_settings . m_snb ) ;
m_dnrDialog - > setANF ( m_settings . m_anf ) ;
m_dnrDialog - > setNRScheme ( m_settings . m_nrScheme ) ;
m_dnrDialog - > setNR2Gain ( m_settings . m_nr2Gain ) ;
m_dnrDialog - > setNR2NPE ( m_settings . m_nr2NPE ) ;
@ -1054,7 +1075,7 @@ void WDSPRxGUI::dnrSetup(int32_t iValueChanged)
@@ -1054,7 +1075,7 @@ void WDSPRxGUI::dnrSetup(int32_t iValueChanged)
return ;
}
WDSPRxDNRDialog : : ValueChanged valueChanged = ( WDSPRxDNRDialog : : ValueChanged ) iValueChanged ;
auto valueChanged = ( WDSPRxDNRDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
@ -1063,11 +1084,6 @@ void WDSPRxGUI::dnrSetup(int32_t iValueChanged)
@@ -1063,11 +1084,6 @@ void WDSPRxGUI::dnrSetup(int32_t iValueChanged)
m_settings . m_profiles [ m_settings . m_profileIndex ] . m_snb = m_settings . m_snb ;
applySettings ( ) ;
break ;
case WDSPRxDNRDialog : : ValueChanged : : ChangedANF :
m_settings . m_anf = m_dnrDialog - > getANF ( ) ;
m_settings . m_profiles [ m_settings . m_profileIndex ] . m_anf = m_settings . m_anf ;
applySettings ( ) ;
break ;
case WDSPRxDNRDialog : : ValueChanged : : ChangedNR :
m_settings . m_nrScheme = m_dnrDialog - > getNRScheme ( ) ;
m_settings . m_profiles [ m_settings . m_profileIndex ] . m_nrScheme = m_settings . m_nrScheme ;
@ -1118,7 +1134,7 @@ void WDSPRxGUI::cwPeakSetup(int iValueChanged)
@@ -1118,7 +1134,7 @@ void WDSPRxGUI::cwPeakSetup(int iValueChanged)
return ;
}
WDSPRxCWPeakDialog : : ValueChanged valueChanged = ( WDSPRxCWPeakDialog : : ValueChanged ) iValueChanged ;
auto valueChanged = ( WDSPRxCWPeakDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
@ -1181,7 +1197,7 @@ void WDSPRxGUI::amSetup(int iValueChanged)
@@ -1181,7 +1197,7 @@ void WDSPRxGUI::amSetup(int iValueChanged)
return ;
}
WDSPRxAMDialog : : ValueChanged valueChanged = ( WDSPRxAMDialog : : ValueChanged ) iValueChanged ;
auto valueChanged = ( WDSPRxAMDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
@ -1201,7 +1217,7 @@ void WDSPRxGUI::fmSetup(int iValueChanged)
@@ -1201,7 +1217,7 @@ void WDSPRxGUI::fmSetup(int iValueChanged)
return ;
}
WDSPRxFMDialog : : ValueChanged valueChanged = ( WDSPRxFMDialog : : ValueChanged ) iValueChanged ;
auto valueChanged = ( WDSPRxFMDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
@ -1266,7 +1282,7 @@ void WDSPRxGUI::squelchSetup(int iValueChanged)
@@ -1266,7 +1282,7 @@ void WDSPRxGUI::squelchSetup(int iValueChanged)
return ;
}
WDSPRxSquelchDialog : : ValueChanged valueChanged = ( WDSPRxSquelchDialog : : ValueChanged ) iValueChanged ;
auto valueChanged = ( WDSPRxSquelchDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
@ -1314,7 +1330,7 @@ void WDSPRxGUI::equalizerSetup(int iValueChanged)
@@ -1314,7 +1330,7 @@ void WDSPRxGUI::equalizerSetup(int iValueChanged)
return ;
}
WDSPRxEqDialog : : ValueChanged valueChanged = ( WDSPRxEqDialog : : ValueChanged ) iValueChanged ;
auto valueChanged = ( WDSPRxEqDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
@ -1333,6 +1349,38 @@ void WDSPRxGUI::equalizerSetup(int iValueChanged)
@@ -1333,6 +1349,38 @@ void WDSPRxGUI::equalizerSetup(int iValueChanged)
}
}
void WDSPRxGUI : : panSetupDialog ( const QPoint & p )
{
m_panDialog = new WDSPRxPanDialog ( ) ;
m_panDialog - > move ( p ) ;
m_panDialog - > setPan ( m_settings . m_audioPan ) ;
QObject : : connect ( m_panDialog , & WDSPRxPanDialog : : valueChanged , this , & WDSPRxGUI : : panSetup ) ;
m_panDialog - > exec ( ) ;
QObject : : disconnect ( m_panDialog , & WDSPRxPanDialog : : valueChanged , this , & WDSPRxGUI : : panSetup ) ;
m_panDialog - > deleteLater ( ) ;
m_panDialog = nullptr ;
}
void WDSPRxGUI : : panSetup ( int iValueChanged )
{
if ( ! m_panDialog ) {
return ;
}
auto valueChanged = ( WDSPRxPanDialog : : ValueChanged ) iValueChanged ;
switch ( valueChanged )
{
case WDSPRxPanDialog : : ChangedPan :
m_settings . m_audioPan = m_panDialog - > getPan ( ) ;
m_settings . m_profiles [ m_settings . m_profileIndex ] . m_audioPan = m_settings . m_audioPan ;
applySettings ( ) ;
break ;
default :
break ;
}
}
void WDSPRxGUI : : tick ( )
{
double powDbAvg , powDbPeak ;
@ -1379,12 +1427,14 @@ void WDSPRxGUI::makeUIConnections()
@@ -1379,12 +1427,14 @@ void WDSPRxGUI::makeUIConnections()
QObject : : connect ( ui - > volume , & QDial : : valueChanged , this , & WDSPRxGUI : : on_volume_valueChanged ) ;
QObject : : connect ( ui - > agc , & ButtonSwitch : : toggled , this , & WDSPRxGUI : : on_agc_toggled ) ;
QObject : : connect ( ui - > dnr , & ButtonSwitch : : toggled , this , & WDSPRxGUI : : on_dnr_toggled ) ;
QObject : : connect ( ui - > dnb , & ButtonSwitch : : toggled , this , & WDSPRxGUI : : on_dnb_toggled ) ;
QObject : : connect ( ui - > anf , & ButtonSwitch : : toggled , this , & WDSPRxGUI : : on_anf_toggled ) ;
QObject : : connect ( ui - > agcGain , & QDial : : valueChanged , this , & WDSPRxGUI : : on_agcGain_valueChanged ) ;
QObject : : connect ( ui - > audioMute , & QToolButton : : toggled , this , & WDSPRxGUI : : on_audioMute_toggled ) ;
QObject : : connect ( ui - > spanLog2 , & QSlider : : valueChanged , this , & WDSPRxGUI : : on_spanLog2_valueChanged ) ;
QObject : : connect ( ui - > flipSidebands , & QPushButton : : clicked , this , & WDSPRxGUI : : on_flipSidebands_clicked ) ;
QObject : : connect ( ui - > fftWindow , QOverload < int > : : of ( & QComboBox : : currentIndexChanged ) , this , & WDSPRxGUI : : on_fftWindow_currentIndexChanged ) ;
QObject : : connect ( ui - > filt er Index , & QDial : : valueChanged , this , & WDSPRxGUI : : on_profileIndex_valueChanged ) ;
QObject : : connect ( ui - > pro fileIndex, & QDial : : valueChanged , this , & WDSPRxGUI : : on_profileIndex_valueChanged ) ;
QObject : : connect ( ui - > demod , QOverload < int > : : of ( & QComboBox : : currentIndexChanged ) , this , & WDSPRxGUI : : on_demod_currentIndexChanged ) ;
QObject : : connect ( ui - > cwPeaking , & ButtonSwitch : : toggled , this , & WDSPRxGUI : : on_cwPeaking_toggled ) ;
QObject : : connect ( ui - > squelch , & ButtonSwitch : : toggled , this , & WDSPRxGUI : : on_squelch_toggled ) ;