From 99fdec2b23da30acfbaf0e4d9c1f9872c1954153 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 17 Jan 2018 15:32:45 +0000 Subject: [PATCH] Temporary commit of plotsave-related code. Not finished! git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8414 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/plotsave.f90 | 6 ++++++ lib/symspec.f90 | 2 +- mainwindow.cpp | 4 ++-- messageaveraging.cpp | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/plotsave.f90 b/lib/plotsave.f90 index 9da8a7d33..ef5da4c09 100644 --- a/lib/plotsave.f90 +++ b/lib/plotsave.f90 @@ -8,11 +8,17 @@ subroutine plotsave(splot,ka,nbpp,irow,jz,swide) data ncall/0/ save ncall,spsave + df=12000.0/16384 if(irow.lt.0) then ! Save a new row of data ncall=ncall+1 k=mod(ncall-1,NYMAX) + 1 spsave(1:NSMAX,k)=splot + rewind 61 + do i=1,NSMAX + write(61,3061) i,splot(i),ncall +3061 format(i8,f12.3,i8) + enddo else ! Process and return the saved "irow" as swide(), for a waterfall replot. k=mod(NYMAX+ncall-1-irow,NYMAX) + 1 diff --git a/lib/symspec.f90 b/lib/symspec.f90 index 8135a8124..28035d2c8 100644 --- a/lib/symspec.f90 +++ b/lib/symspec.f90 @@ -86,7 +86,7 @@ subroutine symspec(shared_data,k,ntrperiod,nsps,ingain,nminw,pxdb,s, & enddo ihsym=ihsym+1 - xc(0:nfft3-1)=w3(1:nfft3)*xc(0:nfft3-1) !Apply window w3 +! xc(0:nfft3-1)=w3(1:nfft3)*xc(0:nfft3-1) !Apply window w3 call four2a(xc,nfft3,1,-1,0) !Real-to-complex FFT df3=12000.0/nfft3 !JT9-1: 0.732 Hz = 0.42 * tone spacing diff --git a/mainwindow.cpp b/mainwindow.cpp index b48fcc39b..6c80c79ff 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -899,7 +899,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, connect (&splashTimer, &QTimer::timeout, this, &MainWindow::splash_done); splashTimer.setSingleShot (true); splashTimer.start (20 * 1000); - +/* if(m_config.my_callsign()=="K1JT" or m_config.my_callsign()=="K9AN" or m_config.my_callsign()=="G4WJS" || m_config.my_callsign () == "W9XYZ" or m_config.my_callsign()=="K1ABC" or m_config.my_callsign()=="K1ABC/2" or @@ -913,7 +913,7 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple, "Please use WSJT-X v1.8.0\n", errorMsg); Q_EMIT finished (); } - +*/ if(!ui->cbMenus->isChecked()) { ui->cbMenus->setChecked(true); ui->cbMenus->setChecked(false); diff --git a/messageaveraging.cpp b/messageaveraging.cpp index 424b4d3dd..0170d22c3 100644 --- a/messageaveraging.cpp +++ b/messageaveraging.cpp @@ -25,6 +25,7 @@ MessageAveraging::MessageAveraging(QSettings * settings, QFont const& font, QWid ui->lab1->setVisible(false); ui->lab2->setVisible(false); ui->lab3->setVisible(false); + ui->lab4->setVisible(false); } setWindowTitle(m_title_); m_nLogged_=0;