From 06849ac2cea68d64bb7e6e5b32b5c07684461a37 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 31 Aug 2022 11:18:40 -0400 Subject: [PATCH 1/6] Change the order of parameters displayed in Echo mode: DF, SNR, dBerr come last. --- widgets/mainwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index efe97d8b7..875d0bec1 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1620,8 +1620,8 @@ void MainWindow::dataSink(qint64 frames) if(m_monitoring or m_auto or m_diskData) { QString t; - t = t.asprintf("%3d %7.1f %7.1f %7.1f %6d %7d %7.1f %3d",echocom_.nsum,xlevel,sigdb, - dBerr,qRound(dfreq),nDopTotal,width,nqual); + t = t.asprintf("%4.1f %7d %7.1f %7d %7d %7d %7.1f %7.1f",xlevel,nDopTotal,width,echocom_.nsum, + nqual,qRound(dfreq),sigdb,dBerr); QString t0; if(m_diskData) { t0=t0.asprintf("%06d ",m_UTCdisk); @@ -7106,7 +7106,7 @@ void MainWindow::on_actionEcho_triggered() m_bFastMode=false; m_bFast9=false; WSPR_config(true); - ui->lh_decodes_headings_label->setText(" UTC N Level SNR dBerr DF Doppler Width Q"); + ui->lh_decodes_headings_label->setText(" UTC Level Doppler Width N Q DF SNR dBerr"); // 01234567890123456789012345678901234567 displayWidgets(nWidgets("00000000000000000010001000000000000000")); fast_config(false); From 8f8ee53b6f6cd0afaa3d69bfe5d85a259616253f Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 31 Aug 2022 11:52:43 -0400 Subject: [PATCH 2/6] Make the "Doppler tracking" checkbox sticky. --- widgets/astro.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/widgets/astro.cpp b/widgets/astro.cpp index e5f338c64..8e0ec8529 100644 --- a/widgets/astro.cpp +++ b/widgets/astro.cpp @@ -55,7 +55,6 @@ Astro::Astro(QSettings * settings, Configuration const * configuration, QWidget Astro::~Astro () { - ui_->cbDopplerTracking->setChecked (false); Q_EMIT tracking_update (); if (isVisible ()) write_settings (); } @@ -69,6 +68,8 @@ void Astro::closeEvent (QCloseEvent * e) void Astro::read_settings () { SettingsGroup g (settings_, "Astro"); + bool b=settings_->value("DopplerTracking",false).toBool(); + ui_->cbDopplerTracking->setChecked(b); ui_->doppler_widget->setVisible (ui_->cbDopplerTracking->isChecked ()); m_DopplerMethod=settings_->value("DopplerMethod",0).toInt(); switch (m_DopplerMethod) @@ -86,7 +87,7 @@ void Astro::read_settings () void Astro::write_settings () { SettingsGroup g (settings_, "Astro"); - //settings_->setValue ("DopplerTracking", ui_->cbDopplerTracking->isChecked ()); + settings_->setValue ("DopplerTracking", ui_->cbDopplerTracking->isChecked()); settings_->setValue ("DopplerMethod",m_DopplerMethod); settings_->setValue ("window/pos", pos ()); } From 1e893ecafdc9d8e567a10e70b56a71837b866147 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 31 Aug 2022 13:10:11 -0400 Subject: [PATCH 3/6] Add column headings to echosim screen output. --- lib/echosim.f90 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/echosim.f90 b/lib/echosim.f90 index 20d8354b4..bc15b0e98 100644 --- a/lib/echosim.f90 +++ b/lib/echosim.f90 @@ -31,7 +31,7 @@ program echosim call getarg(2,arg) read(arg,*) fdop !Doppler shift (Hz) call getarg(3,arg) - read(arg,*) fspread !Frequency spread (Hz) (JHT Lorentzian model) + read(arg,*) fspread !Frequency spread (Hz) (JHT Lorentzian model) call getarg(4,arg) read(arg,*) nfiles !Number of files call getarg(5,arg) @@ -45,6 +45,9 @@ program echosim if(snrdb.gt.90.0) sig=1.0 dphi=twopi*(f0+fdop)*dt + write(*,1000) +1000 format(' N f0 fDop fSpread SNR File name'/51('-')) + do ifile=1,nfiles phi=0.d0 do i=0,NWAVE-1 From 9e177a94968d5d555a5626a9235557d2d4b50fe9 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 31 Aug 2022 13:10:56 -0400 Subject: [PATCH 4/6] Display Echo-mode 'Level' with two decimal places. --- widgets/mainwindow.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 875d0bec1..b08ac2af4 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1620,7 +1620,7 @@ void MainWindow::dataSink(qint64 frames) if(m_monitoring or m_auto or m_diskData) { QString t; - t = t.asprintf("%4.1f %7d %7.1f %7d %7d %7d %7.1f %7.1f",xlevel,nDopTotal,width,echocom_.nsum, + t = t.asprintf("%5.2f %7d %7.1f %7d %7d %7d %7.1f %7.1f",xlevel,nDopTotal,width,echocom_.nsum, nqual,qRound(dfreq),sigdb,dBerr); QString t0; if(m_diskData) { @@ -7106,7 +7106,7 @@ void MainWindow::on_actionEcho_triggered() m_bFastMode=false; m_bFast9=false; WSPR_config(true); - ui->lh_decodes_headings_label->setText(" UTC Level Doppler Width N Q DF SNR dBerr"); + ui->lh_decodes_headings_label->setText(" UTC Level Doppler Width N Q DF SNR dBerr"); // 01234567890123456789012345678901234567 displayWidgets(nWidgets("00000000000000000010001000000000000000")); fast_config(false); From aea5184a6df9b59f875183ecf55ff81f67dae9da Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 31 Aug 2022 13:14:32 -0400 Subject: [PATCH 5/6] Bump the RC number to RC4. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2341257d3..b3767455e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ message (STATUS "******************************************************") include (set_build_type) # RC 0 or omitted is a development build, GA is a General Availability release build -set_build_type (RC 3) +set_build_type (RC 4) set (wsjtx_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${BUILD_TYPE_REVISION}") # From 036c612d415f81bb871dbb8425ab8d5df8a85f0c Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 31 Aug 2022 14:27:03 -0400 Subject: [PATCH 6/6] Add and implement menu item "File | Copy main text window to WSJT-X.txt". --- widgets/mainwindow.cpp | 25 +++++++++++++++++++++++++ widgets/mainwindow.h | 1 + widgets/mainwindow.ui | 8 +++++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index b08ac2af4..fa1874dbe 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -10000,3 +10000,28 @@ void MainWindow::on_jt65Button_clicked() } on_actionJT65_triggered(); } + +void MainWindow::on_actionCopy_to_WSJTX_txt_triggered() +{ + qDebug() << ui->decodedTextBrowser->toPlainText(); + + static QFile f {QDir {QStandardPaths::writableLocation (QStandardPaths::DataLocation)}.absoluteFilePath ("WSJT-X.txt")}; + if(!f.open(QIODevice::Text | QIODevice::WriteOnly)) { + MessageBox::warning_message (this, tr ("WSJT-X.txt file error"), + tr ("Cannot open \"%1\" for writing").arg (f.fileName ()), + tr ("Error: %1").arg (f.errorString ())); + } else { + QString t=ui->decodedTextBrowser->toPlainText(); + + QTextStream out(&f); + out << t << +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + endl +#else + Qt::endl +#endif + ; + f.close(); + } +} + diff --git a/widgets/mainwindow.h b/widgets/mainwindow.h index aa1796c4a..d3a6e0060 100644 --- a/widgets/mainwindow.h +++ b/widgets/mainwindow.h @@ -173,6 +173,7 @@ private slots: void on_actionOpen_next_in_directory_triggered(); void on_actionDecode_remaining_files_in_directory_triggered(); void on_actionDelete_all_wav_files_in_SaveDir_triggered(); + void on_actionCopy_to_WSJTX_txt_triggered(); void on_actionOpen_log_directory_triggered (); void on_actionNone_triggered(); void on_actionSave_all_triggered(); diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index f377631f2..c275a70e8 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -3026,6 +3026,8 @@ QLabel[oob="true"] { + + @@ -3036,7 +3038,6 @@ QLabel[oob="true"] { - @@ -3669,6 +3670,11 @@ QLabel[oob="true"] { Active Stations + + + Copy main text window to WSJT-X.txt + +