w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-30 05:12:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Starting to put red sync data on waterfall.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7491 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-13 21:42:32 +00:00
parent a1a7b501ef
commit 087e856319
4 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -101,7 +101,8 @@ elseif (CMAKE_HOST_WIN32)
add_definitions (-DWIN32) add_definitions (-DWIN32)
endif () endif ()
set_property (DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT) #set_property (DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_DEBUG_OUTPUT QT_NO_WARNING_OUTPUT)
set_property (DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_RELEASE QT_NO_WARNING_OUTPUT)
# build the subdirectories # build the subdirectories
add_subdirectory (libm65) add_subdirectory (libm65)

6
libm65/qra64b.f90
View File

@ -9,7 +9,8 @@ subroutine qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12,hiscall_12, &
character*12 mycall_12,hiscall_12 character*12 mycall_12,hiscall_12
character*6 hisgrid_6 character*6 hisgrid_6
common/cacb/ca,cb common/cacb/ca,cb
open(17,file='red.dat',status='unknown')
df=96000.0/NFFT1 df=96000.0/NFFT1
k0=(ikhz-75.74)*1000.0/df k0=(ikhz-75.74)*1000.0/df
nh=nfft2/2 nh=nfft2/2
@ -28,6 +29,7 @@ subroutine qra64b(nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12,hiscall_12, &
! write(67) nutc,cx,cy ! write(67) nutc,cx,cy
call qra64c(cx,cy,nutc,nqd,ikhz,mousedf,ntol,xplo,mycall_12, & call qra64c(cx,cy,nutc,nqd,ikhz,mousedf,ntol,xplo,mycall_12, &
hiscall_12,hisgrid_6) hiscall_12,hisgrid_6)
close(17)
return return
end subroutine qra64b end subroutine qra64b

15
libm65/sync64.f90
View File

@ -87,7 +87,6 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync, &
s3=0. s3=0.
s0b=0. s0b=0.
do i=ia,ib do i=ia,ib
freq=i*df3
s1(i)=real(c1(i))**2 + aimag(c1(i))**2 s1(i)=real(c1(i))**2 + aimag(c1(i))**2
s2(i)=real(c2(i))**2 + aimag(c2(i))**2 s2(i)=real(c2(i))**2 + aimag(c2(i))**2
s3(i)=real(c3(i))**2 + aimag(c3(i))**2 s3(i)=real(c3(i))**2 + aimag(c3(i))**2
@ -119,10 +118,6 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync, &
call timer('sync64_2',1) call timer('sync64_2',1)
enddo enddo
! s0a=s0a+2.0
! write(17) ia,ib,s0a(ia:ib) !Save data for red curve
! close(17)
nskip=50 nskip=50
call lorentzian(s0a(ia+nskip:ib-nskip),iz-2*nskip,a) call lorentzian(s0a(ia+nskip:ib-nskip),iz-2*nskip,a)
f0a=(a(3)+ia+49)*df3 f0a=(a(3)+ia+49)*df3
@ -140,8 +135,10 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync, &
rms2=sqrt(sq/40.0) rms2=sqrt(sq/40.0)
sync2=10.0*log10(a(2)/rms2) sync2=10.0*log10(a(2)/rms2)
slimit=2.0
rewind 17
rewind 76 rewind 76
do i=1,iz-2*nskip do i=2,iz-2*nskip-1,3
x=i x=i
z=(x-a(3))/(0.5*a(4)) z=(x-a(3))/(0.5*a(4))
yfit=a(1) yfit=a(1)
@ -150,9 +147,13 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync, &
yfit=a(1) + a(2)*(1.0/d - 0.1) yfit=a(1) + a(2)*(1.0/d - 0.1)
endif endif
j=i+ia+49 j=i+ia+49
write(76,1110) j*df3-3000.0,s0a(j),yfit freq=j*df3-3000.0
ss=(s0a(j-1)+s0a(j)+s0a(j+1))/3.0
if(ss.gt.slimit) write(17,1110) freq,ss
write(76,1110) freq,ss,yfit
1110 format(3f10.3) 1110 format(3f10.3)
enddo enddo
flush(17)
flush(76) flush(76)
return return

23
plotter.cpp
View File

@ -1,6 +1,8 @@
#include "plotter.h" #include "plotter.h"
#include <math.h> #include <math.h>
#include <QDebug> #include <QDebug>
#include <fstream>
#include <iostream>
#define MAX_SCREENSIZE 2048 #define MAX_SCREENSIZE 2048
@ -127,6 +129,27 @@ void CPlotter::paintEvent(QPaintEvent *) // paintEvent()
UTCstr(); UTCstr();
painter2.drawText(5,10,m_sutc); painter2.drawText(5,10,m_sutc);
} }
if(m_line==63) {
std::ifstream f;
f.open("./red.dat");
if(f) {
int x;
float freq,sync;
// float df = 0.001*m_fSample/32768.0;
QPen pen0(Qt::red, 3);
painter2.setPen(pen0);
for(int i=0; i<50; i++) {
f >> freq >> sync;
// x = (freq - m_ZoomStartFreq)/df;
x=500;
// qDebug() << "a" << m_line << freq << sync << x;
painter2.drawLine(x,15,x,30);
}
}
}
m_paintAllZoom=false; m_paintAllZoom=false;
x00=x0; x00=x0;