From 325449fe27225a267dc2d5a03cd4f5dd2bc312bd Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Wed, 10 Jun 2015 16:09:08 +0000 Subject: [PATCH] One click of Erase clears the text area in Echo mode. Fix calibration of the "pwr" slider, relative to what actually happens. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5574 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- mainwindow.cpp | 2 +- soundout.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index fba7153d1..7d583f10e 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1771,7 +1771,7 @@ void MainWindow::on_EraseButton_clicked() //Erase { qint64 ms=QDateTime::currentMSecsSinceEpoch(); ui->decodedTextBrowser2->clear(); - if(m_mode.mid(0,4)=="WSPR") { + if(m_mode.mid(0,4)=="WSPR" or m_mode=="Echo") { ui->decodedTextBrowser->clear(); } else { m_QSOText.clear(); diff --git a/soundout.cpp b/soundout.cpp index 9e5843e91..c0ac8ed61 100644 --- a/soundout.cpp +++ b/soundout.cpp @@ -146,7 +146,7 @@ qreal SoundOutput::attenuation () const void SoundOutput::setAttenuation (qreal a) { Q_ASSERT (0. <= a && a <= 999.); - m_volume = qPow (10., -a / 10.); + m_volume = qPow(10.0, -a/20.0); // qDebug () << "SoundOut: attn = " << a << ", vol = " << m_volume; if (m_stream) {