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

No need for m_nseq to be a member variable. Use a local nseq instead.

Browse Source
This commit is contained in:
Joe Taylor 2021-06-10 16:30:03 -04:00
parent 83758c40da
commit 5492b82bde
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
widgets/mainwindow.cpp
View File

@ -294,7 +294,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_idleMinutes {0}, m_idleMinutes {0},
m_nSubMode {0}, m_nSubMode {0},
m_nclearave {1}, m_nclearave {1},
m_nseq {0},
m_nWSPRdecodes {0}, m_nWSPRdecodes {0},
m_k0 {9999999}, m_k0 {9999999},
m_nPick {0}, m_nPick {0},
@ -3805,14 +3804,11 @@ void MainWindow::guiUpdate()
if(m_TRperiod==0) m_TRperiod=60.0; if(m_TRperiod==0) m_TRperiod=60.0;
txDuration=tx_duration(m_mode,m_TRperiod,m_nsps,m_bFast9); txDuration=tx_duration(m_mode,m_TRperiod,m_nsps,m_bFast9);
double tx1=0.0; double tx1=0.0;
double tx2=txDuration; double tx2=txDuration;
if(m_mode=="FT8" or m_mode=="FT4") icw[0]=0; //No CW ID in FT4 or FT8 mode if(m_mode=="FT8" or m_mode=="FT4") icw[0]=0; //No CW ID in FT4 or FT8 mode
if((icw[0]>0) and (!m_bFast9)) tx2 += icw[0]*2560.0/48000.0; //Full length including CW ID if((icw[0]>0) and (!m_bFast9)) tx2 += icw[0]*2560.0/48000.0; //Full length including CW ID
if(tx2>m_TRperiod) tx2=m_TRperiod; if(tx2>m_TRperiod) tx2=m_TRperiod;
if(!m_txFirst and m_mode!="WSPR" and m_mode!="FST4W") { if(!m_txFirst and m_mode!="WSPR" and m_mode!="FST4W") {
tx1 += m_TRperiod; tx1 += m_TRperiod;
tx2 += m_TRperiod; tx2 += m_TRperiod;
@ -3823,7 +3819,7 @@ void MainWindow::guiUpdate()
double tsec=0.001*ms; double tsec=0.001*ms;
double t2p=fmod(tsec,2*m_TRperiod); double t2p=fmod(tsec,2*m_TRperiod);
m_s6=fmod(tsec,6.0); m_s6=fmod(tsec,6.0);
m_nseq = fmod(double(nsec),m_TRperiod); int nseq = fmod(double(nsec),m_TRperiod);
m_tRemaining=m_TRperiod - fmod(tsec,m_TRperiod); m_tRemaining=m_TRperiod - fmod(tsec,m_TRperiod);
if(m_mode=="Echo") { if(m_mode=="Echo") {
@ -3834,7 +3830,7 @@ void MainWindow::guiUpdate()
} }
if(m_mode=="WSPR" or m_mode=="FST4W") { if(m_mode=="WSPR" or m_mode=="FST4W") {
if(m_nseq==0 and m_ntr==0) { //Decide whether to Tx or Rx if(nseq==0 and m_ntr==0) { //Decide whether to Tx or Rx
m_tuneup=false; //This is not an ATU tuneup m_tuneup=false; //This is not an ATU tuneup
bool btx = m_auto && m_WSPR_tx_next; // To Tx, we need m_auto and bool btx = m_auto && m_WSPR_tx_next; // To Tx, we need m_auto and
// scheduled transmit // scheduled transmit
@ -3975,7 +3971,7 @@ void MainWindow::guiUpdate()
} }
if((m_mode=="WSPR" or m_mode=="FST4W") and if((m_mode=="WSPR" or m_mode=="FST4W") and
((m_ntr==1 and m_rxDone) or (m_ntr==-1 and m_nseq>tx2))) { ((m_ntr==1 and m_rxDone) or (m_ntr==-1 and nseq>tx2))) {
if(m_monitoring) { if(m_monitoring) {
m_rxDone=false; m_rxDone=false;
} }

1
widgets/mainwindow.h
View File

@ -454,7 +454,6 @@ private:
qint32 m_nclearave; qint32 m_nclearave;
qint32 m_minSync; qint32 m_minSync;
qint32 m_dBm; qint32 m_dBm;
qint32 m_nseq;
qint32 m_nWSPRdecodes; qint32 m_nWSPRdecodes;
qint32 m_k0; qint32 m_k0;
qint32 m_kdone; qint32 m_kdone;