w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-13 03:08:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release-2.4.0'

Browse Source
This commit is contained in:
Bill Somerville
2021-03-25 15:31:57 +00:00
parent d089b3b8fd 6da0e11f27
commit cf0f9b013e
25 changed files with 6069 additions and 6317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
widgets/mainwindow.cpp
+15 -10
View File
@@ -1443,6 +1443,7 @@ void MainWindow::dataSink(qint64 frames)
dec_data.params.ndiskdat=1;
} else {
dec_data.params.ndiskdat=0;
m_wideGraph->setDiskUTC(-1);
}
m_bUseRef=m_wideGraph->useRef();
@@ -2864,6 +2865,7 @@ void MainWindow::on_actionDecode_remaining_files_in_directory_triggered()
void MainWindow::diskDat() //diskDat()
{
m_wideGraph->setDiskUTC(dec_data.params.nutc);
if(dec_data.params.kin>0) {
int k;
int kstep=m_FFTSize;
@@ -3680,7 +3682,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler
// auto stop to avoid accidental QRM
ui->stopTxButton->click (); // halt any transmission
} else if (m_auto // transmit allowed
&& ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked() // auto-sequencing allowed
&& ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isEnabled () && ui->cbAutoSeq->isChecked () // auto-sequencing allowed
&& ((!m_bCallingCQ // not calling CQ/QRZ
&& !m_sentFirst73 // not finished QSO
&& ((message_words.at (1).contains (m_baseCall)
@@ -4229,10 +4231,13 @@ void MainWindow::guiUpdate()
if(m_config.id_after_73 ()) {
icw[0] = m_ncw;
}
if((m_config.prompt_to_log() or m_config.autoLog()) && !m_tune && CALLING != m_QSOProgress) logQSOTimer.start(0);
if((m_config.prompt_to_log() or m_config.autoLog()) && !m_tune && CALLING != m_QSOProgress)
{
logQSOTimer.start(0);
}
}
bool b=(m_mode=="FT8" or m_mode=="FT4") and ui->cbAutoSeq->isChecked();
bool b=(m_mode=="FT8" or m_mode=="FT4") and ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isEnabled () && ui->cbAutoSeq->isChecked ();
if(is_73 and (m_config.disable_TX_on_73() or b)) {
m_nextCall=""; //### Temporary: disable use of "TU;" messages;
if(m_nextCall!="") {
@@ -4517,7 +4522,7 @@ void MainWindow::stopTx2()
{
m_config.transceiver_ptt (false); //Lower PTT
if (m_mode == "JT9" && m_bFast9
&& ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked()
&& ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isEnabled () && ui->cbAutoSeq->isChecked ()
&& m_ntx == 5 && m_nTx73 >= 5) {
on_stopTxButton_clicked ();
m_nTx73 = 0;
@@ -4785,6 +4790,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
auto shift = modifiers.testFlag (Qt::ShiftModifier);
auto ctrl = modifiers.testFlag (Qt::ControlModifier);
// auto alt = modifiers.testFlag (Qt::AltModifier);
auto auto_seq = ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isEnabled () && ui->cbAutoSeq->isChecked ();
// basic mode sanity checks
auto const& parts = message.clean_string ().split (' ', SkipEmptyParts);
if (parts.size () < 5) return;
@@ -5231,8 +5237,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie
genStdMsgs (QString::number (ui->rptSpinBox->value ()));
}
if(m_transmitting) m_restart=true;
if (ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked ()
&& !m_bDoubleClicked && m_mode!="FT4") {
if (auto_seq && !m_bDoubleClicked && m_mode!="FT4") {
return;
}
if(m_config.quick_call() && m_bDoubleClicked) auto_tx_mode(true);
@@ -5875,7 +5880,7 @@ void MainWindow::on_logQSOButton_clicked() //Log QSO button
if (SpecOp::FOX != m_config.special_op_id ()
&& ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isEnabled () && ui->cbAutoSeq->isChecked ())
{
// ensure that auto Tx is disabled even if clear DX call & grid
// ensure that auto Tx is disabled even if disable Tx
// on 73 is not checked, unless in Fox mode where it is allowed
// to be a robot.
auto_tx_mode (false);
@@ -7097,8 +7102,8 @@ void MainWindow::setXIT(int n, Frequency base)
m_XIT = 0;
if (!m_bSimplex) {
// m_bSimplex is false, so we can use split mode if requested
if (m_config.split_mode () && (!m_config.enable_VHF_features () || m_mode == "FT8" ||
m_mode=="FST4")) {
if (m_config.split_mode () && (!m_config.enable_VHF_features () ||
m_mode=="FT4" || m_mode == "FT8" || m_mode=="FST4")) {
// Don't use XIT for VHF & up
m_XIT=(n/500)*500 - 1500;
}
@@ -7410,7 +7415,7 @@ void MainWindow::transmit (double snr)
// In auto-sequencing mode, stop after 5 transmissions of "73" message.
if (m_bFastMode || m_bFast9) {
if (ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked ()) {
if (ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isEnabled () && ui->cbAutoSeq->isChecked ()) {
if(m_ntx==5) {
m_nTx73 += 1;
} else {