From 91fbeff072a602012569be8154cdb141367e3b59 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 26 Jun 2017 15:24:56 +0000 Subject: [PATCH] Many GUI adjustments for FT8. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7736 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- Configuration.cpp | 2 +- lib/decoder.f90 | 6 +++--- lib/fsk4hf/ft8b.f90 | 4 ++-- lib/ft8_decode.f90 | 5 +++-- mainwindow.cpp | 42 ++++++++++++++++++++++++++++-------------- mainwindow.h | 1 + 6 files changed, 38 insertions(+), 22 deletions(-) diff --git a/Configuration.cpp b/Configuration.cpp index 170473735..46bd21c7c 100644 --- a/Configuration.cpp +++ b/Configuration.cpp @@ -2433,7 +2433,7 @@ bool Configuration::impl::load_audio_devices (QAudio::Mode mode, QComboBox * com Q_FOREACH (auto const& p, QAudioDeviceInfo::availableDevices (mode)) { - qDebug () << "Audio device: input:" << (QAudio::AudioInput == mode) << "name:" << p.deviceName () << "preferred format:" << p.preferredFormat () << "endians:" << p.supportedByteOrders () << "codecs:" << p.supportedCodecs () << "channels:" << p.supportedChannelCounts () << "rates:" << p.supportedSampleRates () << "sizes:" << p.supportedSampleSizes () << "types:" << p.supportedSampleTypes (); +// qDebug () << "Audio device: input:" << (QAudio::AudioInput == mode) << "name:" << p.deviceName () << "preferred format:" << p.preferredFormat () << "endians:" << p.supportedByteOrders () << "codecs:" << p.supportedCodecs () << "channels:" << p.supportedChannelCounts () << "rates:" << p.supportedSampleRates () << "sizes:" << p.supportedSampleSizes () << "types:" << p.supportedSampleTypes (); // convert supported channel counts into something we can store in the item model QList channel_counts; diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 12e49263c..83c290180 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -54,9 +54,9 @@ subroutine multimode_decoder(ss,id2,params,nfsample) ! We're in FT8 mode call timer('decft8 ',0) call my_ft8%decode(ft8_decoded,ss,id2,params%nfqso, & - newdat9,params%npts8,params%nfa,params%nfsplit,params%nfb, & - params%ntol,params%nzhsym,logical(params%nagain),params%ndepth, & - params%nmode,params%nsubmode,params%nexp_decode) + newdat9,params%npts8,params%nutc,params%nfa,params%nfsplit, & + params%nfb,params%ntol,params%nzhsym,logical(params%nagain), & + params%ndepth,params%nmode,params%nsubmode,params%nexp_decode) call timer('decft8 ',1) go to 800 endif diff --git a/lib/fsk4hf/ft8b.f90 b/lib/fsk4hf/ft8b.f90 index 4e2e384d7..2d5bd2e5a 100644 --- a/lib/fsk4hf/ft8b.f90 +++ b/lib/fsk4hf/ft8b.f90 @@ -78,11 +78,11 @@ subroutine ft8b(datetime,s,candidate,ncand) call extractmessage174(decoded,message,ncrcflag,recent_calls,nrecent) nsnr=nint(10.0*log10(sync) - 25.5) !### empirical ### write(*,1112) datetime(8:13),nsnr,xdt,nint(f1),message -1112 format(a6,i4,f5.1,i6,2x,a22) +1112 format(a6,i4,f5.1,i6," ~ ",a22) endif write(13,1110) datetime,0,nsnr,xdt,f1,xdta,f1a, & nharderrors,dmin,message -1110 format(a13,2i4,2(f6.2,f7.1),i4,2x,f6.2,2x,a22) +1110 format(a13,2i4,2(f6.2,f7.1),i4,' ~ ',f6.2,2x,a22) enddo return diff --git a/lib/ft8_decode.f90 b/lib/ft8_decode.f90 index caeda4d22..527ba8148 100644 --- a/lib/ft8_decode.f90 +++ b/lib/ft8_decode.f90 @@ -23,7 +23,7 @@ module ft8_decode contains - subroutine decode(this,callback,ss,iwave,nfqso,newdat,npts8,nfa, & + subroutine decode(this,callback,ss,iwave,nfqso,newdat,npts8,nutc,nfa, & nfsplit,nfb,ntol,nzhsym,nagain,ndepth,nmode,nsubmode,nexp_decode) use timer_module, only: timer @@ -39,7 +39,8 @@ contains integer*2 iwave(15*12000) character*13 datetime - datetime="000000_000000" !### TEMPORARY ### + write(datetime,1001) nutc !### TEMPORARY ### +1001 format("000000_",i6.6) call sync8(iwave,s,candidate,ncand) call ft8b(datetime,s,candidate,ncand) diff --git a/mainwindow.cpp b/mainwindow.cpp index c6318f06a..5af5dfad1 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -157,9 +157,12 @@ namespace bool message_is_73 (int type, QStringList const& msg_parts) { - return type >= 0 - && (((type < 6 || 7 == type) && msg_parts.contains ("73")) - || (type == 6 && !msg_parts.filter ("73").isEmpty ())); + bool b; + b = type >= 0 + && (((type < 6 || 7 == type) + && (msg_parts.contains ("73") or msg_parts.contains ("RR73"))) + || (type == 6 && !msg_parts.filter ("73").isEmpty ())); + return b; } int ms_minute_error () @@ -2185,7 +2188,6 @@ void MainWindow::read_wav_file (QString const& fname) auto n = file.read (reinterpret_cast (dec_data.d2), std::min (max_bytes, file.size ())); int frames_read = n / bytes_per_frame; -// qDebug() << "a" << max_bytes << n << frames_read << frames_read/12000.0 << m_TRperiod; // zero unfilled remaining sample space std::memset(&dec_data.d2[frames_read],0,max_bytes - n); if (11025 == file.format ().sampleRate ()) { @@ -2354,7 +2356,7 @@ void MainWindow::decode() //decode() { if(!m_dataAvailable or m_TRperiod==0) return; ui->DecodeButton->setChecked (true); - if(!dec_data.params.nagain && m_diskData && !m_bFastMode) { + if(!dec_data.params.nagain && m_diskData && !m_bFastMode && m_mode!="FT8") { dec_data.params.nutc=dec_data.params.nutc/100; } if(dec_data.params.nagain==0 && dec_data.params.newdat==1 && (!m_diskData)) { @@ -2698,6 +2700,7 @@ void MainWindow::readFromStdout() //readFromStdout } m_QSOText=decodedtext; } + if(m_mode=="FT8") FT8_AutoSeq(decodedtext.string()); postDecode (true, decodedtext.string ()); @@ -2725,6 +2728,17 @@ void MainWindow::readFromStdout() //readFromStdout } } +void MainWindow::FT8_AutoSeq(QString message) +{ + int i1=message.indexOf(m_baseCall); + int i2=message.indexOf(m_hisCall); + if(i1>10 and i2>i1+3) { + if ((message.indexOf (" 73") < 0 || m_ntx != 6)) { + processMessage (message,43,false); + } + } +} + void MainWindow::pskPost(DecodedText decodedtext) { QString msgmode=m_mode; @@ -3478,13 +3492,13 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl QString t2 = messages.mid(i1,position-i1); //selected line QString t2a; int ntsec=3600*t2.mid(0,2).toInt() + 60*t2.mid(2,2).toInt(); - if(m_bFastMode) { + if(m_bFastMode or m_mode=="FT8") { ntsec = ntsec + t2.mid(4,2).toInt(); t2a=t2.mid(0,4) + t2.mid(6,-1); //Change hhmmss to hhmm for the message parser } else { t2a=t2.left (44); // strip and quality info trailing the decoded message } - if(m_bFastMode) { + if(m_bFastMode or m_mode=="FT8") { i1=t2a.indexOf(" CQ "); if(i1>10) { bool ok; @@ -3542,7 +3556,6 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl qDebug () << "Not processing message - hiscall:" << hiscall << "hisgrid:" << hisgrid; return; } - // only allow automatic mode changes between JT9 and JT65, and when not transmitting if (!m_transmitting and m_mode == "JT9+JT65") { if (decodedtext.isJT9()) @@ -3561,8 +3574,9 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl return; } + QString firstcall = decodedtext.call(); - if(!m_bFastMode and !m_config.enable_VHF_features()) { + if(!m_bFastMode and !m_config.enable_VHF_features() and m_mode!="FT8") { // Don't change Tx freq if in a fast mode, or VHF features enabled; also not if a // station is calling me, unless m_lockTxFreq is true or CTRL is held down. if ((firstcall!=m_config.my_callsign () and firstcall != m_baseCall) or @@ -3621,6 +3635,7 @@ void MainWindow::processMessage(QString const& messages, int position, bool ctrl if(n>=15) n=16; rpt=QString::number(n); } + ui->rptSpinBox->setValue(n); if(m_nTx73==0) genStdMsgs(rpt); //Don't genStdMsgs if we're already sending 73. @@ -4291,8 +4306,8 @@ void MainWindow::on_actionFT8_triggered() m_TRperiod=15; m_fastGraph->hide(); m_wideGraph->show(); - ui->decodedTextLabel->setText("UTC dB DT Freq Message"); - ui->decodedTextLabel2->setText("UTC dB DT Freq Message"); + ui->decodedTextLabel->setText( " UTC dB DT Freq Message"); + ui->decodedTextLabel2->setText(" UTC dB DT Freq Message"); m_wideGraph->setPeriod(m_TRperiod,m_nsps); m_modulator->setPeriod(m_TRperiod); // TODO - not thread safe m_detector->setPeriod(m_TRperiod); // TODO - not thread safe @@ -4556,9 +4571,8 @@ void MainWindow::on_actionISCAT_triggered() void MainWindow::on_actionMSK144_triggered() { -// displayWidgets(nWidgets("101111110100000000010001")); - displayWidgets(nWidgets("101111111100000000010001")); -// displayWidgets(nWidgets("111111110101111100010001")); + displayWidgets(nWidgets("101111110100000000010001")); +// displayWidgets(nWidgets("101111111100000000010001")); m_mode="MSK144"; m_modeTx="MSK144"; ui->actionMSK144->setChecked(true); diff --git a/mainwindow.h b/mainwindow.h index 741e8ec1e..dbefab216 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -294,6 +294,7 @@ private: private: void astroUpdate (); void writeAllTxt(QString message); + void FT8_AutoSeq(QString message); NetworkAccessManager m_network_manager; bool m_valid;