From 0e1ce7ba36137a686499da0aa05d54150542ee2b Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 12 Sep 2012 20:32:43 +0000 Subject: [PATCH] Display UTC as HHMMSS rather than HHMM. Needs more testing! git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2576 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- getfile.cpp | 8 ++++---- libm65/display.f90 | 31 +++++++++++++++---------------- libm65/map65a.f90 | 16 ++++++++-------- mainwindow.cpp | 6 ++++-- mainwindow.ui | 2 +- map65.iss | 2 +- plotter.cpp | 16 ++++++++-------- 7 files changed, 41 insertions(+), 40 deletions(-) diff --git a/getfile.cpp b/getfile.cpp index 5e569e147..8178a4dd9 100644 --- a/getfile.cpp +++ b/getfile.cpp @@ -49,11 +49,11 @@ void getfile(QString fname, bool xpol, int dbDgrd, int nfast) datcom_.nutc=0; if(i0>0) { if(fname.mid(i0-5,1)=="_") { - datcom_.nutc=100*fname.mid(i0-4,2).toInt() + - fname.mid(i0-2,2).toInt(); + datcom_.nutc=10000*fname.mid(i0-4,2).toInt() + + 100*fname.mid(i0-2,2).toInt(); } else { - datcom_.nutc=100*fname.mid(i0-6,2).toInt() + - fname.mid(i0-4,2).toInt(); + datcom_.nutc=10000*fname.mid(i0-6,2).toInt() + + 100*fname.mid(i0-4,2).toInt() + fname.mid(i0-2,2).toInt(); } } } diff --git a/libm65/display.f90 b/libm65/display.f90 index 22f4a6933..5c24cfe76 100644 --- a/libm65/display.f90 +++ b/libm65/display.f90 @@ -2,8 +2,8 @@ subroutine display(nkeep,ftol) parameter (MAXLINES=400,MX=400) integer indx(MAXLINES),indx2(MX) - character*81 line(MAXLINES),line2(MX),line3(MAXLINES) - character out*50,cfreq0*3,cqlive*52 + character*83 line(MAXLINES),line2(MX),line3(MAXLINES) + character out*52,cfreq0*3,livecq*52 character*6 callsign,callsign0 character*12 freqcall(100) real freqkHz(MAXLINES) @@ -14,7 +14,7 @@ subroutine display(nkeep,ftol) do i=1,MAXLINES read(26,1010,end=10) line(i) -1010 format(a80) +1010 format(a72) read(line(i),1020) f0,ndf,nh,nm 1020 format(f8.3,i5,25x,i3,i2) utc(i)=60*nh + nm @@ -30,7 +30,7 @@ subroutine display(nkeep,ftol) nage=utcz-utc(i) if(nage.lt.0) nage=nage+1440 iage=nage/nquad - write(line(i)(80:81),1021) iage + write(line(i)(73:74),1021) iage 1021 format(i2) enddo @@ -118,20 +118,20 @@ subroutine display(nkeep,ftol) nc=0 callsign0=' ' do k=1,k3 - out=line3(k)(6:13)//line3(k)(28:31)//line3(k)(39:43)// & - line3(k)(35:38)//line3(k)(44:67)//line3(k)(77:81) + out=line3(k)(6:13)//line3(k)(28:31)//line3(k)(39:45)// & + line3(k)(35:38)//line3(k)(46:74) if(out(1:3).ne.' ') then cfreq0=out(1:3) if(iw.lt.MAXLINES-1) iw=iw+1 - cqlive=line3(k)(6:13)//line3(k)(28:31)//line3(k)(39:43)// & - line3(k)(23:27)//line3(k)(35:38)//line3(k)(44:67)// & - line3(k)(80:81) - if(index(cqlive,' CQ ').gt.0 .or. index(cqlive,' QRZ ').gt.0 .or. & - index(cqlive,' QRT ').gt.0 .or. index(cqlive,' CQV ').gt.0 .or. & - index(cqlive,' CQH ').gt.0) write(19,1029) cqlive + livecq=line3(k)(6:13)//line3(k)(28:31)//line3(k)(39:45)// & + line3(k)(23:27)//line3(k)(35:38)//line3(k)(46:70)// & + line3(k)(73:74) + if(index(livecq,' CQ ').gt.0 .or. index(livecq,' QRZ ').gt.0 .or. & + index(livecq,' QRT ').gt.0 .or. index(livecq,' CQV ').gt.0 .or. & + index(livecq,' CQH ').gt.0) write(19,1029) livecq 1029 format(a52) - write(*,1030) out -1030 format('@',a50) + write(*,1030) out !Messages +1030 format('@',a52) i1=index(out(24:),' ') callsign=out(i1+24:) i2=index(callsign,' ') @@ -157,10 +157,9 @@ subroutine display(nkeep,ftol) freqcall(nc)=' ' freqcall(nc+1)=' ' freqcall(nc+2)=' ' - iz=(nc+2)/3 do i=1,nc - write(*,1042) freqcall(i) + write(*,1042) freqcall(i) !Band Map 1042 format('&',a12) enddo diff --git a/libm65/map65a.f90 b/libm65/map65a.f90 index 5d9e30150..ab3a677e6 100644 --- a/libm65/map65a.f90 +++ b/libm65/map65a.f90 @@ -302,25 +302,25 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & endif endif endif - + if(ndphi.eq.0) then write(*,1010) nkHz,ndf,npol,nutc,dt,nsync2, & decoded,nkv,nqual,ntxpol,cp -1010 format('!',i3,i5,i4,i5.4,f5.1,i4,2x,a22,i4,i5,i5,1x,a1) +1010 format('!',i3,i5,i4,i7.6,f5.1,i4,2x,a22,i2,i5,i5,1x,a1) else if(iloop.ge.1) qphi(iloop)=sig(k,10) write(*,1010) nkHz,ndf,npol,nutc,dt,nsync2, & decoded,nkv,nqual,30*iloop write(27,1011) 30*iloop,nkHz,ndf,npol,nutc, & dt,sync2,nkv,nqual,decoded -1011 format(i3,i4,i5,i4,i5.4,f5.1,f7.1,i3,i5,2x,a22) +1011 format(i3,i4,i5,i4,i7.6,f5.1,f7.1,i3,i5,2x,a22) endif endif enddo if(nwrite.eq.0) then write(*,1012) mousefqso,nutc -1012 format('!',i3,9x,i5.4,' ') +1012 format('!',i3,9x,i7.6,' ') endif endif @@ -425,17 +425,17 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & endif endif write(26,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, & - nsync2,nutc,decoded,nkv,nqual,nhist,cp + nsync2,nutc,decoded,cp write(21,1014) f0,ndf,ndf0,ndf1,ndf2,dt,npol,nsync1, & - nsync2,nutc,decoded,nkv,nqual,nhist -1014 format(f8.3,i5,3i3,f5.1,i4,i3,i4,i5.4,2x,a22,3i3,1x,a1) + nsync2,nutc,decoded,cp +1014 format(f8.3,i5,3i3,f5.1,i4,i3,i4,i7.6,2x,a22,2x,a1) endif endif j=j+nsiz(n) enddo write(26,1015) nutc -1015 format(39x,i4.4) +1015 format(39x,i6.6) call flush(21) call flush(26) call display(nkeep,ftol) diff --git a/mainwindow.cpp b/mainwindow.cpp index d87c8d1c8..1363679b8 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -16,7 +16,7 @@ short int iwave[60*11025]; //Wave file for Tx audio int nwave; //Length of Tx waveform bool btxok; //True if OK to transmit -double outputLatency; //Latency in seconds +double outputLatency; //Latency in seconds qint16 id[4*60*96000]; Astro* g_pAstro = NULL; @@ -1181,7 +1181,9 @@ void MainWindow::decode() //decode() int imin=ms/60000; int ihr=imin/60; imin=imin % 60; - datcom_.nutc=100*ihr + imin; + int isec=(ms/1000) % 60; + datcom_.nutc=100*(100*ihr + imin); + if(isec>29) datcom_.nutc += 30; } datcom_.idphi=m_dPhi; diff --git a/mainwindow.ui b/mainwindow.ui index d826e2181..3476078a1 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -53,7 +53,7 @@ - Freq DF Pol UTC DT dB KV DS TxPol + Freq DF Pol UTC DT dB KV DS TxPol diff --git a/map65.iss b/map65.iss index 5bb86ffe0..f16d8bf5a 100644 --- a/map65.iss +++ b/map65.iss @@ -1,6 +1,6 @@ [Setup] AppName=MAP65 -AppVerName=MAP65 Version 2.4.0 r2570 +AppVerName=MAP65 Version 2.4.0 r2571 AppCopyright=Copyright (C) 2001-2012 by Joe Taylor, K1JT DefaultDirName=c:\MAP65 DefaultGroupName=MAP65 diff --git a/plotter.cpp b/plotter.cpp index b56080b76..911b96e8c 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -73,7 +73,6 @@ void CPlotter::resizeEvent(QResizeEvent* ) //resizeEvent() void CPlotter::paintEvent(QPaintEvent *) // paintEvent() { static int x00=-99; - int ihr,imin; if(m_paintEventBusy) return; m_paintEventBusy=true; @@ -114,7 +113,7 @@ void CPlotter::paintEvent(QPaintEvent *) // paintEvent() painter2.setPen(m_ColorTbl[m_zwf[i+k]]); painter2.drawPoint(i,j); } - if(j == 15) { + if(j == 15) { //Does this do nothing ??? painter2.setPen(m_ColorTbl[255]); painter2.drawText(5,10,m_sutc); } @@ -135,8 +134,7 @@ void CPlotter::paintEvent(QPaintEvent *) // paintEvent() void CPlotter::draw(float s[], int i0, float splot[]) //draw() { - int i,j,k,w,h; - int ihr,imin; + int i,j,w,h; float y; m_i0=i0; @@ -219,17 +217,19 @@ void CPlotter::draw(float s[], int i0, float splot[]) //dr void CPlotter::UTCstr() { - int ihr,imin; + int ihr,imin,isec; if(datcom_.ndiskdat != 0) { - ihr=datcom_.nutc/100; - imin=datcom_.nutc%100; + ihr=datcom_.nutc/10000; + imin=(datcom_.nutc/100) % 100; + isec=datcom_.nutc % 100; } else { qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000; imin=ms/60000; ihr=imin/60; imin=imin % 60; + isec=(ms/1000) % 60; } - sprintf(m_sutc,"%2.2d:%2.2d",ihr,imin); + sprintf(m_sutc,"%2.2d:%2.2d:%2.2d",ihr,imin,isec); } void CPlotter::DrawOverlay() //DrawOverlay()