From 00cf437bf2764246f41b00b4cdf43359ca9bd7b6 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 14 Apr 2017 02:16:04 +0200 Subject: [PATCH] HackRF: changed placement of input object creation in the GUI --- plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp | 10 ++++------ plugins/samplesource/hackrfinput/hackrfinputgui.cpp | 7 ++++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index a6172d7b2..62cbce6ff 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -38,7 +38,10 @@ HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : m_deviceSampleSink(0), m_lastEngineState((DSPDeviceSinkEngine::State)-1) { - ui->setupUi(this); + m_deviceSampleSink = new HackRFOutput(m_deviceAPI); + m_deviceAPI->setSink(m_deviceSampleSink); + + ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setValueRange(7, 0U, 7250000U); @@ -50,13 +53,8 @@ HackRFOutputGui::HackRFOutputGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : m_statusTimer.start(500); displaySettings(); - - m_deviceSampleSink = new HackRFOutput(m_deviceAPI); - displayBandwidths(); - m_deviceAPI->setSink(m_deviceSampleSink); - connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); } diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 2c1d0c67f..10e2026f3 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -39,7 +39,10 @@ HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : m_sampleSource(NULL), m_lastEngineState((DSPDeviceSourceEngine::State)-1) { - ui->setupUi(this); + m_sampleSource = new HackRFInput(m_deviceAPI); + m_deviceAPI->setSource(m_sampleSource); + + ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold)); ui->centerFrequency->setValueRange(7, 0U, 7250000U); @@ -52,11 +55,9 @@ HackRFInputGui::HackRFInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : displaySettings(); - m_sampleSource = new HackRFInput(m_deviceAPI); displayBandwidths(); - m_deviceAPI->setSource(m_sampleSource); char recFileNameCStr[30]; sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID());