From 93d20cc1ba93bfebcea6572a3c405d5b1945637a Mon Sep 17 00:00:00 2001 From: Phil Taylor Date: Fri, 20 Jan 2023 11:24:29 +0000 Subject: [PATCH] Fix compile errors after merge --- transceiveradjustments.cpp | 5 +++++ wfmain.cpp | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/transceiveradjustments.cpp b/transceiveradjustments.cpp index c9cc41e..56447ad 100644 --- a/transceiveradjustments.cpp +++ b/transceiveradjustments.cpp @@ -121,7 +121,12 @@ void transceiverAdjustments::updatePassband(quint16 passbandHz) { lastKnownPassband = passbandHz; float l = 2.0*passbandHz/maxHz; +#ifndef Q_OS_WIN int val = exp10f(l); +#else + int val = pow(10, l); +#endif + //qDebug() << "Updating slider passband to " << passbandHz << "Hz using 1-100 value:" << val << "with l=" << l << "and max=" << maxHz; ui->passbandWidthSlider->blockSignals(true); ui->passbandWidthSlider->setValue(val); diff --git a/wfmain.cpp b/wfmain.cpp index 6b69bd6..36855db 100644 --- a/wfmain.cpp +++ b/wfmain.cpp @@ -6343,8 +6343,8 @@ void wfmain::receiveLANGain(unsigned char level) void wfmain::receivePassband(quint16 pass) { - if (passBand != (double)(pass / 1000000.0)) { - passBand = (double)(pass / 1000000.0); + if (passbandWidth != (double)(pass / 1000000.0)) { + passbandWidth = (double)(pass / 1000000.0); trxadj->updatePassband(pass); showStatusBarText(QString("IF filter width %1 Hz").arg(pass)); }