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/fcdpro/fcdprogui.cpp
+5 -3
View File
@@ -24,13 +24,15 @@
#include "fcdprogui.h"
#include <device/devicesourceapi.h>
#include "device/deviceuiset.h"
#include "fcdproconst.h"
#include "fcdtraits.h"
FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
FCDProGui::FCDProGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::FCDProGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_forceSettings(true),
m_settings(),
m_sampleSource(NULL),
@@ -235,8 +237,8 @@ void FCDProGui::handleInputMessages()
void FCDProGui::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->deviceRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000));
}
plugins/samplesource/fcdpro/fcdprogui.h
+3 -1
View File
@@ -27,6 +27,7 @@
class DeviceSourceAPI;
class QWidget;
class DeviceUISet;
namespace Ui {
class FCDProGui;
@@ -36,7 +37,7 @@ class FCDProGui : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit FCDProGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
explicit FCDProGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~FCDProGui();
virtual void destroy();
@@ -55,6 +56,7 @@ private:
Ui::FCDProGui* ui;
DeviceSourceAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
bool m_forceSettings;
FCDProSettings m_settings;
QTimer m_updateTimer;
plugins/samplesource/fcdpro/fcdproplugin.cpp
+6 -2
View File
@@ -74,11 +74,15 @@ PluginInterface::SamplingDevices FCDProPlugin::enumSampleSources()
return result;
}
PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceGUI* FCDProPlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceSourceAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sourceId == fcd_traits<Pro>::interfaceIID)
{
FCDProGui* gui = new FCDProGui(deviceAPI);
FCDProGui* gui = new FCDProGui(deviceAPI, deviceUISet);
*widget = gui;
return gui;
}
plugins/samplesource/fcdpro/fcdproplugin.h
+5 -1
View File
@@ -20,7 +20,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);
private: