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

Multi device support: cleanup after last commit

Browse Source
This commit is contained in:
f4exb 2016-05-14 21:33:12 +02:00
parent 3cba9014b6
commit 7452e2fe04
17 changed files with 5 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/channel/chanalyzer/chanalyzerplugin.cpp
View File

@ -1,5 +1,4 @@
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "chanalyzergui.h" #include "chanalyzergui.h"
#include "chanalyzerplugin.h" #include "chanalyzerplugin.h"
@ -28,8 +27,6 @@ void ChannelAnalyzerPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register demodulator // register demodulator
// QAction* action = new QAction(tr("&ChannelAnalyzer"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceChannelAnalyzer()));
m_pluginAPI->registerChannel("org.f4exb.sdrangelove.channel.chanalyzer", this); m_pluginAPI->registerChannel("org.f4exb.sdrangelove.channel.chanalyzer", this);
} }

3
plugins/channel/demodam/amplugin.cpp
View File

@ -1,7 +1,6 @@
#include "amplugin.h" #include "amplugin.h"
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "amdemodgui.h" #include "amdemodgui.h"
@ -29,8 +28,6 @@ void AMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register AM demodulator // register AM demodulator
// QAction* action = new QAction(tr("&AM Demodulator"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceAM()));
m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.am", this); m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.am", this);
} }

3
plugins/channel/demodbfm/bfmplugin.cpp
View File

@ -16,7 +16,6 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "bfmplugin.h" #include "bfmplugin.h"
@ -47,8 +46,6 @@ void BFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register BFM demodulator // register BFM demodulator
// QAction* action = new QAction(tr("&Broadcast FM Demodulator"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceBFM()));
m_pluginAPI->registerChannel("sdrangel.channel.bfm", this); m_pluginAPI->registerChannel("sdrangel.channel.bfm", this);
} }

3
plugins/channel/demoddsd/dsddemodplugin.cpp
View File

@ -16,7 +16,6 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "dsddemodplugin.h" #include "dsddemodplugin.h"
#include "dsddemodgui.h" #include "dsddemodgui.h"
@ -45,8 +44,6 @@ void DSDDemodPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register DSD demodulator // register DSD demodulator
// QAction* action = new QAction(tr("&DSD Demodulator"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceDSDDemod()));
m_pluginAPI->registerChannel("sdrangel.channel.dsddemod", this); m_pluginAPI->registerChannel("sdrangel.channel.dsddemod", this);
} }

3
plugins/channel/demodlora/loraplugin.cpp
View File

@ -1,5 +1,4 @@
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "loraplugin.h" #include "loraplugin.h"
#include "lorademodgui.h" #include "lorademodgui.h"
@ -28,8 +27,6 @@ void LoRaPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register demodulator // register demodulator
// QAction* action = new QAction(tr("&LoRa Demodulator"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceLoRa()));
m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.lora", this); m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.lora", this);
} }

3
plugins/channel/demodnfm/nfmplugin.cpp
View File

@ -1,5 +1,4 @@
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "nfmplugin.h" #include "nfmplugin.h"
#include "nfmdemodgui.h" #include "nfmdemodgui.h"
@ -28,8 +27,6 @@ void NFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register NFM demodulator // register NFM demodulator
// QAction* action = new QAction(tr("&NFM Demodulator"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceNFM()));
m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.nfm", this); m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.nfm", this);
} }

3
plugins/channel/demodssb/ssbplugin.cpp
View File

@ -1,5 +1,4 @@
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "ssbplugin.h" #include "ssbplugin.h"
#include "ssbdemodgui.h" #include "ssbdemodgui.h"
@ -28,8 +27,6 @@ void SSBPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register demodulator // register demodulator
// QAction* action = new QAction(tr("&SSB Demodulator"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceSSB()));
m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.ssb", this); m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.ssb", this);
} }

3
plugins/channel/demodwfm/wfmplugin.cpp
View File

@ -1,5 +1,4 @@
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "wfmdemodgui.h" #include "wfmdemodgui.h"
@ -29,8 +28,6 @@ void WFMPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register WFM demodulator // register WFM demodulator
// QAction* action = new QAction(tr("&WFM Demodulator"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceWFM()));
m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.wfm", this); m_pluginAPI->registerChannel("de.maintech.sdrangelove.channel.wfm", this);
} }

3
plugins/channel/tcpsrc/tcpsrcplugin.cpp
View File

@ -1,5 +1,4 @@
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "tcpsrcplugin.h" #include "tcpsrcplugin.h"
#include "tcpsrcgui.h" #include "tcpsrcgui.h"
@ -28,8 +27,6 @@ void TCPSrcPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register TCP Channel Source // register TCP Channel Source
// QAction* action = new QAction(tr("&TCP Source"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceTCPSrc()));
m_pluginAPI->registerChannel("sdrangel.channel.tcpsrc", this); m_pluginAPI->registerChannel("sdrangel.channel.tcpsrc", this);
} }

3
plugins/channel/udpsrc/udpsrcplugin.cpp
View File

@ -18,7 +18,6 @@
#include "udpsrcplugin.h" #include "udpsrcplugin.h"
#include <QtPlugin> #include <QtPlugin>
#include <QAction>
#include "plugin/pluginapi.h" #include "plugin/pluginapi.h"
#include "udpsrcgui.h" #include "udpsrcgui.h"
@ -47,8 +46,6 @@ void UDPSrcPlugin::initPlugin(PluginAPI* pluginAPI)
m_pluginAPI = pluginAPI; m_pluginAPI = pluginAPI;
// register TCP Channel Source // register TCP Channel Source
// QAction* action = new QAction(tr("&UDP Source"), this);
// connect(action, SIGNAL(triggered()), this, SLOT(createInstanceUDPSrc()));
m_pluginAPI->registerChannel("sdrangel.channel.udpsrc", this); m_pluginAPI->registerChannel("sdrangel.channel.udpsrc", this);
} }

5
sdrbase/mainwindow.cpp
View File

@ -238,11 +238,6 @@ void MainWindow::removeLastDevice()
m_deviceUIs.pop_back(); m_deviceUIs.pop_back();
} }
//void MainWindow::addChannelCreateAction(QAction* action) // TODO: move to some tabbed UI
//{
// ui->menu_Channels->addAction(action);
//}
void MainWindow::addChannelRollup(QWidget* widget) void MainWindow::addChannelRollup(QWidget* widget)
{ {
m_deviceUIs.back()->m_channelWindow->addRollupWidget(widget); m_deviceUIs.back()->m_channelWindow->addRollupWidget(widget);

1
sdrbase/mainwindow.h
View File

@ -71,7 +71,6 @@ public:
MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; } MessageQueue* getInputMessageQueue() { return &m_inputMessageQueue; }
// void addChannelCreateAction(QAction* action);
void addChannelRollup(QWidget* widget); void addChannelRollup(QWidget* widget);
void addViewAction(QAction* action); void addViewAction(QAction* action);

12
sdrbase/mainwindow.ui
View File

@ -118,17 +118,6 @@
</property> </property>
<addaction name="action_About"/> <addaction name="action_About"/>
</widget> </widget>
<widget class="QMenu" name="menu_Channels">
<property name="font">
<font>
<family>Sans Serif</family>
<pointsize>9</pointsize>
</font>
</property>
<property name="title">
<string>&amp;Channels</string>
</property>
</widget>
<widget class="QMenu" name="menu_Window"> <widget class="QMenu" name="menu_Window">
<property name="font"> <property name="font">
<font> <font>
@ -150,7 +139,6 @@
<addaction name="menu_File"/> <addaction name="menu_File"/>
<addaction name="menu_View"/> <addaction name="menu_View"/>
<addaction name="menu_Acquisition"/> <addaction name="menu_Acquisition"/>
<addaction name="menu_Channels"/>
<addaction name="menu_Window"/> <addaction name="menu_Window"/>
<addaction name="menuPreferences"/> <addaction name="menuPreferences"/>
<addaction name="menu_Help"/> <addaction name="menu_Help"/>

4
sdrbase/plugin/pluginapi.cpp
View File

@ -24,9 +24,9 @@ void PluginAPI::setInputGUI(QWidget* inputGUI)
m_pluginManager->setInputGUI(inputGUI); m_pluginManager->setInputGUI(inputGUI);
} }
void PluginAPI::registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action) void PluginAPI::registerChannel(const QString& channelName, PluginInterface* plugin)
{ {
m_pluginManager->registerChannel(channelName, plugin, action); m_pluginManager->registerChannel(channelName, plugin);
} }
void PluginAPI::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI) void PluginAPI::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)

2
sdrbase/plugin/pluginapi.h
View File

@ -31,7 +31,7 @@ public:
void setInputGUI(QWidget* inputGUI); void setInputGUI(QWidget* inputGUI);
// Channel stuff // Channel stuff
void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action = 0); void registerChannel(const QString& channelName, PluginInterface* plugin);
void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI); void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI);
void addChannelRollup(QWidget* pluginGUI); void addChannelRollup(QWidget* pluginGUI);
void removeChannelInstance(PluginGUI* pluginGUI); void removeChannelInstance(PluginGUI* pluginGUI);

3
sdrbase/plugin/pluginmanager.cpp
View File

@ -51,10 +51,9 @@ void PluginManager::loadPlugins()
updateSampleSourceDevices(); updateSampleSourceDevices();
} }
void PluginManager::registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action) void PluginManager::registerChannel(const QString& channelName, PluginInterface* plugin)
{ {
m_channelRegistrations.append(ChannelRegistration(channelName, plugin)); m_channelRegistrations.append(ChannelRegistration(channelName, plugin));
// m_mainWindow->addChannelCreateAction(action);
} }
void PluginManager::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI) void PluginManager::registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI)

2
sdrbase/plugin/pluginmanager.h
View File

@ -46,7 +46,7 @@ public:
const Plugins& getPlugins() const { return m_plugins; } const Plugins& getPlugins() const { return m_plugins; }
// Callbacks from the plugins // Callbacks from the plugins
void registerChannel(const QString& channelName, PluginInterface* plugin, QAction* action = 0); void registerChannel(const QString& channelName, PluginInterface* plugin);
void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI); void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI);
void addChannelRollup(QWidget* pluginGUI); void addChannelRollup(QWidget* pluginGUI);
void removeChannelInstance(PluginGUI* pluginGUI); void removeChannelInstance(PluginGUI* pluginGUI);