From 428bb96ce81e5cf66be3d544bbfffcf92966e344 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 22 Apr 2020 11:34:06 -0400 Subject: [PATCH] Temporary commit to help in finding a bug. --- widgets/mainwindow.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 38451caa6..11910fe8a 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1409,7 +1409,7 @@ void MainWindow::dataSink(qint64 frames) if(m_mode=="FT8") { to_jt9(m_ihsym,-1,-1); //Allow jt9 to bail out early, if necessary if(m_ihsym==40 and m_decoderBusy) { - qDebug() << "ff Clearing hung decoder status"; + qDebug() << "Clearing hung decoder status"; decodeDone(); //Clear a hung decoder status m_blankLine=true; } @@ -2668,7 +2668,11 @@ void MainWindow::read_wav_file (QString const& fname) } if(basename.mid(0,10)=="000000_000" && m_mode == "FT8") { - dec_data.params.nutc=15*basename.mid(10,3).toInt(); + int isec=15*basename.mid(10,3).toInt(); + int ih=isec/3600; + int im=(isec-3600*ih)/60; + isec=isec%60; + dec_data.params.nutc=3600*ih+60*im+isec; } })); @@ -3362,7 +3366,7 @@ void MainWindow::auto_sequence (DecodedText const& message, unsigned start_toler || message_words.contains ("DE"))) || !message.isStandardMessage ()); // free text 73/RR73 - QStringList w=message.string().mid(24).remove("<").remove(">").split(" ",QString::SkipEmptyParts); + QStringList w=message.string().mid(22).remove("<").remove(">").split(" ",QString::SkipEmptyParts); QString w2=w.at(2); int nrpt=0; if(w.size()>3) { @@ -3699,6 +3703,7 @@ void MainWindow::guiUpdate() QByteArray ba; QByteArray ba0; + qDebug() << "aa"; if(m_mode.startsWith ("WSPR")) { QString sdBm,msg0,msg1,msg2; sdBm.sprintf(" %d",m_dBm); @@ -3940,6 +3945,7 @@ void MainWindow::guiUpdate() } } } + qDebug() << "bb"; m_restart=false; //---------------------------------------------------------------------- } else { @@ -3956,7 +3962,6 @@ void MainWindow::guiUpdate() } } } - if (g_iptt == 1 && m_iptt0 == 0) { auto const& current_message = QString::fromLatin1 (msgsent); if(m_config.watchdog () && !m_mode.startsWith ("WSPR") @@ -3988,7 +3993,6 @@ void MainWindow::guiUpdate() transmitDisplay (true); statusUpdate (); } - if(!m_btxok && m_btxok0 && g_iptt==1) stopTx(); if(m_startAnother) { @@ -4581,7 +4585,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie nrpt=w34.toInt(); w34=w.at(4); } - bool bEU_VHF_w2=(nrpt>=520001 and nrpt<=594000); if(bEU_VHF_w2 and SpecOp::EU_VHF!=m_config.special_op_id()) { // Switch automatically to EU VHF Contest mode @@ -4612,6 +4615,7 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie n=w34.toInt(); bool bRTTY = (n>=529 and n<=599); + if(bRTTY and SpecOp::RTTY != m_config.special_op_id()) { // ### Should be in RTTY contest mode ??? ### MessageBox::information_message (this, tr ("Should you switch to RTTY contest mode?")); @@ -4850,7 +4854,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie m_gen_message_is_cq = false; } } - // if we get here then we are reacting to the message if (m_bAutoReply) m_bCallingCQ = CALLING == m_QSOProgress; if (ui->RxFreqSpinBox->isEnabled () and m_mode != "MSK144" and !shift) { @@ -4918,7 +4921,6 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie } } } - if(m_transmitting) m_restart=true; if (ui->cbAutoSeq->isVisible () && ui->cbAutoSeq->isChecked () && !m_bDoubleClicked && m_mode!="FT4") {