VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-25 17:28:50 -05:00
Code Issues Projects Releases Wiki Activity

Device source and sink APIs: removed direct reference to main window

Browse Source
This commit is contained in:
f4exb 2017-10-22 23:50:10 +02:00
parent 4114d269ea
commit 1b95457d96
8 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/samplesink/filesink/filesinkgui.cpp
View File

@ -59,7 +59,7 @@ FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) :
ui->fileNameText->setText(m_fileName); ui->fileNameText->setText(m_fileName);
connect(&(m_deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);

2
plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp
View File

@ -78,7 +78,7 @@ SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) :
ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow));
ui->sampleRate->setValueRange(7, 32000U, 9000000U); ui->sampleRate->setValueRange(7, 32000U, 9000000U);
connect(&(m_deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);

2
plugins/samplesource/filesource/filesourcegui.cpp
View File

@ -56,7 +56,7 @@ FileSourceGui::FileSourceGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
ui->centerFrequency->setValueRange(7, 0, pow(10,7)); ui->centerFrequency->setValueRange(7, 0, pow(10,7));
ui->fileNameText->setText(m_fileName); ui->fileNameText->setText(m_fileName);
connect(&(m_deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&(m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);

2
plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp
View File

@ -99,7 +99,7 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceSourceAPI *deviceAPI, QWidget* pare
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);
connect(&(deviceAPI->getMainWindow()->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&(deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
m_sampleSource = (SDRdaemonSourceInput*) m_deviceAPI->getSampleSource(); m_sampleSource = (SDRdaemonSourceInput*) m_deviceAPI->getSampleSource();

1
sdrgui/device/devicesinkapi.cpp
View File

@ -31,7 +31,6 @@ DeviceSinkAPI::DeviceSinkAPI(MainWindow *mainWindow,
DSPDeviceSinkEngine *deviceSinkEngine, DSPDeviceSinkEngine *deviceSinkEngine,
GLSpectrum *glSpectrum, GLSpectrum *glSpectrum,
ChannelWindow *channelWindow) : ChannelWindow *channelWindow) :
m_mainWindow(mainWindow),
m_deviceTabIndex(deviceTabIndex), m_deviceTabIndex(deviceTabIndex),
m_deviceSinkEngine(deviceSinkEngine), m_deviceSinkEngine(deviceSinkEngine),
m_spectrum(glSpectrum), m_spectrum(glSpectrum),

2
sdrgui/device/devicesinkapi.h
View File

@ -94,7 +94,6 @@ public:
void loadChannelSettings(const Preset* preset, PluginAPI *pluginAPI); void loadChannelSettings(const Preset* preset, PluginAPI *pluginAPI);
void saveChannelSettings(Preset* preset); void saveChannelSettings(Preset* preset);
MainWindow *getMainWindow() { return m_mainWindow; }
DSPDeviceSinkEngine *getDeviceSinkEngine() { return m_deviceSinkEngine; } DSPDeviceSinkEngine *getDeviceSinkEngine() { return m_deviceSinkEngine; }
const std::vector<DeviceSourceAPI*>& getSourceBuddies() const { return m_sourceBuddies; } const std::vector<DeviceSourceAPI*>& getSourceBuddies() const { return m_sourceBuddies; }
@ -141,7 +140,6 @@ protected:
void renameChannelInstances(); void renameChannelInstances();
MainWindow *m_mainWindow;
int m_deviceTabIndex; int m_deviceTabIndex;
DSPDeviceSinkEngine *m_deviceSinkEngine; DSPDeviceSinkEngine *m_deviceSinkEngine;
GLSpectrum *m_spectrum; GLSpectrum *m_spectrum;

1
sdrgui/device/devicesourceapi.cpp
View File

@ -31,7 +31,6 @@ DeviceSourceAPI::DeviceSourceAPI(MainWindow *mainWindow,
DSPDeviceSourceEngine *deviceSourceEngine, DSPDeviceSourceEngine *deviceSourceEngine,
GLSpectrum *glSpectrum, GLSpectrum *glSpectrum,
ChannelWindow *channelWindow) : ChannelWindow *channelWindow) :
m_mainWindow(mainWindow),
m_deviceTabIndex(deviceTabIndex), m_deviceTabIndex(deviceTabIndex),
m_deviceSourceEngine(deviceSourceEngine), m_deviceSourceEngine(deviceSourceEngine),
m_spectrum(glSpectrum), m_spectrum(glSpectrum),

2
sdrgui/device/devicesourceapi.h
View File

@ -95,7 +95,6 @@ public:
void loadChannelSettings(const Preset* preset, PluginAPI *pluginAPI); void loadChannelSettings(const Preset* preset, PluginAPI *pluginAPI);
void saveChannelSettings(Preset* preset); void saveChannelSettings(Preset* preset);
MainWindow *getMainWindow() { return m_mainWindow; }
DSPDeviceSourceEngine *getDeviceSourceEngine() { return m_deviceSourceEngine; } DSPDeviceSourceEngine *getDeviceSourceEngine() { return m_deviceSourceEngine; }
const std::vector<DeviceSourceAPI*>& getSourceBuddies() const { return m_sourceBuddies; } const std::vector<DeviceSourceAPI*>& getSourceBuddies() const { return m_sourceBuddies; }
@ -142,7 +141,6 @@ protected:
void renameChannelInstances(); void renameChannelInstances();
MainWindow *m_mainWindow;
int m_deviceTabIndex; int m_deviceTabIndex;
DSPDeviceSourceEngine *m_deviceSourceEngine; DSPDeviceSourceEngine *m_deviceSourceEngine;
GLSpectrum *m_spectrum; GLSpectrum *m_spectrum;