From 26bba5d24d50bc39da525faa6c738c7df11a01d7 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 14 Nov 2012 01:19:13 +0000 Subject: [PATCH] Remove "save" statements. They were not needed, and (possibly) led to program crashes. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2725 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/peakdf9.f90 | 1 - lib/peakdt9.f90 | 5 +++-- lib/spec9.f90 | 1 - mainwindow.cpp | 3 +-- wsjtx.pro | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/peakdf9.f90 b/lib/peakdf9.f90 index 3db5b8fee..5db762ca0 100644 --- a/lib/peakdf9.f90 +++ b/lib/peakdf9.f90 @@ -3,7 +3,6 @@ subroutine peakdf9(c0,npts8,nsps8,istart,foffset,idfpk) complex c0(0:npts8-1) complex zsum include 'jt9sync.f90' - save twopi=8.0*atan(1.0) df=1500.0/nsps8 diff --git a/lib/peakdt9.f90 b/lib/peakdt9.f90 index 5d18d64f2..a5581f40d 100644 --- a/lib/peakdt9.f90 +++ b/lib/peakdt9.f90 @@ -3,7 +3,6 @@ subroutine peakdt9(c0,npts8,nsps8,istart,foffset,idtpk) complex c0(0:npts8-1) complex zsum include 'jt9sync.f90' - save twopi=8.0*atan(1.0) smax=0. @@ -22,7 +21,9 @@ subroutine peakdt9(c0,npts8,nsps8,istart,foffset,idtpk) do i=i1,i1+nsps8-1 if(i.lt.0 .or. i.gt.npts8-1) cycle phi=phi + dphi - zsum=zsum + c0(i) * cmplx(cos(phi),-sin(phi)) + if(i.ge.0 .and. i.le.npts8-1) then + zsum=zsum + c0(i)*cmplx(cos(phi),-sin(phi)) + endif enddo sum=sum + real(zsum)**2 + aimag(zsum)**2 enddo diff --git a/lib/spec9.f90 b/lib/spec9.f90 index a0a993092..2bc7ed3a3 100644 --- a/lib/spec9.f90 +++ b/lib/spec9.f90 @@ -13,7 +13,6 @@ subroutine spec9(c0,npts8,nsps,fpk0,fpk,xdt,snrdb,i1SoftSymbols) equivalence (i1,i4) data ig/0,1,3,2,7,6,4,5/ !Gray code removal include 'jt9sync.f90' - save ! Fix up the data in c0() sum=0. diff --git a/mainwindow.cpp b/mainwindow.cpp index ddd0f57c0..ee37cc50b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -17,7 +17,7 @@ float c0[2*1800*1500]; WideGraph* g_pWideGraph = NULL; QString rev="$Rev$"; -QString Program_Title_Version=" WSJT-X v0.3, r" + rev.mid(6,4) + +QString Program_Title_Version=" WSJT-X v0.4, r" + rev.mid(6,4) + " by K1JT"; //-------------------------------------------------- MainWindow constructor @@ -182,7 +182,6 @@ MainWindow::MainWindow(QWidget *parent) : if(ui->actionCuteSDR->isChecked()) on_actionCuteSDR_triggered(); if(ui->actionAFMHot->isChecked()) on_actionAFMHot_triggered(); if(ui->actionBlue->isChecked()) on_actionBlue_triggered(); - } // End of MainWindow constructor //--------------------------------------------------- MainWindow destructor diff --git a/wsjtx.pro b/wsjtx.pro index ebfb845b5..a3826a0f0 100644 --- a/wsjtx.pro +++ b/wsjtx.pro @@ -6,7 +6,7 @@ QT += core gui network CONFIG += qwt thread -CONFIG += console +#CONFIG += console TARGET = wsjtx VERSION = 0.2 @@ -57,7 +57,6 @@ LIBS += -lfftw3f /usr/lib/libgfortran.so.3 LIBS += ../wsjtx/lib/libjt9.a LIBS += /usr/lib/libqwt-qt4.so LIBS += -lportaudio -#LIBS +- -lusb } win32 {