diff --git a/qmap/libqmap/read_qm.f90 b/qmap/libqmap/read_qm.f90 index 03d5991e1..f5f7615c8 100644 --- a/qmap/libqmap/read_qm.f90 +++ b/qmap/libqmap/read_qm.f90 @@ -10,14 +10,16 @@ subroutine read_qm(fname) common/datcom/dd(2,5760000),ss(400,NFFT),savg(NFFT),fcenter,nutc,junk(NJUNK) open(28,file=trim(fname),status='old',access='stream',err=900) - read(28) prog_id,mycall,mygrid,fcenter,nutc,ntx30a,ntx30b,ia,ib,nxtra + read(28) prog_id,mycall,mygrid,fcenter,nutc,ntx30a,ntx30b,ndop00,ndop58, & + ia,ib,nxtra id1=0 read(28) id1(1:2,ia:ib) dd=0. dd(1:2,ia:ib)=2.4*id1(1:2,ia:ib) !### Why the boost by 2.4 ??? -! write(*,3001) prog_id,mycall(1:6),mygrid,fcenter,nutc,ntx30a,ntx30b,ia,ib -!3001 format(a24,2x,a6,2x,a6,f10.3,i6.4,2i5,2i9) +! write(*,3001) prog_id,mycall(1:6),mygrid,fcenter,nutc,ntx30a,ntx30b, & +! ndop00,ndop58,ia,ib +!3001 format(a24,2x,a6,2x,a6,f10.3,i6.4,2i5/4i9) go to 999 900 print*,'Cannot open ',fname diff --git a/qmap/libqmap/save_qm.f90 b/qmap/libqmap/save_qm.f90 index 7f74ae888..edf7b3882 100644 --- a/qmap/libqmap/save_qm.f90 +++ b/qmap/libqmap/save_qm.f90 @@ -1,4 +1,5 @@ -subroutine save_qm(fname,prog_id,mycall,mygrid,dd,ntx30a,ntx30b,fcenter,nutc) +subroutine save_qm(fname,prog_id,mycall,mygrid,dd,ntx30a,ntx30b,fcenter, & + nutc,ndop00,ndop58) parameter(NMAX=60*96000) character*(*) fname,prog_id,mycall,mygrid @@ -56,7 +57,7 @@ subroutine save_qm(fname,prog_id,mycall,mygrid,dd,ntx30a,ntx30b,fcenter,nutc) mycall_12=mycall mygrid_6=mygrid write(29) prog_id_24,mycall_12,mygrid_6,fcenter,nutc,ntx30a,ntx30b, & - ia,ib,nxtra !Write header to disk + ndop00,ndop58,ia,ib,nxtra !Write header to disk write(29) id1(1:2,ia:ib) !Write 8-bit data to disk close(29) diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index 7dff6047a..5ed65d882 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -407,7 +407,8 @@ void MainWindow::dataSink(int k) // qDebug() << "aa" << t.simplified() << m_myCall << m_myGrid << datcom_.fcenter; save_qm_(fname.toLatin1(), t.toLatin1(), m_myCall.toLatin1(), m_myGrid.toLatin1(), datcom2_.d4, &datcom2_.ntx30a, &datcom2_.ntx30b, &datcom2_.fcenter, - &datcom2_.nutc, fname.length(), t.length(), m_myCall.length(), m_myGrid.length()); + &datcom2_.nutc, &m_dop00, &m_dop58, + fname.length(), t.length(), m_myCall.length(), m_myGrid.length()); } if(ihsym==m_hsymStop) { m_nTx30a=0; @@ -1039,6 +1040,8 @@ void MainWindow::guiUpdate() ui->labUTC->setText(utc); m_hsym0=khsym; m_sec0=nsec; + if(n60==0) m_dop00=datcom_.ndop00; + if(n60==58) m_dop58=datcom_.ndop00; } } diff --git a/qmap/mainwindow.h b/qmap/mainwindow.h index 5d6f932a1..ea7c9a03d 100644 --- a/qmap/mainwindow.h +++ b/qmap/mainwindow.h @@ -115,6 +115,8 @@ private: qint32 m_nDoubleClicked=0; qint32 m_nline=0; qint32 m_WSJTX_TRperiod=0; + qint32 m_dop00=0; + qint32 m_dop58=0; qint32 m_zero=0; qint32 m_one=1; @@ -203,7 +205,7 @@ extern "C" { void save_qm_(const char* fname, const char* prog_id, const char* mycall, const char* mygrid, float d4[], int* ntx30a, int* ntx30b, double* fcenter, int* nutc, - int len1, int len2, int len3, int len4); + int* dop00, int* dop58, int len1, int len2, int len3, int len4); void read_qm_(const char* fname, int len);