diff --git a/logqso.cpp b/logqso.cpp index ee06279a0..c3931422e 100644 --- a/logqso.cpp +++ b/logqso.cpp @@ -57,13 +57,10 @@ void LogQSO::storeSettings () const void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString mode, QString const& rptSent, QString const& rptRcvd, QDateTime const& dateTimeOn, QDateTime const& dateTimeOff, - Radio::Frequency dialFreq, QString const& myCall, QString const& myGrid, - bool noSuffix, bool toRTTY, bool dBtoComments, bool bFox, - bool bAutoLog, QString const& opCall, qint32 nContest, - QString xSent, QString xRcvd) + Radio::Frequency dialFreq, bool noSuffix, QString xSent, QString xRcvd) { if(!isHidden()) return; - m_nContest=nContest; + m_nContest = static_cast (m_config->special_op_id()); m_xSent=xSent; m_xRcvd=xRcvd; ui->call->setText(hisCall); @@ -73,27 +70,30 @@ void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString ui->comments->setText(""); if (ui->cbTxPower->isChecked ()) ui->txPower->setText(m_txPower); if (ui->cbComments->isChecked ()) ui->comments->setText(m_comments); - if(dBtoComments) { + if (m_config->report_in_comments()) { QString t=mode; if(rptSent!="") t+=" Sent: " + rptSent; if(rptRcvd!="") t+=" Rcvd: " + rptRcvd; ui->comments->setText(t); } if(noSuffix and mode.mid(0,3)=="JT9") mode="JT9"; - if(toRTTY and mode.mid(0,3)=="JT9") mode="RTTY"; + if(m_config->log_as_RTTY() and mode.mid(0,3)=="JT9") mode="RTTY"; ui->mode->setText(mode); ui->sent->setText(rptSent); ui->rcvd->setText(rptRcvd); ui->start_date_time->setDateTime (dateTimeOn); ui->end_date_time->setDateTime (dateTimeOff); m_dialFreq=dialFreq; - m_myCall=myCall; - m_myGrid=myGrid; + m_myCall=m_config->my_callsign(); + m_myGrid=m_config->my_grid(); ui->band->setText (m_config->bands ()->find (dialFreq)); - ui->loggedOperator->setText(opCall); + ui->loggedOperator->setText(m_config->opCall()); ui->exchSent->setText(m_xSent); ui->exchRcvd->setText(m_xRcvd); - if(bFox or bAutoLog) { + + using SpOp = Configuration::SpecialOperatingActivity; + if( SpOp::FOX == m_config->special_op_id() or + (m_config->autoLog() and SpOp::NONE < m_config->special_op_id()) ) { accept(); } else { show (); diff --git a/logqso.h b/logqso.h index e9099ee18..13d4f2c82 100644 --- a/logqso.h +++ b/logqso.h @@ -27,11 +27,8 @@ public: ~LogQSO(); void initLogQSO(QString const& hisCall, QString const& hisGrid, QString mode, QString const& rptSent, QString const& rptRcvd, QDateTime const& dateTimeOn, - QDateTime const& dateTimeOff, - Radio::Frequency dialFreq, QString const& myCall, QString const& myGrid, - bool noSuffix, bool toRTTY, bool dBtoComments, bool bFox, - bool bAutoLog, QString const& opCall, qint32 nContest, QString xSent, - QString xRcvd); + QDateTime const& dateTimeOff, Radio::Frequency dialFreq, + bool noSuffix, QString xSent, QString xRcvd); public slots: void accept(); diff --git a/mainwindow.cpp b/mainwindow.cpp index 544d6bd27..fdaccdf77 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -394,7 +394,6 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, ui->decodedTextBrowser2->set_configuration (&m_config); m_baseCall = Radio::base_callsign (m_config.my_callsign ()); - m_opCall = m_config.opCall(); m_optimizingProgress.setWindowModality (Qt::WindowModal); m_optimizingProgress.setAutoReset (false); @@ -1694,7 +1693,6 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog ui->actionInclude_correlation->setChecked(false); ui->actionEnable_AP_JT65->setVisible(false); } - m_opCall=m_config.opCall(); if(m_config.special_op_id()!=nContest0) ui->tx1->setEnabled(true); } } @@ -5267,14 +5265,9 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button cabLog(); //Call the Cabrillo contest logger } - bool bAutoLog=m_config.autoLog() and SpecOp::NONE < m_config.special_op_id(); - bool bFoxMode= SpecOp::FOX==m_config.special_op_id(); m_logDlg->initLogQSO (m_hisCall, grid, m_modeTx, m_rptSent, m_rptRcvd, m_dateTimeQSOOn, dateTimeQSOOff, m_freqNominal + - ui->TxFreqSpinBox->value(), m_config.my_callsign(), - m_config.my_grid(), m_noSuffix, m_config.log_as_RTTY(), - m_config.report_in_comments(), bFoxMode, - bAutoLog, m_opCall, (qint32) m_config.special_op_id(), m_xSent, m_xRcvd); + ui->TxFreqSpinBox->value(), m_noSuffix, m_xSent, m_xRcvd); } void MainWindow::cabLog()