VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Demdulators: removed obsolete on menu double clicked event handling. Modulators: removed obsolete basic settings shown indicator

This commit is contained in:
f4exb 2017-11-12 10:30:12 +01:00
parent e2252836f0
commit 9cca7100ac
26 changed files with 4 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,23 +312,12 @@ void ChannelAnalyzerGUI::onWidgetRolled(QWidget* widget __attribute__((unused)),
*/
}
void ChannelAnalyzerGUI::onMenuDoubleClicked()
{
if(!m_basicSettingsShown) {
m_basicSettingsShown = true;
BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(&m_channelMarker, this);
bcsw->show();
}
}
ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::ChannelAnalyzerGUI),
m_pluginAPI(pluginAPI),
// m_deviceAPI(deviceAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true),
m_rate(6000),
m_spanLog2(3),
@ -337,7 +326,6 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
m_scopeVis = new ScopeVis(ui->glScope);
@ -359,7 +347,6 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
ui->glScope->connectTimer(MainWindow::getInstance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
//m_channelMarker = new ChannelMarker(this);
m_channelMarker.setColor(Qt::gray);
m_channelMarker.setBandwidth(m_rate);
m_channelMarker.setSidebands(ChannelMarker::usb);
@ -388,7 +375,6 @@ ChannelAnalyzerGUI::~ChannelAnalyzerGUI()
delete m_spectrumVis;
delete m_scopeVis;
delete m_spectrumScopeComboVis;
//delete m_channelMarker;
delete ui;
}
@ -401,7 +387,6 @@ bool ChannelAnalyzerGUI::setNewRate(int spanLog2)
}
m_spanLog2 = spanLog2;
//m_rate = 48000 / (1<<spanLog2);
m_rate = m_channelAnalyzer->getSampleRate() / (1<<spanLog2);
if (ui->BW->value() < -m_rate/200) {

7
plugins/channelrx/chanalyzer/chanalyzergui.h
View File

@ -26,8 +26,6 @@
class PluginAPI;
class DeviceUISet;
class BasebandSampleSink;
class ThreadedBasebandSampleSink;
class DownChannelizer;
class ChannelAnalyzer;
class SpectrumScopeComboVis;
class SpectrumVis;
@ -64,24 +62,19 @@ private slots:
void on_spanLog2_valueChanged(int value);
void on_ssb_toggled(bool checked);
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDoubleClicked();
void handleInputMessages();
void tick();
private:
Ui::ChannelAnalyzerGUI* ui;
PluginAPI* m_pluginAPI;
// DeviceSourceAPI* m_deviceAPI;
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
int m_rate;
int m_spanLog2;
MovingAverage<Real> m_channelPowerDbAvg;
// ThreadedBasebandSampleSink* m_threadedChannelizer;
// DownChannelizer* m_channelizer;
ChannelAnalyzer* m_channelAnalyzer;
SpectrumScopeComboVis* m_spectrumScopeComboVis;
SpectrumVis* m_spectrumVis;

2
plugins/channelrx/chanalyzer/chanalyzerplugin.cpp
View File

@ -8,7 +8,7 @@
const PluginDescriptor ChannelAnalyzerPlugin::m_pluginDescriptor = {
QString("Channel Analyzer"),
QString("3.8.2"),
QString("3.8.3"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

11
plugins/channelrx/chanalyzerng/chanalyzernggui.cpp
View File

@ -373,22 +373,12 @@ void ChannelAnalyzerNGGUI::onWidgetRolled(QWidget* widget __attribute__((unused)
*/
}
void ChannelAnalyzerNGGUI::onMenuDoubleClicked()
{
if(!m_basicSettingsShown) {
m_basicSettingsShown = true;
BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(&m_channelMarker, this);
bcsw->show();
}
}
ChannelAnalyzerNGGUI::ChannelAnalyzerNGGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :
RollupWidget(parent),
ui(new Ui::ChannelAnalyzerNGGUI),
m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true),
m_rate(6000),
m_spanLog2(0),
@ -397,7 +387,6 @@ ChannelAnalyzerNGGUI::ChannelAnalyzerNGGUI(PluginAPI* pluginAPI, DeviceUISet *de
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
m_scopeVis = new ScopeVisNG(ui->glScope);

2
plugins/channelrx/chanalyzerng/chanalyzernggui.h
View File

@ -63,7 +63,6 @@ private slots:
void on_spanLog2_currentIndexChanged(int index);
void on_ssb_toggled(bool checked);
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDoubleClicked();
void handleInputMessages();
void tick();
@ -72,7 +71,6 @@ private:
PluginAPI* m_pluginAPI;
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
bool m_basicSettingsShown;
bool m_doApplySettings;
int m_rate; //!< sample rate after final in-channel decimation (spanlog2)
int m_spanLog2;

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

@ -260,24 +260,12 @@ void ATVDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool r
{
}
void ATVDemodGUI::onMenuDoubleClicked()
{
if (!m_blnBasicSettingsShown)
{
m_blnBasicSettingsShown = true;
BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(
&m_channelMarker, this);
bcsw->show();
}
}
ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* objParent) :
RollupWidget(objParent),
ui(new Ui::ATVDemodGUI),
m_pluginAPI(objPluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_blnBasicSettingsShown(false),
m_blnDoApplySettings(true),
m_objMagSqAverage(40, 0),
m_intTickCount(0),
@ -286,7 +274,6 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
m_scopeVis = new ScopeVisNG(ui->glScope);
m_atvDemod = (ATVDemod*) rxChannel; //new ATVDemod(m_deviceUISet->m_deviceSourceAPI);

2
plugins/channelrx/demodatv/atvdemodgui.h
View File

@ -58,7 +58,6 @@ private slots:
void viewChanged();
void handleSourceMessages();
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDoubleClicked();
void tick();
void on_synchLevel_valueChanged(int value);
void on_blackLevel_valueChanged(int value);
@ -89,7 +88,6 @@ private:
ChannelMarker m_channelMarker;
ATVDemod* m_atvDemod;
bool m_blnBasicSettingsShown;
bool m_blnDoApplySettings;
MovingAverage<double> m_objMagSqAverage;

2
plugins/channelrx/demodatv/atvdemodplugin.cpp
View File

@ -27,7 +27,7 @@
const PluginDescriptor ATVDemodPlugin::m_ptrPluginDescriptor =
{
QString("ATV Demodulator"),
QString("3.8.2"),
QString("3.8.3"),
QString("(c) F4HKW for F4EXB / SDRAngel"),
QString("https://github.com/f4exb/sdrangel"),
true,

20
plugins/channelrx/demodlora/lorademodgui.cpp
View File

@ -104,19 +104,6 @@ void LoRaDemodGUI::on_Spread_valueChanged(int value __attribute__((unused)))
void LoRaDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused)))
{
/*
if((widget == ui->spectrumContainer) && (m_LoRaDemod != NULL))
m_LoRaDemod->setSpectrum(m_threadedSampleSink->getMessageQueue(), rollDown);
*/
}
void LoRaDemodGUI::onMenuDoubleClicked()
{
if(!m_basicSettingsShown) {
m_basicSettingsShown = true;
BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(&m_channelMarker, this);
bcsw->show();
}
}
LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :
@ -125,13 +112,11 @@ LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true)
{
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
m_LoRaDemod = (LoRaDemod*) rxChannel; //new LoRaDemod(m_deviceUISet->m_deviceSourceAPI);
@ -142,11 +127,6 @@ LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
ui->glSpectrum->setDisplayWaterfall(true);
ui->glSpectrum->setDisplayMaxHold(true);
// setTitleColor(Qt::magenta);
//
// m_channelMarker.setColor(Qt::magenta);
// m_channelMarker.setBandwidth(LoRaDemodSettings::bandwidths[0]);
// m_channelMarker.setCenterFrequency(0);
m_channelMarker.setVisible(true);
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));

2
plugins/channelrx/demodlora/lorademodgui.h
View File

@ -41,7 +41,6 @@ private slots:
void on_BW_valueChanged(int value);
void on_Spread_valueChanged(int value);
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDoubleClicked();
private:
Ui::LoRaDemodGUI* ui;
@ -49,7 +48,6 @@ private:
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
LoRaDemodSettings m_settings;
bool m_basicSettingsShown;
bool m_doApplySettings;
LoRaDemod* m_LoRaDemod;

2
plugins/channelrx/demodlora/loraplugin.cpp
View File

@ -7,7 +7,7 @@
const PluginDescriptor LoRaPlugin::m_pluginDescriptor = {
QString("LoRa Demodulator"),
QString("3.8.2"),
QString("3.8.3"),
QString("(c) 2015 John Greb"),
QString("http://www.maintech.de"),
true,

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

@ -183,20 +183,6 @@ void SSBDemodGUI::on_spanLog2_valueChanged(int value)
void SSBDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused)))
{
/*
if((widget == ui->spectrumContainer) && (m_ssbDemod != NULL))
m_ssbDemod->setSpectrum(m_threadedSampleSink->getMessageQueue(), rollDown);
*/
}
void SSBDemodGUI::onMenuDoubleClicked()
{
if(!m_basicSettingsShown)
{
m_basicSettingsShown = true;
BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(&m_channelMarker, this);
bcsw->show();
}
}
SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampleSink *rxChannel, QWidget* parent) :
@ -205,7 +191,6 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true),
m_spectrumRate(6000),
m_audioBinaural(false),
@ -216,7 +201,6 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose, true);
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
m_ssbDemod = (SSBDemod*) rxChannel; //new SSBDemod(m_deviceUISet->m_deviceSourceAPI);

2
plugins/channelrx/demodssb/ssbdemodgui.h
View File

@ -55,7 +55,6 @@ private slots:
void on_audioMute_toggled(bool checked);
void on_spanLog2_valueChanged(int value);
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDoubleClicked();
void tick();
private:
@ -64,7 +63,6 @@ private:
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
SSBDemodSettings m_settings;
bool m_basicSettingsShown;
bool m_doApplySettings;
int m_spectrumRate;
bool m_audioBinaural;

12
plugins/channelrx/tcpsrc/tcpsrcgui.cpp
View File

@ -128,14 +128,12 @@ TCPSrcGUI::TCPSrcGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_tcpSrc(0),
m_channelMarker(this),
m_channelPowerDbAvg(40,0),
m_basicSettingsShown(false),
m_rfBandwidthChanged(false),
m_doApplySettings(true)
{
ui->setupUi(this);
ui->connectedClientsBox->hide();
connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool)));
connect(this, SIGNAL(menuDoubleClickEvent()), this, SLOT(onMenuDoubleClicked()));
setAttribute(Qt::WA_DeleteOnClose, true);
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
@ -370,16 +368,6 @@ void TCPSrcGUI::onWidgetRolled(QWidget* widget, bool rollDown)
}
}
void TCPSrcGUI::onMenuDoubleClicked()
{
if (!m_basicSettingsShown)
{
m_basicSettingsShown = true;
BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(&m_channelMarker, this);
bcsw->show();
}
}
void TCPSrcGUI::addConnection(quint32 id, const QHostAddress& peerAddress, int peerPort)
{
QStringList l;

2
plugins/channelrx/tcpsrc/tcpsrcgui.h
View File

@ -48,7 +48,6 @@ private slots:
void on_tcpPort_textEdited(const QString& arg1);
void on_applyBtn_clicked();
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDoubleClicked();
void on_volume_valueChanged(int value);
void tick();
@ -67,7 +66,6 @@ private:
Real m_rfBandwidth;
int m_boost;
int m_tcpPort;
bool m_basicSettingsShown;
bool m_rfBandwidthChanged;
bool m_doApplySettings;

2
plugins/channelrx/tcpsrc/tcpsrcplugin.cpp
View File

@ -8,7 +8,7 @@
const PluginDescriptor TCPSrcPlugin::m_pluginDescriptor = {
QString("TCP Channel Source"),
QString("3.8.2"),
QString("3.8.3"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,

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

@ -264,7 +264,6 @@ AMModGUI::AMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSampl
m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true),
m_channelPowerDbAvg(20,0),
m_recordLength(0),

1
plugins/channeltx/modam/ammodgui.h
View File

@ -84,7 +84,6 @@ private:
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
AMModSettings m_settings;
bool m_basicSettingsShown;
bool m_doApplySettings;
AMMod* m_amMod;

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

@ -583,7 +583,6 @@ ATVModGUI::ATVModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true),
m_channelPowerDbAvg(20,0),
m_videoLength(0),

1
plugins/channeltx/modatv/atvmodgui.h
View File

@ -98,7 +98,6 @@ private:
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
ATVModSettings m_settings;
bool m_basicSettingsShown;
bool m_doApplySettings;
ATVMod* m_atvMod;

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

@ -281,7 +281,6 @@ NFMModGUI::NFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true),
m_channelPowerDbAvg(20,0),
m_recordLength(0),

1
plugins/channeltx/modnfm/nfmmodgui.h
View File

@ -86,7 +86,6 @@ private:
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
NFMModSettings m_settings;
bool m_basicSettingsShown;
bool m_doApplySettings;
NFMMod* m_nfmMod;

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

@ -342,7 +342,6 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true),
m_spectrumRate(6000),
m_channelPowerDbAvg(20,0),

1
plugins/channeltx/modssb/ssbmodgui.h
View File

@ -92,7 +92,6 @@ private:
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
SSBModSettings m_settings;
bool m_basicSettingsShown;
bool m_doApplySettings;
int m_spectrumRate;

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

@ -270,7 +270,6 @@ WFMModGUI::WFMModGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
m_pluginAPI(pluginAPI),
m_deviceUISet(deviceUISet),
m_channelMarker(this),
m_basicSettingsShown(false),
m_doApplySettings(true),
m_channelPowerDbAvg(20,0),
m_recordLength(0),

1
plugins/channeltx/modwfm/wfmmodgui.h
View File

@ -85,7 +85,6 @@ private:
DeviceUISet* m_deviceUISet;
ChannelMarker m_channelMarker;
WFMModSettings m_settings;
bool m_basicSettingsShown;
bool m_doApplySettings;
// ThreadedBasebandSampleSource* m_threadedChannelizer;