VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-08-26 13:26:24 -04:00
Code Issues Projects Releases Wiki Activity

Removed GLSpectrum getter from DeviceSourceAPI

Browse Source
This commit is contained in:
f4exb
2017-10-30 00:02:28 +01:00
parent e8fb70096c
commit e520ef5aeb
52 changed files with 249 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/bladerfinput/bladerfinputgui.cpp
+5 -3
View File
@@ -27,11 +27,13 @@
#include "dsp/dspengine.h"
#include "dsp/dspcommands.h"
#include <device/devicesourceapi.h>
#include "device/deviceuiset.h"
BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::BladerfInputGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
m_settings(),
m_sampleSource(NULL),
@@ -148,8 +150,8 @@ void BladerfInputGui::handleInputMessages()
void BladerfInputGui::updateSampleRateAndFrequency()
{
m_deviceAPI->getSpectrum()->setSampleRate(m_sampleRate);
m_deviceAPI->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency);
m_deviceUISet->getSpectrum()->setSampleRate(m_sampleRate);
m_deviceUISet->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency);
ui->deviceRateLabel->setText(tr("%1k").arg(QString::number(m_sampleRate / 1000.0f, 'g', 5)));
}
plugins/samplesource/bladerfinput/bladerfinputgui.h
+3 -1
View File
@@ -26,6 +26,7 @@
#include "bladerfinput.h"
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {
class BladerfInputGui;
@@ -35,7 +36,7 @@ class BladerfInputGui : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
explicit BladerfInputGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~BladerfInputGui();
virtual void destroy();
@@ -54,6 +55,7 @@ private:
Ui::BladerfInputGui* ui;
DeviceSourceAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
bool m_forceSettings;
BladeRFInputSettings m_settings;
QTimer m_updateTimer;
plugins/samplesource/bladerfinput/bladerfinputplugin.cpp
+6 -2
View File
@@ -78,11 +78,15 @@ PluginInterface::SamplingDevices BlderfInputPlugin::enumSampleSources()
return result;
}
PluginInstanceGUI* BlderfInputPlugin::createSampleSourcePluginInstanceGUI(const QString& sourceId,QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceGUI* BlderfInputPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceSourceAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sourceId == m_deviceTypeID)
{
BladerfInputGui* gui = new BladerfInputGui(deviceAPI);
BladerfInputGui* gui = new BladerfInputGui(deviceAPI, deviceUISet);
*widget = gui;
return gui;
}
plugins/samplesource/bladerfinput/bladerfinputplugin.h
+6 -1
View File
@@ -22,6 +22,7 @@
class PluginAPI;
class DeviceSourceAPI;
class DeviceUISet;
#define BLADERF_DEVICE_TYPE_ID "sdrangel.samplesource.bladerf"
@@ -37,7 +38,11 @@ public:
void initPlugin(PluginAPI* pluginAPI);
virtual SamplingDevices enumSampleSources();
virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI);
virtual PluginInstanceGUI* createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceSourceAPI *deviceAPI,
DeviceUISet *deviceUISet);
virtual DeviceSampleSource* createSampleSourcePluginInstanceInput(const QString& sourceId, DeviceSourceAPI *deviceAPI);
static const QString m_hardwareID;