From 9950295679f9479eb0e68e3c7f58b473043c44fd Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Fri, 12 Jun 2015 21:46:54 +0000 Subject: [PATCH] Oops! Bad Rx frequencies were being recorded in WSPR_history.txt. Fixed. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5603 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 8 ++++---- mainwindow.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index ddb878f2c..656230204 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1931,7 +1931,7 @@ void MainWindow::guiUpdate() m_rxDone=false; } if(m_transmitting) { - WSPR_history(-1); + WSPR_history(m_dialFreq,-1); m_bTxTime=false; //Time to stop a WSPR transmission m_btxok=false; } @@ -4097,7 +4097,7 @@ void MainWindow::p1ReadFromStdout() //p1readFromStdout while(p1.canReadLine()) { QString t(p1.readLine()); if(t.indexOf("") >= 0) { - if(!m_diskData) WSPR_history(m_nWSPRdecodes); + if(!m_diskData) WSPR_history(m_dialFreqRxWSPR, m_nWSPRdecodes); m_nWSPRdecodes=0; ui->DecodeButton->setChecked (false); if(m_uploadSpots) { @@ -4186,7 +4186,7 @@ void MainWindow::p1ReadFromStdout() //p1readFromStdout } } -void MainWindow::WSPR_history(int ndecodes) +void MainWindow::WSPR_history(Frequency dialFreq, int ndecodes) { QDateTime t=QDateTime::currentDateTimeUtc().addSecs(-60); QString t1=t.toString("yyMMdd"); @@ -4194,7 +4194,7 @@ void MainWindow::WSPR_history(int ndecodes) int n=t2.toInt()/2; t2.sprintf("%04d",2*n); QString t3; - t3.sprintf("%13.6f",0.000001*m_dialFreq); + t3.sprintf("%13.6f",0.000001*dialFreq); if(ndecodes<0) { t1=t1 + " " + t2 + t3 + " T"; } else { diff --git a/mainwindow.h b/mainwindow.h index 4684a11ba..29c1bcd57 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -511,7 +511,7 @@ private: void switch_mode (Mode); void WSPR_scheduling (); void astroCalculations (QDateTime const&, bool adjust); - void WSPR_history(int ndecodes); + void WSPR_history(Frequency dialFreq, int ndecodes); }; extern void getfile(QString fname, int ntrperiod);