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

Refactor a poor variable name

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6898 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2016-07-08 20:45:45 +00:00
parent aa88b067fb
commit 46ff34a04a
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
mainwindow.cpp
View File

@ -202,7 +202,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_TRperiod {60}, m_TRperiod {60},
m_inGain {0}, m_inGain {0},
m_secID {0}, m_secID {0},
m_repeatMsg {0}, m_idleMinutes {0},
m_nSubMode {0}, m_nSubMode {0},
m_nclearave {1}, m_nclearave {1},
m_pctx {0}, m_pctx {0},
@ -870,14 +870,14 @@ void MainWindow::on_the_minute ()
} }
if (!m_mode.startsWith ("WSPR") && m_config.watchdog () != 0 if (!m_mode.startsWith ("WSPR") && m_config.watchdog () != 0
&& m_repeatMsg < m_config.watchdog ()) && m_idleMinutes < m_config.watchdog ())
{ {
++m_repeatMsg; ++m_idleMinutes;
updateProgressBarFormat (true); updateProgressBarFormat (true);
} }
else else
{ {
m_repeatMsg = 0; m_idleMinutes = 0;
updateProgressBarFormat (false); updateProgressBarFormat (false);
} }
} }
@ -1440,7 +1440,7 @@ void MainWindow::updateProgressBarFormat (bool wd_in_use)
{ {
if (wd_in_use) if (wd_in_use)
{ {
progressBar.setFormat (QString {"%v/%m WD:%1m"}.arg (m_config.watchdog () - m_repeatMsg)); progressBar.setFormat (QString {"%v/%m WD:%1m"}.arg (m_config.watchdog () - m_idleMinutes));
} }
else else
{ {
@ -1611,8 +1611,8 @@ bool MainWindow::eventFilter (QObject * object, QEvent * event)
case QEvent::KeyPress: case QEvent::KeyPress:
// fall through // fall through
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
if (m_repeatMsg && !m_mode.startsWith ("WSPR") && m_config.watchdog () != 0) { if (m_idleMinutes && !m_mode.startsWith ("WSPR") && m_config.watchdog () != 0) {
m_repeatMsg = 0; // reset Tx watchdog m_idleMinutes = 0; // reset Tx watchdog
updateProgressBarFormat (true); updateProgressBarFormat (true);
} }
break; break;
@ -2342,11 +2342,11 @@ void MainWindow::readFromStdout() //readFromStdout
name[sizeof (name) - 1] = '\0'; name[sizeof (name) - 1] = '\0';
FILE* fp=fopen(name,"rb"); FILE* fp=fopen(name,"rb");
if(fp != NULL) { if(fp != NULL) {
int n,ia,ib; int ia,ib;
memset(dec_data.sred,0,4*5760); memset(dec_data.sred,0,4*5760);
n=fread(&ia,4,1,fp); fread(&ia,4,1,fp);
n=fread(&ib,4,1,fp); fread(&ib,4,1,fp);
n=fread(&dec_data.sred[ia-1],4,ib-ia+1,fp); fread(&dec_data.sred[ia-1],4,ib-ia+1,fp);
m_wideGraph->drawRed(ia,ib); m_wideGraph->drawRed(ia,ib);
} }
@ -2637,7 +2637,7 @@ void MainWindow::guiUpdate()
} }
if (!m_mode.startsWith ("WSPR") && m_config.watchdog() if (!m_mode.startsWith ("WSPR") && m_config.watchdog()
&& m_repeatMsg >= m_config.watchdog ()) { && m_idleMinutes >= m_config.watchdog ()) {
m_bTxTime=false; m_bTxTime=false;
if (m_tune) stop_tuning (); if (m_tune) stop_tuning ();
if (m_auto) auto_tx_mode (false); if (m_auto) auto_tx_mode (false);
@ -2866,7 +2866,7 @@ void MainWindow::guiUpdate()
auto const& current_message = QString::fromLatin1 (msgsent); auto const& current_message = QString::fromLatin1 (msgsent);
if(!m_mode.startsWith ("WSPR") && m_config.watchdog () != 0) { if(!m_mode.startsWith ("WSPR") && m_config.watchdog () != 0) {
if (current_message != m_msgSent0) { if (current_message != m_msgSent0) {
m_repeatMsg=0; // in case we are auto sequencing m_idleMinutes=0; // in case we are auto sequencing
m_msgSent0 = current_message; m_msgSent0 = current_message;
} }
updateProgressBarFormat (true); updateProgressBarFormat (true);
@ -2953,12 +2953,12 @@ void MainWindow::guiUpdate()
} }
} }
} else if(m_monitoring) { } else if(m_monitoring) {
if (m_repeatMsg < m_config.watchdog ()) { if (m_idleMinutes < m_config.watchdog ()) {
tx_status_label.setStyleSheet("QLabel{background-color: #00ff00}"); tx_status_label.setStyleSheet("QLabel{background-color: #00ff00}");
tx_status_label.setText ("Receiving"); tx_status_label.setText ("Receiving");
} }
transmitDisplay(false); transmitDisplay(false);
} else if (!m_diskData && m_repeatMsg < m_config.watchdog ()) { } else if (!m_diskData && m_idleMinutes < m_config.watchdog ()) {
tx_status_label.setStyleSheet(""); tx_status_label.setStyleSheet("");
tx_status_label.setText(""); tx_status_label.setText("");
} }
@ -3023,7 +3023,7 @@ void MainWindow::stopTx()
m_btxok = false; m_btxok = false;
m_transmitting = false; m_transmitting = false;
g_iptt=0; g_iptt=0;
if (m_repeatMsg < m_config.watchdog ()) { if (m_idleMinutes < m_config.watchdog ()) {
tx_status_label.setStyleSheet(""); tx_status_label.setStyleSheet("");
tx_status_label.setText(""); tx_status_label.setText("");
} }
@ -5263,8 +5263,8 @@ void MainWindow::replyToCQ (QTime time, qint32 snr, float delta_time, quint32 de
// find the linefeed at the end of the line // find the linefeed at the end of the line
position = ui->decodedTextBrowser->toPlainText().indexOf("\n",position); position = ui->decodedTextBrowser->toPlainText().indexOf("\n",position);
processMessage (messages, position, false); processMessage (messages, position, false);
if (m_repeatMsg && !m_mode.startsWith ("WSPR") && m_config.watchdog () != 0) { if (m_idleMinutes && !m_mode.startsWith ("WSPR") && m_config.watchdog () != 0) {
m_repeatMsg = 0; // reset Tx watchdog m_idleMinutes = 0; // reset Tx watchdog
updateProgressBarFormat (true); updateProgressBarFormat (true);
} }
QApplication::alert (this); QApplication::alert (this);
@ -5719,7 +5719,7 @@ void MainWindow::statusUpdate () const
{ {
if (ui) if (ui)
{ {
bool watchdog_timeout = !m_mode.startsWith("WSPR") && m_config.watchdog () && m_repeatMsg >= m_config.watchdog (); bool watchdog_timeout = !m_mode.startsWith("WSPR") && m_config.watchdog () && m_idleMinutes >= m_config.watchdog ();
m_messageClient->status_update (m_freqNominal, m_mode, m_hisCall, m_messageClient->status_update (m_freqNominal, m_mode, m_hisCall,
QString::number (ui->rptSpinBox->value ()), QString::number (ui->rptSpinBox->value ()),
m_modeTx, ui->autoButton->isChecked (), m_modeTx, ui->autoButton->isChecked (),

2
mainwindow.h
View File

@ -351,7 +351,7 @@ private:
qint32 m_inGain; qint32 m_inGain;
qint32 m_ncw; qint32 m_ncw;
qint32 m_secID; qint32 m_secID;
qint32 m_repeatMsg; qint32 m_idleMinutes;
qint32 m_nSubMode; qint32 m_nSubMode;
qint32 m_nclearave; qint32 m_nclearave;
qint32 m_minSync; qint32 m_minSync;