From 9e2cc3f9d1116484d2492739ec8dad98054a9aa3 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 3 Jun 2015 20:21:34 +0000 Subject: [PATCH] Fix the displayed tone-range markers on transition from WSPR to JT65. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5515 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 5 +++-- plotter.cpp | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index c9c7d6111..e0af94caa 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -3031,8 +3031,9 @@ void MainWindow::on_actionJT9W_1_triggered() void MainWindow::on_actionJT65_triggered() { - if(m_mode=="JT4") { -// If coming from JT4 mode, pretend we're coming from JT9 and click the pbTxMode button + if(m_mode=="JT4" or m_mode.mid(0,4)=="WSPR") { +// If coming from JT4 or WSPR mode, pretend temporarily that we're coming +// from JT9 and click the pbTxMode button m_modeTx="JT9"; on_pbTxMode_clicked(); } diff --git a/plotter.cpp b/plotter.cpp index dcbec62b0..2e4ae2b18 100644 --- a/plotter.cpp +++ b/plotter.cpp @@ -94,7 +94,6 @@ void CPlotter::draw(float swide[], bool bScroll) //dr double fac = sqrt(m_binsPerPixel*m_waterfallAvg/15.0); double gain = fac*pow(10.0,0.02*m_plotGain); double gain2d = pow(10.0,0.02*(m_plot2dGain)); -// qDebug() << m_binsPerPixel << m_waterfallAvg << m_plotGain << gain; //move current data down one line (must do this before attaching a QPainter object) if(bScroll) m_WaterfallPixmap.scroll(0,1,0,0,m_w,m_h1);