VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-07-29 13:34:13 -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/filesource/filesourcegui.cpp
+5 -3
View File
@@ -33,11 +33,13 @@
#include "filesourcegui.h"
#include <device/devicesourceapi.h>
#include "device/deviceuiset.h"
FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent) :
QWidget(parent),
ui(new Ui::FileSourceGui),
m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_settings(),
m_sampleSource(NULL),
m_acquisition(false),
@@ -186,8 +188,8 @@ bool FileSourceGui::handleMessage(const Message& message)
void FileSourceGui::updateSampleRateAndFrequency()
{
m_deviceAPI->getSpectrum()->setSampleRate(m_deviceSampleRate);
m_deviceAPI->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency);
m_deviceUISet->getSpectrum()->setSampleRate(m_deviceSampleRate);
m_deviceUISet->getSpectrum()->setCenterFrequency(m_deviceCenterFrequency);
ui->deviceRateText->setText(tr("%1k").arg((float)m_deviceSampleRate / 1000));
}
plugins/samplesource/filesource/filesourcegui.h
+3 -1
View File
@@ -26,6 +26,7 @@
#include "filesourceinput.h"
class DeviceSourceAPI;
class DeviceUISet;
namespace Ui {
class FileSourceGui;
@@ -35,7 +36,7 @@ class FileSourceGui : public QWidget, public PluginInstanceGUI {
Q_OBJECT
public:
explicit FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent = NULL);
explicit FileSourceGui(DeviceSourceAPI *deviceAPI, DeviceUISet *deviceUISet, QWidget* parent = 0);
virtual ~FileSourceGui();
virtual void destroy();
@@ -54,6 +55,7 @@ private:
Ui::FileSourceGui* ui;
DeviceSourceAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
FileSourceInput::Settings m_settings;
QTimer m_statusTimer;
std::vector<int> m_gains;
plugins/samplesource/filesource/filesourceplugin.cpp
+6 -2
View File
@@ -69,11 +69,15 @@ PluginInterface::SamplingDevices FileSourcePlugin::enumSampleSources()
return result;
}
PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI)
PluginInstanceGUI* FileSourcePlugin::createSampleSourcePluginInstanceGUI(
const QString& sourceId,
QWidget **widget,
DeviceSourceAPI *deviceAPI,
DeviceUISet *deviceUISet)
{
if(sourceId == m_deviceTypeID)
{
FileSourceGui* gui = new FileSourceGui(deviceAPI);
FileSourceGui* gui = new FileSourceGui(deviceAPI, deviceUISet);
*widget = gui;
return gui;
}
plugins/samplesource/filesource/filesourceplugin.h
+5 -1
View File
@@ -36,7 +36,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;