mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-27 14:48:46 -05:00
Fixed a few bugs preventing normal monitoring.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2513 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
bdd7081225
commit
e353e22d06
@ -6,7 +6,7 @@
|
||||
|
||||
QT += core gui network
|
||||
CONFIG += qwt thread
|
||||
#CONFIG += console
|
||||
CONFIG += console
|
||||
|
||||
TARGET = jtms3
|
||||
VERSION = 0.1
|
||||
|
@ -20,6 +20,8 @@ subroutine specjtms(k,px,pxsmo,spk0,f0)
|
||||
sqsmo=0.
|
||||
endif
|
||||
|
||||
if(k.lt.kstep .or. k.gt.NSMAX) return
|
||||
|
||||
t=k/48000.0
|
||||
nfft=4096
|
||||
df=48000.0/nfft
|
||||
@ -38,10 +40,12 @@ subroutine specjtms(k,px,pxsmo,spk0,f0)
|
||||
px=db(sq) - 23.0
|
||||
pxsmo=db(sqsmo) - 23.0
|
||||
|
||||
do i=i0,ia-1
|
||||
d=id(i)
|
||||
sq=sq + d*d
|
||||
enddo
|
||||
if(i0.gt.0) then
|
||||
do i=i0,ia-1
|
||||
d=id(i)
|
||||
sq=sq + d*d
|
||||
enddo
|
||||
endif
|
||||
sq0=sq
|
||||
! write(13,1010) t,rms,sq,px,pxsmo
|
||||
!1010 format(5f12.3)
|
||||
@ -71,7 +75,8 @@ subroutine specjtms(k,px,pxsmo,spk0,f0)
|
||||
|
||||
call four2a(cx2,nfft,1,-1,1) !Forward c2c FFT of cx2
|
||||
|
||||
j0=nint(2.0*1428.57/df)
|
||||
! j0=nint(2.0*1428.57/df)
|
||||
j0=nint(2.0*1500.0/df)
|
||||
ja=j0-107
|
||||
jb=j0+107
|
||||
do j=ja,jb
|
||||
|
@ -1,4 +1,4 @@
|
||||
//--------------------------------------------------------------- MainWindow
|
||||
//---------------------------------------------------------------- MainWindow
|
||||
#include "mainwindow.h"
|
||||
#include "ui_mainwindow.h"
|
||||
#include "devsetup.h"
|
||||
|
15
plotter.cpp
15
plotter.cpp
@ -112,17 +112,18 @@ void CPlotter::draw(float green[], int ig) //draw()
|
||||
int i,j,w,h;
|
||||
float y;
|
||||
int y1;
|
||||
static int ig0=99999;
|
||||
|
||||
w = m_WaterfallPixmap.width();
|
||||
h = m_WaterfallPixmap.height();
|
||||
if(ig<ig0) {
|
||||
m_WaterfallPixmap.fill(Qt::black);
|
||||
m_ZoomWaterfallPixmap.fill(Qt::black);
|
||||
m_2DPixmap.fill(Qt::black);
|
||||
}
|
||||
ig0=ig;
|
||||
|
||||
double gain = pow(10.0,0.05*(m_plotGain+7));
|
||||
|
||||
//move current data down one line
|
||||
//(must do this before attaching a QPainter object)
|
||||
// m_WaterfallPixmap.scroll(0,1,0,0,w,h);
|
||||
// m_ZoomWaterfallPixmap.scroll(0,1,0,0, w, h);
|
||||
// memmove(&m_zwf[32768],m_zwf,32768*(h-1));
|
||||
|
||||
QPainter painter1(&m_WaterfallPixmap);
|
||||
QPainter painter2D(&m_2DPixmap);
|
||||
painter2D.setPen(Qt::green);
|
||||
|
Loading…
Reference in New Issue
Block a user