VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-07-19 09:15:35 -04:00
Code Issues Projects Releases Wiki Activity

NoiseFigure plugin: Fix #1269 and #1268

Browse Source
This commit is contained in:
Jon Beniston 2022-06-01 11:41:40 +01:00
parent 2c7b8374d6
commit 932485bd17
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/channelrx/noisefigure/noisefigure.cpp
View File

@ -311,7 +311,7 @@ void NoiseFigure::nextState()
} }
} }
m_state = SET_SWEEP_VALUE; m_state = SET_SWEEP_VALUE;
QTimer::singleShot(0, this, SLOT(nextState())); QTimer::singleShot(0, this, &NoiseFigure::nextState);
break; break;
case SET_SWEEP_VALUE: case SET_SWEEP_VALUE:
@ -320,7 +320,7 @@ void NoiseFigure::nextState()
{ {
qDebug() << "NoiseFigure::nextState: Set " << m_settings.m_setting << " to " << m_sweepValue; qDebug() << "NoiseFigure::nextState: Set " << m_settings.m_setting << " to " << m_sweepValue;
m_state = POWER_ON; m_state = POWER_ON;
QTimer::singleShot(100, this, SLOT(nextState())); QTimer::singleShot(100, this, &NoiseFigure::nextState);
} else } else
{ {
qDebug() << "NoiseFigure::nextState: Unable to set " << m_settings.m_setting << " to " << m_sweepValue; qDebug() << "NoiseFigure::nextState: Unable to set " << m_settings.m_setting << " to " << m_sweepValue;
@ -330,7 +330,7 @@ void NoiseFigure::nextState()
case POWER_ON: case POWER_ON:
// Power on noise source // Power on noise source
powerOn(); powerOn();
QTimer::singleShot(m_settings.m_powerDelay * 1000.0, this, SLOT(nextState())); QTimer::singleShot(m_settings.m_powerDelay * 1000.0, this, &NoiseFigure::nextState);
m_state = MEASURE_ON; m_state = MEASURE_ON;
break; break;
@ -343,7 +343,7 @@ void NoiseFigure::nextState()
case POWER_OFF: case POWER_OFF:
// Power off noise source // Power off noise source
powerOff(); powerOff();
QTimer::singleShot(m_settings.m_powerDelay * 1000.0, this, SLOT(nextState())); QTimer::singleShot(m_settings.m_powerDelay * 1000.0, this, &NoiseFigure::nextState);
m_state = MEASURE_OFF; m_state = MEASURE_OFF;
break; break;
@ -392,7 +392,7 @@ void NoiseFigure::nextState()
m_sweepValue += m_settings.m_step * scaleFactor; m_sweepValue += m_settings.m_step * scaleFactor;
} }
m_state = SET_SWEEP_VALUE; m_state = SET_SWEEP_VALUE;
QTimer::singleShot(0, this, SLOT(nextState())); QTimer::singleShot(0, this, &NoiseFigure::nextState);
} }
break; break;
} }
@ -490,14 +490,14 @@ bool NoiseFigure::handleMessage(const Message& cmd)
if (!m_settings.m_visaDevice.isEmpty()) if (!m_settings.m_visaDevice.isEmpty())
{ {
if (openVISADevice()) { if (openVISADevice()) {
QTimer::singleShot(0, this, SLOT(nextState())); QTimer::singleShot(0, this, &NoiseFigure::nextState);
} else if (getMessageQueueToGUI()) { } else if (getMessageQueueToGUI()) {
getMessageQueueToGUI()->push(MsgFinished::create(QString("Failed to open VISA device %1").arg(m_settings.m_visaDevice))); getMessageQueueToGUI()->push(MsgFinished::create(QString("Failed to open VISA device %1").arg(m_settings.m_visaDevice)));
} }
} }
else else
{ {
QTimer::singleShot(0, this, SLOT(nextState())); QTimer::singleShot(0, this, &NoiseFigure::nextState);
} }
} }
else else

9
plugins/channelrx/noisefigure/noisefigurecontroldialog.cpp
View File

@ -17,8 +17,6 @@
#include <QDebug> #include <QDebug>
#include "util/visa.h"
#include "noisefigurecontroldialog.h" #include "noisefigurecontroldialog.h"
NoiseFigureControlDialog::NoiseFigureControlDialog(NoiseFigureSettings *settings, QWidget* parent) : NoiseFigureControlDialog::NoiseFigureControlDialog(NoiseFigureSettings *settings, QWidget* parent) :
@ -33,13 +31,6 @@ NoiseFigureControlDialog::NoiseFigureControlDialog(NoiseFigureSettings *settings
ui->powerOnSCPI->setPlainText(settings->m_powerOnSCPI); ui->powerOnSCPI->setPlainText(settings->m_powerOnSCPI);
ui->powerOffSCPI->setPlainText(settings->m_powerOffSCPI); ui->powerOffSCPI->setPlainText(settings->m_powerOffSCPI);
ui->delay->setValue(settings->m_powerDelay); ui->delay->setValue(settings->m_powerDelay);
VISA visa;
if (!visa.isAvailable())
{
ui->device->setEnabled(false);
ui->powerOnSCPI->setEnabled(false);
ui->powerOffSCPI->setEnabled(false);
}
} }
NoiseFigureControlDialog::~NoiseFigureControlDialog() NoiseFigureControlDialog::~NoiseFigureControlDialog()

2
plugins/channelrx/noisefigure/noisefigureplugin.cpp
View File

@ -29,7 +29,7 @@
const PluginDescriptor NoiseFigurePlugin::m_pluginDescriptor = { const PluginDescriptor NoiseFigurePlugin::m_pluginDescriptor = {
NoiseFigure::m_channelId, NoiseFigure::m_channelId,
QStringLiteral("Noise Figure"), QStringLiteral("Noise Figure"),
QStringLiteral("7.0.0"), QStringLiteral("7.3.1"),
QStringLiteral("(c) Jon Beniston, M7RCE"), QStringLiteral("(c) Jon Beniston, M7RCE"),
QStringLiteral("https://github.com/f4exb/sdrangel"), QStringLiteral("https://github.com/f4exb/sdrangel"),
true, true,