w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 12:48:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

More tweaks to the use of flat3.

Browse Source 
Include updated makefiles.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3626 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2014-01-09 00:03:22 +00:00
parent 8832044265
commit 3bb5787225
6 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Makefile.MinGW
View File

@ -50,7 +50,8 @@ OBJS1 = pctile.o graycode.o sort.o ssort.o \
filbig.o fil6521.o afc65b.o decode65b.o setup65.o \ filbig.o fil6521.o afc65b.o decode65b.o setup65.o \
extract.o fchisq65.o demod64a.o chkhist.o interleave63.o ccf2.o \ extract.o fchisq65.o demod64a.o chkhist.o interleave63.o ccf2.o \
move.o indexx.o graycode65.o twkfreq65.o smo121.o \ move.o indexx.o graycode65.o twkfreq65.o smo121.o \
wrapkarn.o init_rs.o encode_rs.o decode_rs.o gen65.o fil4.o wrapkarn.o init_rs.o encode_rs.o decode_rs.o gen65.o fil4.o \
flat3.o polfit.o determ.o
libjt9.a: $(OBJS1) libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1) ar cr libjt9.a $(OBJS1)

3
lib/Makefile.linux
View File

@ -40,7 +40,8 @@ OBJS1 = pctile.o graycode.o sort.o ssort.o \
filbig.o fil6521.o afc65b.o decode65b.o setup65.o \ filbig.o fil6521.o afc65b.o decode65b.o setup65.o \
extract.o fchisq65.o demod64a.o chkhist.o interleave63.o ccf2.o \ extract.o fchisq65.o demod64a.o chkhist.o interleave63.o ccf2.o \
move.o indexx.o graycode65.o twkfreq65.o smo121.o \ move.o indexx.o graycode65.o twkfreq65.o smo121.o \
wrapkarn.o init_rs.o encode_rs.o decode_rs.o gen65.o fil4.o wrapkarn.o init_rs.o encode_rs.o decode_rs.o gen65.o fil4.o \
flat3.o polfit.o determ.o
libjt9.a: $(OBJS1) libjt9.a: $(OBJS1)
ar cr libjt9.a $(OBJS1) ar cr libjt9.a $(OBJS1)

2
lib/flat3.f90
View File

@ -67,7 +67,7 @@ subroutine flat3(s0,iz,nfa,nfb,nterms,ynoise,s)
! enddo ! enddo
do i=1,ib do i=1,ib
y4=y0(i)-yfit(i) - 20.0 y4=y0(i)-yfit(i) - 10.0
s(i)=10.0**(0.1*y4) s(i)=10.0**(0.1*y4)
enddo enddo

17
lib/symspec.f90
View File

@ -41,7 +41,7 @@ subroutine symspec(k,ntrperiod,nsps,ingain,slope,pxdb,s,df3,ihsym,npts8)
go to 900 !Wait for enough samples to start go to 900 !Wait for enough samples to start
endif endif
if(nfft3.ne.nfft3z .or. (slope.ne.slope0 .and. abs(slope+0.1).gt.0.05)) then if(nfft3.ne.nfft3z .or. slope.ne.slope0) then
! Compute new window and adjust scale factor ! Compute new window and adjust scale factor
pi=4.0*atan(1.0) pi=4.0*atan(1.0)
do i=1,nfft3 do i=1,nfft3
@ -49,10 +49,14 @@ subroutine symspec(k,ntrperiod,nsps,ingain,slope,pxdb,s,df3,ihsym,npts8)
enddo enddo
nfft3z=nfft3 nfft3z=nfft3
nh=NSMAX/2 nh=NSMAX/2
do i=1,NSMAX if(abs(slope+0.1).gt.0.05) then
x=slope*float(i)/nh - 1.0 + 2.6 do i=1,NSMAX
scale(i)=10.0**x x=slope*float(i)/nh - 1.0 + 2.6
enddo scale(i)=10.0**x
enddo
else
scale=1.0
endif
slope0=slope slope0=slope
endif endif
@ -110,7 +114,8 @@ subroutine symspec(k,ntrperiod,nsps,ingain,slope,pxdb,s,df3,ihsym,npts8)
if(abs(slope+0.1).lt.0.01) then if(abs(slope+0.1).lt.0.01) then
call flat3(s,iz,nfa,nfb,3,1.0,s) call flat3(s,iz,nfa,nfb,3,1.0,s)
! call flat3(savg,iz,3,1.0,savg) call flat3(savg,iz,nfa,nfb,3,1.0,savg)
savg=7.0*savg
endif endif
900 npts8=k/8 900 npts8=k/8

2
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//--------------------------------------------------------------- MainWindow //-------------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include "ui_mainwindow.h" #include "ui_mainwindow.h"

37
soundout.cpp
View File

@ -17,31 +17,30 @@ bool SoundOutput::audioError () const
bool result (true); bool result (true);
Q_ASSERT_X (m_stream, "SoundOutput", "programming error"); Q_ASSERT_X (m_stream, "SoundOutput", "programming error");
if (m_stream) if (m_stream) {
switch (m_stream->error ())
{ {
switch (m_stream->error ()) case QAudio::OpenError:
{ Q_EMIT error (tr ("An error opening the audio output device has occurred."));
case QAudio::OpenError: break;
Q_EMIT error (tr ("An error opening the audio output device has occurred."));
break;
case QAudio::IOError: case QAudio::IOError:
Q_EMIT error (tr ("An error occurred during write to the audio output device.")); Q_EMIT error (tr ("An error occurred during write to the audio output device."));
break; break;
case QAudio::UnderrunError: case QAudio::UnderrunError:
Q_EMIT error (tr ("Audio data not being fed to the audio output device fast enough.")); Q_EMIT error (tr ("Audio data not being fed to the audio output device fast enough."));
break; break;
case QAudio::FatalError: case QAudio::FatalError:
Q_EMIT error (tr ("Non-recoverable error, audio output device not usable at this time.")); Q_EMIT error (tr ("Non-recoverable error, audio output device not usable at this time."));
break; break;
case QAudio::NoError: case QAudio::NoError:
result = false; result = false;
break; break;
}
} }
}
return result; return result;
} }