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

Remove unused variable. Streamline contest button initialization.

Browse Source
This commit is contained in:
Steve Franke 2018-10-31 18:09:04 -05:00
parent be07912a02
commit 76ecac3e42
4 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Configuration.cpp
View File

@ -1202,27 +1202,7 @@ void Configuration::impl::initialize_models ()
ui_->single_decode_check_box->setChecked(single_decode_); ui_->single_decode_check_box->setChecked(single_decode_);
ui_->cbTwoPass->setChecked(twoPass_); ui_->cbTwoPass->setChecked(twoPass_);
ui_->gbSpecialOpActivity->setChecked(bSpecialOp_); ui_->gbSpecialOpActivity->setChecked(bSpecialOp_);
switch(SelectedActivity_) ui_->special_op_activity_button_group->button (SelectedActivity_)->setChecked (true);
{
case 1:
ui_->rbNA_VHF_Contest->setChecked(true);
break;
case 2:
ui_->rbEU_VHF_Contest->setChecked(true);
break;
case 3:
ui_->rbField_Day->setChecked(true);
break;
case 4:
ui_->rbRTTY_Roundup->setChecked(true);
break;
case 5:
ui_->rbRTTY_Roundup->setChecked(true);
break;
case 6:
ui_->rbRTTY_Roundup->setChecked(true);
break;
}
ui_->cbx2ToneSpacing->setChecked(x2ToneSpacing_); ui_->cbx2ToneSpacing->setChecked(x2ToneSpacing_);
ui_->cbx4ToneSpacing->setChecked(x4ToneSpacing_); ui_->cbx4ToneSpacing->setChecked(x4ToneSpacing_);
ui_->type_2_msg_gen_combo_box->setCurrentIndex (type_2_msg_gen_); ui_->type_2_msg_gen_combo_box->setCurrentIndex (type_2_msg_gen_);

1
logqso.cpp
View File

@ -60,7 +60,6 @@ void LogQSO::initLogQSO(QString const& hisCall, QString const& hisGrid, QString
Radio::Frequency dialFreq, bool noSuffix, QString xSent, QString xRcvd) Radio::Frequency dialFreq, bool noSuffix, QString xSent, QString xRcvd)
{ {
if(!isHidden()) return; if(!isHidden()) return;
m_nContest = static_cast<qint32> (m_config->special_op_id());
m_xSent=xSent; m_xSent=xSent;
m_xRcvd=xRcvd; m_xRcvd=xRcvd;
ui->call->setText(hisCall); ui->call->setText(hisCall);

1
logqso.h
View File

@ -58,7 +58,6 @@ private:
QString m_myGrid; QString m_myGrid;
QString m_xSent; QString m_xSent;
QString m_xRcvd; QString m_xRcvd;
qint32 m_nContest;
QDateTime m_dateTimeOn; QDateTime m_dateTimeOn;
QDateTime m_dateTimeOff; QDateTime m_dateTimeOff;
}; };

4
mainwindow.cpp
View File

@ -1179,7 +1179,7 @@ void MainWindow::readSettings()
void MainWindow::checkMSK144ContestType() void MainWindow::checkMSK144ContestType()
{ {
if(SpecOp::NONE < m_config.special_op_id()) if(SpecOp::NONE != m_config.special_op_id())
{ {
if(m_mode=="MSK144" && SpecOp::EU_VHF < m_config.special_op_id()) if(m_mode=="MSK144" && SpecOp::EU_VHF < m_config.special_op_id())
{ {
@ -5259,7 +5259,7 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
default: break; default: break;
} }
if(m_config.special_op_id()>SpecOp::NONE and SpecOp::FOX > m_config.special_op_id()) { if(SpecOp::NONE < m_config.special_op_id() and SpecOp::FOX > m_config.special_op_id()) {
int n=ui->sbSerialNumber->value(); int n=ui->sbSerialNumber->value();
ui->sbSerialNumber->setValue(n+1); ui->sbSerialNumber->setValue(n+1);
cabLog(); //Call the Cabrillo contest logger cabLog(); //Call the Cabrillo contest logger