From ffe11cbb81fb5e2ca8d88fcec7d7e3548dbb1506 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 23 Oct 2021 00:01:50 +0100 Subject: [PATCH 1/5] Repair excess main window width regression --- widgets/mainwindow.ui | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index ef9c32bd9..6ba2a455b 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -1276,7 +1276,7 @@ When not checked you can view the calibration results. - + 0 0 @@ -1329,7 +1329,7 @@ When not checked you can view the calibration results. - + 0 0 @@ -1980,12 +1980,6 @@ Double click to toggle the use of the Tx1 message to start a QSO with a station - - - 0 - 0 - - Enter a free text message (maximum 13 characters) or select a predefined macro from the dropdown list. @@ -1998,6 +1992,9 @@ list. The list can be maintained in Settings (F2). QComboBox::InsertAtBottom + + QComboBox::AdjustToMinimumContentsLength + @@ -2028,7 +2025,7 @@ Double-click to reset to the standard 73 message 2 - + @@ -2308,6 +2305,9 @@ Double-click to reset to the standard 73 message 16777215 + + QAbstractScrollArea::AdjustToContentsOnFirstShow + @@ -2875,14 +2875,6 @@ Yellow when too low - - - 0 - 0 - 968 - 21 - - File From d9bdac6bd162ad44be5748623a38ed86e284d8b7 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 23 Oct 2021 00:37:14 +0100 Subject: [PATCH 2/5] Fine tuning main window width for macOS --- widgets/mainwindow.ui | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index 6ba2a455b..59e2b278b 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -552,7 +552,7 @@ - + @@ -1283,16 +1283,10 @@ When not checked you can view the calibration results. - 20 + 30 0 - - - 50 - 20 - - Set Tx frequency to Rx Frequency @@ -1336,16 +1330,10 @@ When not checked you can view the calibration results. - 20 + 30 0 - - - 50 - 20 - - Set Rx frequency to Tx Frequency From a7e662f2273c0914618da75e63dc6cff305717cd Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 23 Oct 2021 01:12:24 +0100 Subject: [PATCH 3/5] More UI width fine tuning for macOS --- widgets/mainwindow.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/widgets/mainwindow.ui b/widgets/mainwindow.ui index 59e2b278b..07c943c64 100644 --- a/widgets/mainwindow.ui +++ b/widgets/mainwindow.ui @@ -1283,7 +1283,7 @@ When not checked you can view the calibration results. - 30 + 35 0 @@ -1330,7 +1330,7 @@ When not checked you can view the calibration results. - 30 + 35 0 From 175092f536f1065faa8f0a40eec2a3d21695b930 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 23 Oct 2021 12:03:33 +0100 Subject: [PATCH 4/5] Environment variable to add extra data to azel.dat The new environment variable WSJT_AZEL_EXTRA_LINES when set to positive integer value adds up to that number of extra data lines to the azel.dat file. Currently only one extra line is supported which contains the following data: Dpol, MNR, Dgrd. Where the values are the same as displayed in the astronomical data window. I.e. EME spatial polarization offset in degrees, maximum non-reciprocity of the PATH in dB, and the estimated signal degradation relative to best possible in dB. --- lib/astrosub.f90 | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lib/astrosub.f90 b/lib/astrosub.f90 index 5e7f473f0..0ca7b49cd 100644 --- a/lib/astrosub.f90 +++ b/lib/astrosub.f90 @@ -4,6 +4,9 @@ module astro_module private public :: astrosub + logical :: initialized = .false. + integer :: azel_extra_lines = 0 + contains subroutine astrosub(nyear,month,nday,uth8,freq8,mygrid_cp, & @@ -28,11 +31,18 @@ contains character(len=6) :: mygrid, hisgrid character(len=:), allocatable :: AzElFileName character(len=1) :: c1 - integer :: ih, im, imin, is, isec, nfreq, nRx + character(len=32) :: envvar + integer :: ih, im, imin, is, isec, nfreq, env_status real(dp) :: AzAux, ElAux, dbMoon8, dfdt, dfdt0, doppler, doppler00, HA8, sd8, xlst8 character*256 jpleph_file_name common/jplcom/jpleph_file_name + if (.not.initialized) then + call get_environment_variable ('WSJT_AZEL_EXTRA_LINES', envvar, status=env_status) + if (env_status.eq.0) read (envvar, *, iostat=env_status) azel_extra_lines + initialized = .true. + end if + mygrid = mygrid_cp hisgrid = hisgrid_cp AzElFileName = C_string_value (AzElFileName_cp) @@ -51,10 +61,8 @@ contains is=mod(isec,60) open(15,file=AzElFileName,status='unknown',err=900) c1='R' - nRx=1 if(bTx) then c1='T' - nRx=0 endif AzAux=0. ElAux=0. @@ -65,13 +73,13 @@ contains ih,im,is,AzSun8,ElSun8, & ih,im,is,AzAux,ElAux, & nfreq,doppler,dfdt,doppler00,dfdt0,c1 - ! TXFirst,TRPeriod,poloffset,Dgrd,xnr,ave,rms,nRx + if (azel_extra_lines.ge.1) write(15, 1020, err=10) poloffset8,xnr8,Dgrd8 1010 format( & i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Moon'/ & i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Sun'/ & i2.2,':',i2.2,':',i2.2,',',f5.1,',',f5.1,',Source'/ & i5,',',f8.1,',',f8.2,',',f8.1,',',f8.2,',Doppler, ',a1) - ! i1,',',i3,',',f8.1,','f8.1,',',f8.1,',',f12.3,',',f12.3,',',i1,',RPol') +1020 format(f8.1,','f8.1,',',f8.1,',Pol') 10 close(15) go to 999 From 356bc10d84a0ede6af537827deb844be627e4118 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Sat, 23 Oct 2021 23:54:36 +0100 Subject: [PATCH 5/5] Repair long-standing regression where tail-ended Tx2 reports missed --- widgets/mainwindow.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 305d18d13..5502f69f5 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -5204,6 +5204,12 @@ void MainWindow::processMessage (DecodedText const& message, Qt::KeyboardModifie lookup(); m_hisGrid = ui->dxGridEntry->text(); + if (m_bDoubleClicked) + { + // extract our report if present + message.report (m_baseCall, Radio::base_callsign(ui->dxCallEntry->text()), m_rptRcvd); + } + if (!m_bSentReport || base_call != qso_partner_base_call) // Don't change report within a QSO { auto n = message.report ().toInt ();