w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-27 07:58:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add menu option to turn on AP decoding in FT8 mode

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7954 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2017-07-26 10:56:12 +00:00
parent 1c02b1e6e6
commit d7f8c91bf4
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
mainwindow.cpp
View File

@ -992,6 +992,7 @@ void MainWindow::writeSettings()
m_settings->setValue ("CQTxfreq", ui->sbCQTxFreq->value ()); m_settings->setValue ("CQTxfreq", ui->sbCQTxFreq->value ());
m_settings->setValue("pwrBandTxMemory",m_pwrBandTxMemory); m_settings->setValue("pwrBandTxMemory",m_pwrBandTxMemory);
m_settings->setValue("pwrBandTuneMemory",m_pwrBandTuneMemory); m_settings->setValue("pwrBandTuneMemory",m_pwrBandTuneMemory);
m_settings->setValue ("FT8AP", ui->actionEnable_AP->isChecked ());
{ {
QList<QVariant> coeffs; // suitable for QSettings QList<QVariant> coeffs; // suitable for QSettings
for (auto const& coeff : m_phaseEqCoefficients) for (auto const& coeff : m_phaseEqCoefficients)
@ -1071,6 +1072,7 @@ void MainWindow::readSettings()
m_lockTxFreq=m_settings->value("LockTxFreq",false).toBool(); m_lockTxFreq=m_settings->value("LockTxFreq",false).toBool();
m_pwrBandTxMemory=m_settings->value("pwrBandTxMemory").toHash(); m_pwrBandTxMemory=m_settings->value("pwrBandTxMemory").toHash();
m_pwrBandTuneMemory=m_settings->value("pwrBandTuneMemory").toHash(); m_pwrBandTuneMemory=m_settings->value("pwrBandTuneMemory").toHash();
ui->actionEnable_AP->setChecked (m_settings->value ("FT8AP", false).toBool());
{ {
auto const& coeffs = m_settings->value ("PhaseEqualizationCoefficients" auto const& coeffs = m_settings->value ("PhaseEqualizationCoefficients"
, QList<QVariant> {0., 0., 0., 0., 0.}).toList (); , QList<QVariant> {0., 0., 0., 0., 0.}).toList ();
@ -1579,8 +1581,8 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
update_watchdog_label (); update_watchdog_label ();
if(!m_splitMode) ui->cbCQTx->setChecked(false); if(!m_splitMode) ui->cbCQTx->setChecked(false);
if(!m_config.enable_VHF_features()) { if(!m_config.enable_VHF_features()) {
ui->actionInclude_averaging->setEnabled(false); ui->actionInclude_averaging->setVisible(false);
ui->actionInclude_correlation->setEnabled(false); ui->actionInclude_correlation->setVisible (false);
ui->actionInclude_averaging->setChecked(false); ui->actionInclude_averaging->setChecked(false);
ui->actionInclude_correlation->setChecked(false); ui->actionInclude_correlation->setChecked(false);
} }
@ -2435,9 +2437,9 @@ void MainWindow::decode() //decode()
if(m_nPick==2) dec_data.params.nutc=m_nutc0; if(m_nPick==2) dec_data.params.nutc=m_nutc0;
dec_data.params.nfqso=m_wideGraph->rxFreq(); dec_data.params.nfqso=m_wideGraph->rxFreq();
qint32 depth {m_ndepth}; qint32 depth {m_ndepth};
if (!ui->actionInclude_averaging->isEnabled ()) depth &= ~16; if (!ui->actionInclude_averaging->isVisible ()) depth &= ~16;
if (!ui->actionInclude_correlation->isEnabled ()) depth &= ~32; if (!ui->actionInclude_correlation->isVisible ()) depth &= ~32;
if (!ui->actionEnable_AP_DXcall->isEnabled ()) depth &= ~64; if (!ui->actionEnable_AP_DXcall->isVisible ()) depth &= ~64;
dec_data.params.ndepth=depth; dec_data.params.ndepth=depth;
dec_data.params.n2pass=1; dec_data.params.n2pass=1;
if(m_config.twoPass()) dec_data.params.n2pass=2; if(m_config.twoPass()) dec_data.params.n2pass=2;
@ -2468,7 +2470,7 @@ void MainWindow::decode() //decode()
dec_data.params.ntxmode=4; dec_data.params.ntxmode=4;
} }
if(m_mode=="FT8") dec_data.params.nmode=8; if(m_mode=="FT8") dec_data.params.nmode=8;
if(m_mode=="FT8") dec_data.params.lapon=true; if(m_mode=="FT8") dec_data.params.lapon = ui->actionEnable_AP->isVisible () && ui->actionEnable_AP->isChecked ();
if(m_mode=="FT8") dec_data.params.napwid=50; if(m_mode=="FT8") dec_data.params.napwid=50;
dec_data.params.ntrperiod=m_TRperiod; dec_data.params.ntrperiod=m_TRperiod;
dec_data.params.nsubmode=m_nSubMode; dec_data.params.nsubmode=m_nSubMode;
@ -4525,8 +4527,8 @@ void MainWindow::displayWidgets(int n)
if(i==19) ui->actionQuickDecode->setEnabled(b); if(i==19) ui->actionQuickDecode->setEnabled(b);
if(i==19) ui->actionMediumDecode->setEnabled(b); if(i==19) ui->actionMediumDecode->setEnabled(b);
if(i==19) ui->actionDeepestDecode->setEnabled(b); if(i==19) ui->actionDeepestDecode->setEnabled(b);
if(i==20) ui->actionInclude_averaging->setEnabled(b); if(i==20) ui->actionInclude_averaging->setVisible (b);
if(i==21) ui->actionInclude_correlation->setEnabled(b); if(i==21) ui->actionInclude_correlation->setVisible (b);
if(i==22) { if(i==22) {
if(b && !m_echoGraph->isVisible()) { if(b && !m_echoGraph->isVisible()) {
m_echoGraph->show(); m_echoGraph->show();
@ -4539,8 +4541,8 @@ void MainWindow::displayWidgets(int n)
} }
j=j>>1; j=j>>1;
} }
b=m_mode=="FT8"; ui->cbFirst->setVisible ("FT8" == m_mode);
ui->cbFirst->setVisible(b); ui->actionEnable_AP->setVisible ("FT8" == m_mode);
ui->cbWeak->setVisible(false); ui->cbWeak->setVisible(false);
m_lastCallsign.clear (); // ensures Tx5 is updated for new modes m_lastCallsign.clear (); // ensures Tx5 is updated for new modes
genStdMsgs (m_rpt, true); genStdMsgs (m_rpt, true);
@ -4791,8 +4793,8 @@ void MainWindow::on_actionQRA64_triggered()
m_wideGraph->setModeTx(m_modeTx); m_wideGraph->setModeTx(m_modeTx);
ui->sbSubmode->setMaximum(4); ui->sbSubmode->setMaximum(4);
ui->sbSubmode->setValue(m_nSubMode); ui->sbSubmode->setValue(m_nSubMode);
ui->actionInclude_averaging->setEnabled(false); ui->actionInclude_averaging->setVisible (false);
ui->actionInclude_correlation->setEnabled(false); ui->actionInclude_correlation->setVisible (false);
QString fname {QDir::toNativeSeparators(m_config.temp_dir ().absoluteFilePath ("red.dat"))}; QString fname {QDir::toNativeSeparators(m_config.temp_dir ().absoluteFilePath ("red.dat"))};
m_wideGraph->setRedFile(fname); m_wideGraph->setRedFile(fname);
QFile f(m_appDir + "/old_qra_sync"); QFile f(m_appDir + "/old_qra_sync");
@ -5931,10 +5933,10 @@ void::MainWindow::VHF_features_enabled(bool b)
ui->actionInclude_correlation->isChecked())) { ui->actionInclude_correlation->isChecked())) {
ui->actionDeepestDecode->setChecked (true); ui->actionDeepestDecode->setChecked (true);
} }
ui->actionInclude_averaging->setEnabled(b); ui->actionInclude_averaging->setVisible (b);
ui->actionInclude_correlation->setEnabled(b); ui->actionInclude_correlation->setVisible (b);
ui->actionMessage_averaging->setEnabled(b); ui->actionMessage_averaging->setEnabled(b);
ui->actionEnable_AP_DXcall->setEnabled(m_mode=="QRA64"); ui->actionEnable_AP_DXcall->setVisible (m_mode=="QRA64");
if(!b && m_msgAvgWidget) { if(!b && m_msgAvgWidget) {
if(m_msgAvgWidget->isVisible()) m_msgAvgWidget->close(); if(m_msgAvgWidget->isVisible()) m_msgAvgWidget->close();
} }

12
mainwindow.ui
View File

@ -2387,6 +2387,7 @@ QPushButton[state=&quot;ok&quot;] {
<addaction name="separator"/> <addaction name="separator"/>
<addaction name="actionInclude_averaging"/> <addaction name="actionInclude_averaging"/>
<addaction name="actionInclude_correlation"/> <addaction name="actionInclude_correlation"/>
<addaction name="actionEnable_AP"/>
<addaction name="actionEnable_AP_DXcall"/> <addaction name="actionEnable_AP_DXcall"/>
</widget> </widget>
<widget class="QMenu" name="menuSave"> <widget class="QMenu" name="menuSave">
@ -2921,9 +2922,6 @@ QPushButton[state=&quot;ok&quot;] {
<property name="text"> <property name="text">
<string>Enable AP for DX Call</string> <string>Enable AP for DX Call</string>
</property> </property>
<property name="shortcut">
<string/>
</property>
</action> </action>
<action name="actionFreqCal"> <action name="actionFreqCal">
<property name="checkable"> <property name="checkable">
@ -2989,6 +2987,14 @@ QPushButton[state=&quot;ok&quot;] {
<string>FT8</string> <string>FT8</string>
</property> </property>
</action> </action>
<action name="actionEnable_AP">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Enable AP</string>
</property>
</action>
</widget> </widget>
<layoutdefault spacing="6" margin="11"/> <layoutdefault spacing="6" margin="11"/>
<customwidgets> <customwidgets>