w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-28 20:32:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re Sh and SWL: allow either or neither, but not both.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7459 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-06 19:01:29 +00:00
parent ab8c93dca9
commit 2698fc02c6
4 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mskrtd.f90
View File

@ -116,7 +116,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,mygrid,hiscall, &
np=8*NSPM np=8*NSPM
call msk144spd(cdat,np,ntol,ndecodesuccess,msgreceived,fc,fest,tdec,navg,ct, & call msk144spd(cdat,np,ntol,ndecodesuccess,msgreceived,fc,fest,tdec,navg,ct, &
softbits,recent_calls,nrecent) softbits,recent_calls,nrecent)
if(ndecodesuccess.eq.0 .and. bshmsg) then if(ndecodesuccess.eq.0 .and. (bshmsg.or.bswl)) then
call msk40spd(cdat,np,ntol,mycall(1:6),hiscall(1:6),bswl,nhasharray, & call msk40spd(cdat,np,ntol,mycall(1:6),hiscall(1:6),bswl,nhasharray, &
recent_calls,nrecent,ndecodesuccess,msgreceived,fc,fest,tdec,navg) recent_calls,nrecent,ndecodesuccess,msgreceived,fc,fest,tdec,navg)
endif endif

9
mainwindow.cpp
View File

@ -4178,7 +4178,6 @@ void MainWindow::displayWidgets(int n)
} }
if(i==23) { if(i==23) {
ui->cbSWL->setVisible(b); ui->cbSWL->setVisible(b);
ui->cbSWL->setEnabled(b and ui->cbShMsgs->isChecked());
} }
j=j>>1; j=j>>1;
} }
@ -5569,9 +5568,8 @@ void MainWindow::on_cbFast9_clicked(bool b)
void MainWindow::on_cbShMsgs_toggled(bool b) void MainWindow::on_cbShMsgs_toggled(bool b)
{ {
ui->cbTx6->setEnabled(b); ui->cbTx6->setEnabled(b);
ui->cbSWL->setEnabled(b);
m_bShMsgs=b; m_bShMsgs=b;
if(!b) ui->cbSWL->setChecked(false); if(b) ui->cbSWL->setChecked(false);
if(m_bShMsgs and (m_mode=="MSK144")) ui->rptSpinBox->setValue(1); if(m_bShMsgs and (m_mode=="MSK144")) ui->rptSpinBox->setValue(1);
int itone0=itone[0]; int itone0=itone[0];
int ntx=m_ntx; int ntx=m_ntx;
@ -5585,6 +5583,11 @@ void MainWindow::on_cbShMsgs_toggled(bool b)
if(ntx==6) ui->txrb6->setChecked(true); if(ntx==6) ui->txrb6->setChecked(true);
} }
void MainWindow::on_cbSWL_toggled(bool b)
{
if(b) ui->cbShMsgs->setChecked(false);
}
void MainWindow::on_cbTx6_toggled(bool b) void MainWindow::on_cbTx6_toggled(bool b)
{ {
QString t; QString t;

1
mainwindow.h
View File

@ -226,6 +226,7 @@ private slots:
void VHF_features_enabled(bool b); void VHF_features_enabled(bool b);
void on_sbSubmode_valueChanged(int n); void on_sbSubmode_valueChanged(int n);
void on_cbShMsgs_toggled(bool b); void on_cbShMsgs_toggled(bool b);
void on_cbSWL_toggled(bool b);
void on_cbTx6_toggled(bool b); void on_cbTx6_toggled(bool b);
void networkError (QString const&); void networkError (QString const&);
void on_ClrAvgButton_clicked(); void on_ClrAvgButton_clicked();

18
mainwindow.ui
View File

@ -2,6 +2,14 @@
<ui version="4.0"> <ui version="4.0">
<class>MainWindow</class> <class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow"> <widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>867</width>
<height>583</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>WSJT-X by K1JT</string> <string>WSJT-X by K1JT</string>
</property> </property>
@ -990,7 +998,7 @@ QLabel[oob=&quot;true&quot;] {
<item row="15" column="0"> <item row="15" column="0">
<widget class="QCheckBox" name="cbSWL"> <widget class="QCheckBox" name="cbSWL">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>true</bool>
</property> </property>
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -2352,6 +2360,14 @@ QPushButton[state=&quot;ok&quot;] {
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="menuBar"> <widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>867</width>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
<property name="title"> <property name="title">
<string>File</string> <string>File</string>