w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-12-24 11:40:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Here's a start on GUI changes to support FST240W as well as FST240.

Browse Source
This commit is contained in:
Joe Taylor 2020-06-30 17:14:58 -04:00
parent 0472a816fb
commit ae54c80a54
7 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/decoder.f90
View File

@ -189,6 +189,9 @@ subroutine multimode_decoder(ss,id2,params,nfsample)
if(params%nmode.eq.240) then
! We're in FST240/FST240W mode
ndepth=iand(params%ndepth,3)
iwspr=0
if(iand(params%ndepth,128).ne.0) iwspr=2
call timer('dec240 ',0)
call my_fst240%decode(fst240_decoded,id2,params%nutc, &
params%nQSOProgress,params%nfqso,params%nfa,params%nfb, &

1
lib/fst240_decode.f90
View File

@ -155,7 +155,6 @@ contains
hmod=2**nsubmode
if(nfqso+nqsoprogress.eq.-999) return
Keff=91
iwspr=1
nmax=15*12000
single_decode=iand(nexp_decode,32).eq.32
if(ntrperiod.eq.15) then

11
widgets/mainwindow.cpp
View File

@ -953,6 +953,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->actionInclude_averaging->setChecked(m_ndepth&16);
ui->actionInclude_correlation->setChecked(m_ndepth&32);
ui->actionEnable_AP_DXcall->setChecked(m_ndepth&64);
ui->actionAlso_FST240W->setChecked(m_ndepth&128);
m_UTCdisk=-1;
m_fCPUmskrtd=0.0;
@ -2927,6 +2928,7 @@ void MainWindow::decode() //decode()
if (!ui->actionInclude_averaging->isVisible ()) depth &= ~16;
if (!ui->actionInclude_correlation->isVisible ()) depth &= ~32;
if (!ui->actionEnable_AP_DXcall->isVisible ()) depth &= ~64;
if (!ui->actionAlso_FST240W->isVisible ()) depth &= ~128;
dec_data.params.ndepth=depth;
dec_data.params.n2pass=1;
if(m_config.twoPass()) dec_data.params.n2pass=2;
@ -5833,6 +5835,7 @@ void MainWindow::on_actionFST240_triggered()
m_wideGraph->setMode(m_mode);
m_wideGraph->setModeTx(m_modeTx);
switch_mode (Modes::FST240);
m_wideGraph->setMode(m_mode);
statusChanged();
}
@ -6443,6 +6446,7 @@ void MainWindow::switch_mode (Mode mode)
ui->label_6->setVisible(false);
ui->label_7->setVisible(false);
}
ui->actionAlso_FST240W->setVisible(m_mode.startsWith("FST240"));
}
void MainWindow::WSPR_config(bool b)
@ -6527,6 +6531,8 @@ void MainWindow::on_actionInclude_averaging_toggled (bool checked)
m_ndepth ^= (-checked ^ m_ndepth) & 0x00000010;
}
void MainWindow::on_actionInclude_correlation_toggled (bool checked)
{
m_ndepth ^= (-checked ^ m_ndepth) & 0x00000020;
@ -6537,6 +6543,11 @@ void MainWindow::on_actionEnable_AP_DXcall_toggled (bool checked)
m_ndepth ^= (-checked ^ m_ndepth) & 0x00000040;
}
void MainWindow::on_actionAlso_FST240W_toggled (bool checked)
{
m_ndepth ^= (-checked ^ m_ndepth) & 0x00000080;
}
void MainWindow::on_actionErase_ALL_TXT_triggered() //Erase ALL.TXT
{
int ret = MessageBox::query_message (this, tr ("Confirm Erase"),

1
widgets/mainwindow.h
View File

@ -265,6 +265,7 @@ private slots:
void on_fox_log_action_triggered ();
void on_actionColors_triggered();
void on_actionInclude_averaging_toggled (bool);
void on_actionAlso_FST240W_toggled (bool);
void on_actionInclude_correlation_toggled (bool);
void on_actionEnable_AP_DXcall_toggled (bool);
void VHF_features_enabled(bool b);

12
widgets/mainwindow.ui
View File

@ -2829,6 +2829,7 @@ list. The list can be maintained in Settings (F2).</string>
<addaction name="actionEnable_AP_FT8"/>
<addaction name="actionEnable_AP_JT65"/>
<addaction name="actionEnable_AP_DXcall"/>
<addaction name="actionAlso_FST240W"/>
</widget>
<widget class="QMenu" name="menuSave">
<property name="title">
@ -3523,6 +3524,17 @@ list. The list can be maintained in Settings (F2).</string>
<string>FST240W</string>
</property>
</action>
<action name="actionAlso_FST240W">
<property name="checkable">
<bool>true</bool>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Also FST240W</string>
</property>
</action>
</widget>
<layoutdefault spacing="6" margin="11"/>
<customwidgets>

4
widgets/widegraph.cpp
View File

@ -294,7 +294,7 @@ void WideGraph::setTxFreq(int n) //setTxFreq
void WideGraph::setMode(QString mode) //setMode
{
m_mode=mode;
ui->fSplitSpinBox->setEnabled(m_mode=="JT9+JT65");
ui->fSplitSpinBox->setEnabled(m_mode=="JT9+JT65" or m_mode.startsWith("FST240"));
ui->widePlot->setMode(mode);
ui->widePlot->DrawOverlay();
ui->widePlot->update();
@ -368,7 +368,7 @@ void WideGraph::setRxBand (QString const& band)
else
{
ui->fSplitSpinBox->setValue (m_fMinPerBand.value (band, 2500).toUInt ());
ui->fSplitSpinBox->setEnabled (m_mode=="JT9+JT65");
ui->fSplitSpinBox->setEnabled (m_mode=="JT9+JT65" or m_mode.startsWith("FST240"));
}
ui->widePlot->setRxBand(band);
setRxRange ();

4
widgets/widegraph.ui
View File

@ -362,10 +362,10 @@
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Decode JT9 only above this frequency&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="suffix">
<string> JT9</string>
<string> Hz</string>
</property>
<property name="prefix">
<string>JT65 </string>
<string>Split </string>
</property>
<property name="minimum">
<number>0</number>