VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-29 11:18:56 -05:00
Code Issues Projects Releases Wiki Activity

Use MainCore instance in place of MainWindow

Browse Source
This commit is contained in:
f4exb 2020-10-12 21:59:04 +02:00
parent 950b9a5934
commit 8ba95addc0
22 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/channelrx/chanalyzer/chanalyzergui.cpp
View File

@ -29,7 +29,7 @@
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "util/simpleserializer.h" #include "util/simpleserializer.h"
#include "util/db.h" #include "util/db.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_chanalyzergui.h" #include "ui_chanalyzergui.h"
#include "chanalyzer.h" #include "chanalyzer.h"
@ -392,9 +392,9 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
ui->glSpectrum->setSsbSpectrum(false); ui->glSpectrum->setSsbSpectrum(false);
ui->glSpectrum->setLsbDisplay(false); ui->glSpectrum->setLsbDisplay(false);
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
ui->glScope->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glScope->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
m_channelMarker.blockSignals(true); m_channelMarker.blockSignals(true);
m_channelMarker.setColor(Qt::gray); m_channelMarker.setColor(Qt::gray);

4
plugins/channelrx/demodam/amdemodgui.cpp
View File

@ -31,9 +31,9 @@
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h" #include "dsp/dspengine.h"
#include "mainwindow.h"
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "maincore.h"
#include "amdemod.h" #include "amdemod.h"
@ -247,7 +247,7 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS
m_amDemod = reinterpret_cast<AMDemod*>(rxChannel); //new AMDemod(m_deviceUISet->m_deviceSourceAPI); m_amDemod = reinterpret_cast<AMDemod*>(rxChannel); //new AMDemod(m_deviceUISet->m_deviceSourceAPI);
m_amDemod->setMessageQueueToGUI(getInputMessageQueue()); m_amDemod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

6
plugins/channelrx/demodatv/atvdemodgui.cpp
View File

@ -28,7 +28,7 @@
#include "util/simpleserializer.h" #include "util/simpleserializer.h"
#include "util/db.h" #include "util/db.h"
#include "dsp/dspengine.h" #include "dsp/dspengine.h"
#include "mainwindow.h" #include "maincore.h"
#include "atvdemod.h" #include "atvdemod.h"
@ -227,8 +227,8 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base
m_atvDemod->setScopeSink(m_scopeVis); m_atvDemod->setScopeSink(m_scopeVis);
m_atvDemod->setTVScreen(ui->screenTV); m_atvDemod->setTVScreen(ui->screenTV);
ui->glScope->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glScope->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03))); ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

4
plugins/channelrx/demodbfm/bfmdemodgui.cpp
View File

@ -37,7 +37,7 @@
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "bfmdemodreport.h" #include "bfmdemodreport.h"
#include "bfmdemodsettings.h" #include "bfmdemodsettings.h"
@ -385,7 +385,7 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
FFTWindow::BlackmanHarris, FFTWindow::BlackmanHarris,
false // logarithmic scale false // logarithmic scale
); );
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
m_channelMarker.blockSignals(true); m_channelMarker.blockSignals(true);
m_channelMarker.setColor(m_settings.m_rgbColor); m_channelMarker.setColor(m_settings.m_rgbColor);

8
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -30,7 +30,7 @@
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "dsp/dspengine.h" #include "dsp/dspengine.h"
#include "mainwindow.h" #include "maincore.h"
#include "dsddemodbaudrates.h" #include "dsddemodbaudrates.h"
#include "dsddemod.h" #include "dsddemod.h"
@ -349,7 +349,7 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_dsdDemod->setScopeXYSink(m_scopeVisXY); m_dsdDemod->setScopeXYSink(m_scopeVisXY);
m_dsdDemod->setMessageQueueToGUI(getInputMessageQueue()); m_dsdDemod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }"); ui->audioMute->setStyleSheet("QToolButton { background:rgb(79,79,79); }");
@ -387,8 +387,8 @@ DSDDemodGUI::~DSDDemodGUI()
void DSDDemodGUI::updateMyPosition() void DSDDemodGUI::updateMyPosition()
{ {
float latitude = MainWindow::getInstance()->getMainSettings().getLatitude(); float latitude = MainCore::instance()->getSettings().getLatitude();
float longitude = MainWindow::getInstance()->getMainSettings().getLongitude(); float longitude = MainCore::instance()->getSettings().getLongitude();
if ((m_myLatitude != latitude) || (m_myLongitude != longitude)) if ((m_myLatitude != latitude) || (m_myLongitude != longitude))
{ {

6
plugins/channelrx/demodfreedv/freedvdemodgui.cpp
View File

@ -32,7 +32,7 @@
#include "util/db.h" #include "util/db.h"
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_freedvdemodgui.h" #include "ui_freedvdemodgui.h"
#include "freedvdemod.h" #include "freedvdemod.h"
@ -267,9 +267,9 @@ FreeDVDemodGUI::FreeDVDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B
ui->glSpectrum->setDisplayWaterfall(true); ui->glSpectrum->setDisplayWaterfall(true);
ui->glSpectrum->setDisplayMaxHold(true); ui->glSpectrum->setDisplayMaxHold(true);
ui->glSpectrum->setSsbSpectrum(true); ui->glSpectrum->setSsbSpectrum(true);
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

4
plugins/channelrx/demodnfm/nfmdemodgui.cpp
View File

@ -12,7 +12,7 @@
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "dsp/dspengine.h" #include "dsp/dspengine.h"
#include "mainwindow.h" #include "maincore.h"
#include "nfmdemodreport.h" #include "nfmdemodreport.h"
#include "nfmdemod.h" #include "nfmdemod.h"
@ -274,7 +274,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_nfmDemod = reinterpret_cast<NFMDemod*>(rxChannel); //new NFMDemod(m_deviceUISet->m_deviceSourceAPI); m_nfmDemod = reinterpret_cast<NFMDemod*>(rxChannel); //new NFMDemod(m_deviceUISet->m_deviceSourceAPI);
m_nfmDemod->setMessageQueueToGUI(getInputMessageQueue()); m_nfmDemod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

6
plugins/channelrx/demodssb/ssbdemodgui.cpp
View File

@ -16,7 +16,7 @@
#include "util/db.h" #include "util/db.h"
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ssbdemod.h" #include "ssbdemod.h"
SSBDemodGUI* SSBDemodGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel) SSBDemodGUI* SSBDemodGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel)
@ -305,9 +305,9 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
ui->glSpectrum->setDisplayWaterfall(true); ui->glSpectrum->setDisplayWaterfall(true);
ui->glSpectrum->setDisplayMaxHold(true); ui->glSpectrum->setDisplayMaxHold(true);
ui->glSpectrum->setSsbSpectrum(true); ui->glSpectrum->setSsbSpectrum(true);
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
m_channelMarker.blockSignals(true); m_channelMarker.blockSignals(true);
m_channelMarker.setColor(Qt::green); m_channelMarker.setColor(Qt::green);

4
plugins/channelrx/demodwfm/wfmdemodgui.cpp
View File

@ -15,7 +15,7 @@
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "wfmdemod.h" #include "wfmdemod.h"
@ -210,7 +210,7 @@ WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_wfmDemod = (WFMDemod*) rxChannel; //new WFMDemod(m_deviceUISet->m_deviceSourceAPI); m_wfmDemod = (WFMDemod*) rxChannel; //new WFMDemod(m_deviceUISet->m_deviceSourceAPI);
m_wfmDemod->setMessageQueueToGUI(getInputMessageQueue()); m_wfmDemod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->audioMute);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

4
plugins/channelrx/freqtracker/freqtrackergui.cpp
View File

@ -31,9 +31,9 @@
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "dsp/dspengine.h" #include "dsp/dspengine.h"
#include "mainwindow.h"
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "maincore.h"
#include "freqtracker.h" #include "freqtracker.h"
#include "freqtrackerreport.h" #include "freqtrackerreport.h"
@ -301,7 +301,7 @@ FreqTrackerGUI::FreqTrackerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, B
m_freqTracker = reinterpret_cast<FreqTracker*>(rxChannel); //new FreqTracker(m_deviceUISet->m_deviceSourceAPI); m_freqTracker = reinterpret_cast<FreqTracker*>(rxChannel); //new FreqTracker(m_deviceUISet->m_deviceSourceAPI);
m_freqTracker->setMessageQueueToGUI(getInputMessageQueue()); m_freqTracker->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03))); ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

6
plugins/channelrx/udpsink/udpsinkgui.cpp
View File

@ -25,7 +25,7 @@
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "ui_udpsinkgui.h" #include "ui_udpsinkgui.h"
#include "mainwindow.h" #include "maincore.h"
#include "udpsink.h" #include "udpsink.h"
#include "udpsinkgui.h" #include "udpsinkgui.h"
@ -177,8 +177,8 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS
false // logarithmic scale false // logarithmic scale
); );
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
m_channelMarker.blockSignals(true); m_channelMarker.blockSignals(true);
m_channelMarker.setBandwidth(16000); m_channelMarker.setBandwidth(16000);

10
plugins/channeltx/mod802.15.4/ieee_802_15_4_modgui.cpp
View File

@ -34,7 +34,7 @@
#include "gui/crightclickenabler.h" #include "gui/crightclickenabler.h"
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_ieee_802_15_4_modgui.h" #include "ui_ieee_802_15_4_modgui.h"
#include "ieee_802_15_4_modgui.h" #include "ieee_802_15_4_modgui.h"
@ -338,12 +338,12 @@ IEEE_802_15_4_ModGUI::IEEE_802_15_4_ModGUI(PluginAPI* pluginAPI, DeviceUISet *de
m_IEEE_802_15_4_Mod = (IEEE_802_15_4_Mod*) channelTx; m_IEEE_802_15_4_Mod = (IEEE_802_15_4_Mod*) channelTx;
m_IEEE_802_15_4_Mod->setMessageQueueToGUI(getInputMessageQueue()); m_IEEE_802_15_4_Mod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
m_scopeVis = new ScopeVis(ui->glScope); m_scopeVis = new ScopeVis(ui->glScope);
m_IEEE_802_15_4_Mod->setScopeSink(m_scopeVis); m_IEEE_802_15_4_Mod->setScopeSink(m_scopeVis);
ui->glScope->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glScope->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); // 50 ms
ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope); ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope);
// Scope settings to display the IQ waveforms // Scope settings to display the IQ waveforms
@ -385,7 +385,7 @@ IEEE_802_15_4_ModGUI::IEEE_802_15_4_ModGUI(PluginAPI* pluginAPI, DeviceUISet *de
ui->glSpectrum->setDisplayWaterfall(false); ui->glSpectrum->setDisplayWaterfall(false);
ui->glSpectrum->setDisplayMaxHold(false); ui->glSpectrum->setDisplayMaxHold(false);
ui->glSpectrum->setDisplayHistogram(false); ui->glSpectrum->setDisplayHistogram(false);
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
CRightClickEnabler *repeatRightClickEnabler = new CRightClickEnabler(ui->repeat); CRightClickEnabler *repeatRightClickEnabler = new CRightClickEnabler(ui->repeat);
connect(repeatRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(repeatSelect())); connect(repeatRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(repeatSelect()));

4
plugins/channeltx/modam/ammodgui.cpp
View File

@ -32,7 +32,7 @@
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_ammodgui.h" #include "ui_ammodgui.h"
#include "ammodgui.h" #include "ammodgui.h"
@ -339,7 +339,7 @@ AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampl
m_amMod = (AMMod*) channelTx; //new AMMod(m_deviceUISet->m_deviceSinkAPI); m_amMod = (AMMod*) channelTx; //new AMMod(m_deviceUISet->m_deviceSinkAPI);
m_amMod->setMessageQueueToGUI(getInputMessageQueue()); m_amMod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

4
plugins/channeltx/modatv/atvmodgui.cpp
View File

@ -31,7 +31,7 @@
#include "util/db.h" #include "util/db.h"
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_atvmodgui.h" #include "ui_atvmodgui.h"
#include "atvmodgui.h" #include "atvmodgui.h"
@ -72,7 +72,7 @@ ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_atvMod->setMessageQueueToGUI(getInputMessageQueue()); m_atvMod->setMessageQueueToGUI(getInputMessageQueue());
m_atvMod->propagateMessageQueueToGUI(); m_atvMod->propagateMessageQueueToGUI();
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03))); ui->deltaFrequencyLabel->setText(QString("%1f").arg(QChar(0x94, 0x03)));
ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));

6
plugins/channeltx/modfreedv/freedvmodgui.cpp
View File

@ -35,7 +35,7 @@
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_freedvmodgui.h" #include "ui_freedvmodgui.h"
FreeDVModGUI* FreeDVModGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx) FreeDVModGUI* FreeDVModGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx)
@ -361,9 +361,9 @@ FreeDVModGUI::FreeDVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
ui->glSpectrum->setDisplayWaterfall(true); ui->glSpectrum->setDisplayWaterfall(true);
ui->glSpectrum->setDisplayMaxHold(true); ui->glSpectrum->setDisplayMaxHold(true);
ui->glSpectrum->setSsbSpectrum(true); ui->glSpectrum->setSsbSpectrum(true);
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

4
plugins/channeltx/modnfm/nfmmodgui.cpp
View File

@ -31,7 +31,7 @@
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_nfmmodgui.h" #include "ui_nfmmodgui.h"
#include "nfmmodgui.h" #include "nfmmodgui.h"
@ -368,7 +368,7 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_nfmMod = (NFMMod*) channelTx; //new NFMMod(m_deviceUISet->m_deviceSinkAPI); m_nfmMod = (NFMMod*) channelTx; //new NFMMod(m_deviceUISet->m_deviceSinkAPI);
m_nfmMod->setMessageQueueToGUI(getInputMessageQueue()); m_nfmMod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

10
plugins/channeltx/modpacket/packetmodgui.cpp
View File

@ -33,7 +33,7 @@
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "gui/fmpreemphasisdialog.h" #include "gui/fmpreemphasisdialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_packetmodgui.h" #include "ui_packetmodgui.h"
#include "packetmodgui.h" #include "packetmodgui.h"
@ -208,8 +208,8 @@ void PacketModGUI::on_packet_editingFinished()
void PacketModGUI::on_insertPosition_clicked(bool checked) void PacketModGUI::on_insertPosition_clicked(bool checked)
{ {
float latitude = MainWindow::getInstance()->getMainSettings().getLatitude(); float latitude = MainCore::instance()->getSettings().getLatitude();
float longitude = MainWindow::getInstance()->getMainSettings().getLongitude(); float longitude = MainCore::instance()->getSettings().getLongitude();
int latDeg, latMin, latFrac, latNorth; int latDeg, latMin, latFrac, latNorth;
int longDeg, longMin, longFrac, longEast; int longDeg, longMin, longFrac, longEast;
@ -406,7 +406,7 @@ PacketModGUI::PacketModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
m_packetMod = (PacketMod*) channelTx; m_packetMod = (PacketMod*) channelTx;
m_packetMod->setMessageQueueToGUI(getInputMessageQueue()); m_packetMod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
m_spectrumVis = m_packetMod->getSpectrumVis(); m_spectrumVis = m_packetMod->getSpectrumVis();
m_spectrumVis->setGLSpectrum(ui->glSpectrum); m_spectrumVis->setGLSpectrum(ui->glSpectrum);
@ -420,7 +420,7 @@ PacketModGUI::PacketModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
ui->glSpectrum->setDisplayWaterfall(false); ui->glSpectrum->setDisplayWaterfall(false);
ui->glSpectrum->setDisplayMaxHold(false); ui->glSpectrum->setDisplayMaxHold(false);
ui->glSpectrum->setDisplayHistogram(false); ui->glSpectrum->setDisplayHistogram(false);
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
CRightClickEnabler *repeatRightClickEnabler = new CRightClickEnabler(ui->repeat); CRightClickEnabler *repeatRightClickEnabler = new CRightClickEnabler(ui->repeat);
connect(repeatRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(repeatSelect())); connect(repeatRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(repeatSelect()));

6
plugins/channeltx/modssb/ssbmodgui.cpp
View File

@ -36,7 +36,7 @@
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "mainwindow.h" #include "maincore.h"
SSBModGUI* SSBModGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx) SSBModGUI* SSBModGUI::create(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSource *channelTx)
{ {
@ -412,9 +412,9 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
ui->glSpectrum->setDisplayWaterfall(true); ui->glSpectrum->setDisplayWaterfall(true);
ui->glSpectrum->setDisplayMaxHold(true); ui->glSpectrum->setDisplayMaxHold(true);
ui->glSpectrum->setSsbSpectrum(true); ui->glSpectrum->setSsbSpectrum(true);
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

4
plugins/channeltx/modwfm/wfmmodgui.cpp
View File

@ -32,7 +32,7 @@
#include "gui/audioselectdialog.h" #include "gui/audioselectdialog.h"
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_wfmmodgui.h" #include "ui_wfmmodgui.h"
#include "wfmmodgui.h" #include "wfmmodgui.h"
@ -357,7 +357,7 @@ WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_wfmMod = (WFMMod*) channelTx; //new WFMMod(m_deviceUISet->m_deviceSinkAPI); m_wfmMod = (WFMMod*) channelTx; //new WFMMod(m_deviceUISet->m_deviceSinkAPI);
m_wfmMod->setMessageQueueToGUI(getInputMessageQueue()); m_wfmMod->setMessageQueueToGUI(getInputMessageQueue());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic); CRightClickEnabler *audioMuteRightClickEnabler = new CRightClickEnabler(ui->mic);
connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect())); connect(audioMuteRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(audioSelect()));

6
plugins/channeltx/udpsource/udpsourcegui.cpp
View File

@ -25,7 +25,7 @@
#include "gui/basicchannelsettingsdialog.h" #include "gui/basicchannelsettingsdialog.h"
#include "gui/devicestreamselectiondialog.h" #include "gui/devicestreamselectiondialog.h"
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "mainwindow.h" #include "maincore.h"
#include "ui_udpsourcegui.h" #include "ui_udpsourcegui.h"
@ -135,8 +135,8 @@ UDPSourceGUI::UDPSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
false // logarithmic scale false // logarithmic scale
); );
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer()); ui->glSpectrum->connectTimer(MainCore::instance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick())); connect(&MainCore::instance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
m_channelMarker.blockSignals(true); m_channelMarker.blockSignals(true);
m_channelMarker.setBandwidth(16000); m_channelMarker.setBandwidth(16000);

22
plugins/feature/rigctlserver/rigctlservergui.cpp
View File

@ -20,8 +20,8 @@
#include "feature/featureuiset.h" #include "feature/featureuiset.h"
#include "gui/basicfeaturesettingsdialog.h" #include "gui/basicfeaturesettingsdialog.h"
#include "mainwindow.h" #include "device/deviceset.h"
#include "device/deviceuiset.h" #include "maincore.h"
#include "ui_rigctlservergui.h" #include "ui_rigctlservergui.h"
#include "rigctlserver.h" #include "rigctlserver.h"
@ -165,16 +165,16 @@ void RigCtlServerGUI::displaySettings()
void RigCtlServerGUI::updateDeviceSetList() void RigCtlServerGUI::updateDeviceSetList()
{ {
MainWindow *mainWindow = MainWindow::getInstance(); MainCore *mainCore = MainCore::instance();
std::vector<DeviceUISet*>& deviceUISets = mainWindow->getDeviceUISets(); std::vector<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
std::vector<DeviceUISet*>::const_iterator it = deviceUISets.begin(); std::vector<DeviceSet*>::const_iterator it = deviceSets.begin();
ui->device->blockSignals(true); ui->device->blockSignals(true);
ui->device->clear(); ui->device->clear();
unsigned int deviceIndex = 0; unsigned int deviceIndex = 0;
for (; it != deviceUISets.end(); ++it, deviceIndex++) for (; it != deviceSets.end(); ++it, deviceIndex++)
{ {
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine; DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine;
DSPDeviceSinkEngine *deviceSinkEngine = (*it)->m_deviceSinkEngine; DSPDeviceSinkEngine *deviceSinkEngine = (*it)->m_deviceSinkEngine;
@ -187,7 +187,7 @@ void RigCtlServerGUI::updateDeviceSetList()
int newDeviceIndex; int newDeviceIndex;
if (it != deviceUISets.begin()) if (it != deviceSets.begin())
{ {
if (m_settings.m_deviceIndex < 0) { if (m_settings.m_deviceIndex < 0) {
ui->device->setCurrentIndex(0); ui->device->setCurrentIndex(0);
@ -226,10 +226,10 @@ bool RigCtlServerGUI::updateChannelList()
} }
else else
{ {
MainWindow *mainWindow = MainWindow::getInstance(); MainCore *mainCore = MainCore::instance();
std::vector<DeviceUISet*>& deviceUISets = mainWindow->getDeviceUISets(); std::vector<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
DeviceUISet *deviceUISet = deviceUISets[m_settings.m_deviceIndex]; DeviceSet *deviceSet = deviceSets[m_settings.m_deviceIndex];
int nbChannels = deviceUISet->getNumberOfChannels(); int nbChannels = deviceSet->getNumberOfChannels();
for (int ch = 0; ch < nbChannels; ch++) { for (int ch = 0; ch < nbChannels; ch++) {
ui->channel->addItem(QString("%1").arg(ch), ch); ui->channel->addItem(QString("%1").arg(ch), ch);

12
plugins/feature/simpleptt/simplepttgui.cpp
View File

@ -19,8 +19,8 @@
#include "feature/featureuiset.h" #include "feature/featureuiset.h"
#include "gui/basicfeaturesettingsdialog.h" #include "gui/basicfeaturesettingsdialog.h"
#include "mainwindow.h" #include "device/deviceset.h"
#include "device/deviceuiset.h" #include "maincore.h"
#include "ui_simplepttgui.h" #include "ui_simplepttgui.h"
#include "simplepttreport.h" #include "simplepttreport.h"
@ -180,9 +180,9 @@ void SimplePTTGUI::displaySettings()
void SimplePTTGUI::updateDeviceSetLists() void SimplePTTGUI::updateDeviceSetLists()
{ {
MainWindow *mainWindow = MainWindow::getInstance(); MainCore *mainCore = MainCore::instance();
std::vector<DeviceUISet*>& deviceUISets = mainWindow->getDeviceUISets(); std::vector<DeviceSet*>& deviceSets = mainCore->getDeviceSets();
std::vector<DeviceUISet*>::const_iterator it = deviceUISets.begin(); std::vector<DeviceSet*>::const_iterator it = deviceSets.begin();
ui->rxDevice->blockSignals(true); ui->rxDevice->blockSignals(true);
ui->txDevice->blockSignals(true); ui->txDevice->blockSignals(true);
@ -193,7 +193,7 @@ void SimplePTTGUI::updateDeviceSetLists()
unsigned int rxIndex = 0; unsigned int rxIndex = 0;
unsigned int txIndex = 0; unsigned int txIndex = 0;
for (; it != deviceUISets.end(); ++it, deviceIndex++) for (; it != deviceSets.end(); ++it, deviceIndex++)
{ {
DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine; DSPDeviceSourceEngine *deviceSourceEngine = (*it)->m_deviceSourceEngine;
DSPDeviceSinkEngine *deviceSinkEngine = (*it)->m_deviceSinkEngine; DSPDeviceSinkEngine *deviceSinkEngine = (*it)->m_deviceSinkEngine;