From 986eaf5d40ba8fd7b8176770a267b3f349ad17d4 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 3 Jan 2024 16:17:57 -0500 Subject: [PATCH] Add fQSO back to azel.dat, for IK7EZN. --- qmap/astro.cpp | 7 +++++-- qmap/libqmap/save_qm.f90 | 25 +++++++++++++++++++++++++ qmap/mainwindow.cpp | 4 +--- 3 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 qmap/libqmap/save_qm.f90 diff --git a/qmap/astro.cpp b/qmap/astro.cpp index 6dc1cb48f..7611de020 100644 --- a/qmap/astro.cpp +++ b/qmap/astro.cpp @@ -158,15 +158,18 @@ void Astro::astroUpdate(QDateTime t, QString mygrid, QString azelDir, double xav mb.exec(); return; } + QTextStream out(&f); snprintf(cc,sizeof(cc),"%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Moon\n" "%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Sun\n" "%2.2d:%2.2d:%2.2d,%5.1f,%5.1f,Source\n" - "%4d,%6d,%6d,Doppler\n", + "%4d,%6d,%6d,Doppler\n" + "%3d,%1d,fQSO\n", nhr,nmin,isec,azmoon,elmoon, nhr,nmin,isec,azsun+azOffset,elsun+elOffset, nhr,nmin,isec,0.0,0.0, - nfreq,ndop,ndop00); + nfreq,ndop,ndop00, + datcom_.mousefqso,0); out << cc; f.close(); } diff --git a/qmap/libqmap/save_qm.f90 b/qmap/libqmap/save_qm.f90 new file mode 100644 index 000000000..962515641 --- /dev/null +++ b/qmap/libqmap/save_qm.f90 @@ -0,0 +1,25 @@ +subroutine save_qm(nutc,dd,ntx30a,ntx30b) + + parameter(NMAX=60*96000) + real*4 dd(2,NMAX) + integer*1 id1(2,NMAX) + + ia=1 + ib=NMAX + if(ntx30a.gt.5) ia=NMAX/2+1 + if(ntx30b.gt.5) ib=NMAX/2 + + sq=0. + do i=ia,ib + x=dd(1,i) + y=dd92,i) + sq=sq + x*x + y*y + enddo + nsum=ib-ia+1 + rms=sqrt(sq/nsum) + + write(*,3001) nutc,rms +3001 format(i4.4,f10.2) + + return +end subroutine save_qm diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index 08a700568..a064ae00f 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -956,11 +956,8 @@ void MainWindow::guiUpdate() t1=t1.asprintf("%.3f",datcom_.fcenter); ui->labFreq->setText(t1); - if(nsec != m_sec0) { //Once per second -// qDebug() << "AAA" << nsec; - static int n60z=99; int n60=nsec%60; @@ -1017,6 +1014,7 @@ void MainWindow::guiUpdate() lab1->setText(""); } + datcom_.mousefqso=m_wide_graph_window->QSOfreq(); QDateTime t = QDateTime::currentDateTimeUtc(); m_astro_window->astroUpdate(t, m_myGrid, m_azelDir, m_xavg); QString utc = t.date().toString(" yyyy MMM dd \n") + t.time().toString();