Clean up some DXped code.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8354 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-19 21:50:53 +00:00
parent b3213ecb6d
commit 32c5490f55

View File

@ -4862,10 +4862,6 @@ void MainWindow::displayWidgets(qint64 n)
if(i==31) ui->cbRxAll->setVisible(b); if(i==31) ui->cbRxAll->setVisible(b);
j=j>>1; j=j>>1;
} }
// ui->cbFirst->setVisible ("FT8" == m_mode);
// ui->cbVHFcontest->setVisible(m_mode=="FT8" or m_mode=="MSK144");
// ui->measure_check_box->setChecked (false);
// ui->measure_check_box->setVisible ("FreqCal" == m_mode);
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);
} }
@ -4926,7 +4922,8 @@ void MainWindow::on_actionFT8_triggered()
ui->txb6->setEnabled(true); ui->txb6->setEnabled(true);
if(m_config.bFox()) { if(m_config.bFox()) {
ui->txFirstCheckBox->setChecked(true); ui->txFirstCheckBox->setChecked(true);
ui->txFirstCheckBox->setChecked(true); ui->txFirstCheckBox->setEnabled(false);
ui->cbAutoSeq->setEnabled(false);
ui->tabWidget->setCurrentIndex(2); ui->tabWidget->setCurrentIndex(2);
ui->TxFreqSpinBox->setValue(300); ui->TxFreqSpinBox->setValue(300);
displayWidgets(nWidgets("11101000010011100001000010000010")); displayWidgets(nWidgets("11101000010011100001000010000010"));
@ -4934,7 +4931,8 @@ void MainWindow::on_actionFT8_triggered()
} }
if(m_config.bHound()) { if(m_config.bHound()) {
ui->txFirstCheckBox->setChecked(false); ui->txFirstCheckBox->setChecked(false);
ui->txFirstCheckBox->setChecked(true); ui->txFirstCheckBox->setEnabled(false);
ui->cbAutoSeq->setEnabled(false);
ui->tabWidget->setCurrentIndex(0); ui->tabWidget->setCurrentIndex(0);
ui->cbHoldTxFreq->setChecked(true); ui->cbHoldTxFreq->setChecked(true);
displayWidgets(nWidgets("11101000010011100001000010000011")); displayWidgets(nWidgets("11101000010011100001000010000011"));
@ -7362,6 +7360,7 @@ void MainWindow::foxRxSequencer(QString houndCall, QString houndGrid)
* message appears for slot i, we queue its message to be repeated. * message appears for slot i, we queue its message to be repeated.
*/ */
qDebug() << "AA" << houndCall << houndGrid;
for(int i=0; i<m_Nslots; i++) { for(int i=0; i<m_Nslots; i++) {
if(m_foxMsgSent[i].contains(houndCall + " ")) { if(m_foxMsgSent[i].contains(houndCall + " ")) {
m_houndRptRcvd[i]=houndGrid.mid(1); m_houndRptRcvd[i]=houndGrid.mid(1);
@ -7421,7 +7420,9 @@ TxTimeout:
QDateTime now {QDateTime::currentDateTimeUtc ()}; QDateTime now {QDateTime::currentDateTimeUtc ()};
QString logLine=now.toString("yyyy-MM-dd hh:mm") + " " + m_hisCall + QString logLine=now.toString("yyyy-MM-dd hh:mm") + " " + m_hisCall +
" " + m_hisGrid + " " + m_rptSent + " " + m_rptRcvd + " " + m_lastBand; " " + m_hisGrid + " " + m_rptSent + " " + m_rptRcvd + " " + m_lastBand;
if(m_msgAvgWidget->isVisible()) m_msgAvgWidget->displayAvg(logLine); if(m_msgAvgWidget != NULL and m_msgAvgWidget->isVisible()) {
m_msgAvgWidget->displayAvg(logLine);
}
on_logQSOButton_clicked(); on_logQSOButton_clicked();
m_loggedByFox[m_hisCall] += (m_lastBand + " "); m_loggedByFox[m_hisCall] += (m_lastBand + " ");