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

Revert "Fix some logical issues with auto-sequening with ActiveStations window. Enable ARRL_DIGI label display."

Browse Source 
This reverts commit 36d11fc561.
This commit is contained in:
Joe Taylor 2022-04-11 11:04:46 -04:00
parent 708342f40a
commit 400957af0c
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
widgets/mainwindow.cpp
View File

@ -1555,7 +1555,7 @@ void MainWindow::dataSink(qint64 frames)
if(m_mode=="FT8") { if(m_mode=="FT8") {
to_jt9(m_ihsym,-1,-1); //Allow jt9 to bail out early, if necessary to_jt9(m_ihsym,-1,-1); //Allow jt9 to bail out early, if necessary
if(m_ihsym==40 and m_decoderBusy) { if(m_ihsym==40 and m_decoderBusy) {
// qDebug() << "Clearing hung decoder status"; qDebug() << "Clearing hung decoder status";
decodeDone(); //Clear a hung decoder status decodeDone(); //Clear a hung decoder status
} }
} }
@ -3754,12 +3754,12 @@ void MainWindow::readFromStdout() //readFromStdout
for_us = false; for_us = false;
} }
} }
bool bActiveStations=false;
if(m_bCallingCQ && !m_bAutoReply && for_us && SpecOp::FOX > m_config.special_op_id()) { if(m_bCallingCQ && !m_bAutoReply && for_us && SpecOp::FOX > m_config.special_op_id()) {
bool bActiveStations=false;
if(ui->respondComboBox->currentText()=="CQ: First") bActiveStations=true; if(ui->respondComboBox->currentText()=="CQ: First") bActiveStations=true;
if(ui->respondComboBox->currentText()=="CQ: Max Dist" and m_ActiveStationsWidget==NULL) bActiveStations=true; if(ui->respondComboBox->currentText()=="CQ: Max Dist" and m_ActiveStationsWidget==NULL) bActiveStations=true;
if(m_ActiveStationsWidget!=NULL and m_ActiveStationsWidget->isVisible()) bActiveStations=true; if(m_ActiveStationsWidget!=NULL and !m_ActiveStationsWidget->isVisible()) bActiveStations=true;
if(bActiveStations) { if(bActiveStations) {
m_bDoubleClicked=true; m_bDoubleClicked=true;
m_bAutoReply = true; m_bAutoReply = true;
@ -3792,8 +3792,7 @@ void MainWindow::readFromStdout() //readFromStdout
m_bDoubleClicked=true; m_bDoubleClicked=true;
ui->dxCallEntry->setText(deCall); ui->dxCallEntry->setText(deCall);
int m_ntx=2; int m_ntx=2;
bool bContest=m_config.special_op_id()==SpecOp::NA_VHF or m_config.special_op_id()==SpecOp::ARRL_DIGI or bool bContest=m_config.special_op_id()==SpecOp::NA_VHF or m_config.special_op_id()==SpecOp::ARRL_DIGI;
m_config.special_op_id()==SpecOp::WW_DIGI;
if(bContest) m_ntx=3; if(bContest) m_ntx=3;
if(deGrid.contains(grid_regexp)) { if(deGrid.contains(grid_regexp)) {
m_deGrid=deGrid; m_deGrid=deGrid;
@ -3801,10 +3800,8 @@ void MainWindow::readFromStdout() //readFromStdout
} else { } else {
m_ntx=3; m_ntx=3;
} }
if(deGrid.contains("R+") or deGrid.contains("R-") or deGrid.contains("R ")) m_ntx=4;
if(m_ntx==2) m_QSOProgress = REPORT; if(m_ntx==2) m_QSOProgress = REPORT;
if(m_ntx==3) m_QSOProgress = ROGER_REPORT; if(m_ntx==3) m_QSOProgress = ROGER_REPORT;
if(m_ntx==4) m_QSOProgress = ROGERS;
genStdMsgs(QString::number(decodedtext.snr())); genStdMsgs(QString::number(decodedtext.snr()));
ui->RxFreqSpinBox->setValue(decodedtext.frequencyOffset()); ui->RxFreqSpinBox->setValue(decodedtext.frequencyOffset());
setTxMsg(m_ntx); setTxMsg(m_ntx);
@ -9644,7 +9641,6 @@ void MainWindow::chkFT4()
if(SpecOp::FIELD_DAY==m_config.special_op_id()) t0+="Field Day"; if(SpecOp::FIELD_DAY==m_config.special_op_id()) t0+="Field Day";
if(SpecOp::RTTY==m_config.special_op_id()) t0+="RTTY"; if(SpecOp::RTTY==m_config.special_op_id()) t0+="RTTY";
if(SpecOp::WW_DIGI==m_config.special_op_id()) t0+="WW_DIGI"; if(SpecOp::WW_DIGI==m_config.special_op_id()) t0+="WW_DIGI";
if(SpecOp::ARRL_DIGI==m_config.special_op_id()) t0+="ARRL_DIGI";
if(t0=="") { if(t0=="") {
ui->labDXped->setVisible(false); ui->labDXped->setVisible(false);
} else { } else {