mirror of
https://github.com/f4exb/sdrangel.git
synced 2025-09-08 16:17:48 -04:00
Deep redesign: Init sequence review phase #2: Fixing channel GUI init
This commit is contained in:
parent
30957e3002
commit
9be9f2d807
@ -44,11 +44,15 @@ qint64 AMDemodGUI::getCenterFrequency() const {
|
|||||||
|
|
||||||
void AMDemodGUI::resetToDefaults()
|
void AMDemodGUI::resetToDefaults()
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
ui->rfBW->setValue(4);
|
ui->rfBW->setValue(4);
|
||||||
ui->afBW->setValue(3);
|
ui->afBW->setValue(3);
|
||||||
ui->volume->setValue(20);
|
ui->volume->setValue(20);
|
||||||
ui->squelch->setValue(-40);
|
ui->squelch->setValue(-40);
|
||||||
ui->deltaFrequency->setValue(0);
|
ui->deltaFrequency->setValue(0);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,7 +64,6 @@ QByteArray AMDemodGUI::serialize() const
|
|||||||
s.writeS32(3, ui->afBW->value());
|
s.writeS32(3, ui->afBW->value());
|
||||||
s.writeS32(4, ui->volume->value());
|
s.writeS32(4, ui->volume->value());
|
||||||
s.writeS32(5, ui->squelch->value());
|
s.writeS32(5, ui->squelch->value());
|
||||||
//s.writeBlob(6, ui->spectrumGUI->serialize());
|
|
||||||
s.writeU32(7, m_channelMarker->getColor().rgb());
|
s.writeU32(7, m_channelMarker->getColor().rgb());
|
||||||
return s.final();
|
return s.final();
|
||||||
}
|
}
|
||||||
@ -69,15 +72,20 @@ bool AMDemodGUI::deserialize(const QByteArray& data)
|
|||||||
{
|
{
|
||||||
SimpleDeserializer d(data);
|
SimpleDeserializer d(data);
|
||||||
|
|
||||||
if(!d.isValid()) {
|
if(!d.isValid())
|
||||||
|
{
|
||||||
resetToDefaults();
|
resetToDefaults();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(d.getVersion() == 1) {
|
if(d.getVersion() == 1)
|
||||||
|
{
|
||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
quint32 u32tmp;
|
quint32 u32tmp;
|
||||||
qint32 tmp;
|
qint32 tmp;
|
||||||
|
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
d.readS32(1, &tmp, 0);
|
d.readS32(1, &tmp, 0);
|
||||||
m_channelMarker->setCenterFrequency(tmp);
|
m_channelMarker->setCenterFrequency(tmp);
|
||||||
d.readS32(2, &tmp, 4);
|
d.readS32(2, &tmp, 4);
|
||||||
@ -88,13 +96,19 @@ bool AMDemodGUI::deserialize(const QByteArray& data)
|
|||||||
ui->volume->setValue(tmp);
|
ui->volume->setValue(tmp);
|
||||||
d.readS32(5, &tmp, -40);
|
d.readS32(5, &tmp, -40);
|
||||||
ui->squelch->setValue(tmp);
|
ui->squelch->setValue(tmp);
|
||||||
//d.readBlob(6, &bytetmp);
|
|
||||||
//ui->spectrumGUI->deserialize(bytetmp);
|
|
||||||
if(d.readU32(7, &u32tmp))
|
if(d.readU32(7, &u32tmp))
|
||||||
|
{
|
||||||
m_channelMarker->setColor(u32tmp);
|
m_channelMarker->setColor(u32tmp);
|
||||||
|
}
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
return true;
|
return true;
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
resetToDefaults();
|
resetToDefaults();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -177,7 +191,8 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, QWidget* parent) :
|
|||||||
RollupWidget(parent),
|
RollupWidget(parent),
|
||||||
ui(new Ui::AMDemodGUI),
|
ui(new Ui::AMDemodGUI),
|
||||||
m_pluginAPI(pluginAPI),
|
m_pluginAPI(pluginAPI),
|
||||||
m_basicSettingsShown(false)
|
m_basicSettingsShown(false),
|
||||||
|
m_doApplySettings(true)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
setAttribute(Qt::WA_DeleteOnClose, true);
|
setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
@ -213,8 +228,16 @@ AMDemodGUI::~AMDemodGUI()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void AMDemodGUI::blockApplySettings(bool block)
|
||||||
|
{
|
||||||
|
m_channelMarker->blockSignals(block);
|
||||||
|
m_doApplySettings = !block;
|
||||||
|
}
|
||||||
|
|
||||||
void AMDemodGUI::applySettings()
|
void AMDemodGUI::applySettings()
|
||||||
{
|
{
|
||||||
|
if (m_doApplySettings)
|
||||||
|
{
|
||||||
setTitleColor(m_channelMarker->getColor());
|
setTitleColor(m_channelMarker->getColor());
|
||||||
|
|
||||||
m_channelizer->configure(m_channelizer->getInputMessageQueue(),
|
m_channelizer->configure(m_channelizer->getInputMessageQueue(),
|
||||||
@ -229,15 +252,20 @@ void AMDemodGUI::applySettings()
|
|||||||
ui->afBW->value() * 1000.0,
|
ui->afBW->value() * 1000.0,
|
||||||
ui->volume->value() / 10.0,
|
ui->volume->value() / 10.0,
|
||||||
ui->squelch->value());
|
ui->squelch->value());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMDemodGUI::leaveEvent(QEvent*)
|
void AMDemodGUI::leaveEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(false);
|
m_channelMarker->setHighlighted(false);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMDemodGUI::enterEvent(QEvent*)
|
void AMDemodGUI::enterEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(true);
|
m_channelMarker->setHighlighted(true);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,6 +48,7 @@ private:
|
|||||||
PluginAPI* m_pluginAPI;
|
PluginAPI* m_pluginAPI;
|
||||||
ChannelMarker* m_channelMarker;
|
ChannelMarker* m_channelMarker;
|
||||||
bool m_basicSettingsShown;
|
bool m_basicSettingsShown;
|
||||||
|
bool m_doApplySettings;
|
||||||
|
|
||||||
AudioFifo* m_audioFifo;
|
AudioFifo* m_audioFifo;
|
||||||
Channelizer* m_channelizer;
|
Channelizer* m_channelizer;
|
||||||
@ -56,8 +57,9 @@ private:
|
|||||||
static const int m_rfBW[];
|
static const int m_rfBW[];
|
||||||
|
|
||||||
explicit AMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
explicit AMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
||||||
~AMDemodGUI();
|
virtual ~AMDemodGUI();
|
||||||
|
|
||||||
|
void blockApplySettings(bool block);
|
||||||
void applySettings();
|
void applySettings();
|
||||||
|
|
||||||
void leaveEvent(QEvent*);
|
void leaveEvent(QEvent*);
|
||||||
|
@ -44,9 +44,13 @@ qint64 ChannelAnalyzerGUI::getCenterFrequency() const
|
|||||||
|
|
||||||
void ChannelAnalyzerGUI::resetToDefaults()
|
void ChannelAnalyzerGUI::resetToDefaults()
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
ui->BW->setValue(30);
|
ui->BW->setValue(30);
|
||||||
ui->deltaFrequency->setValue(0);
|
ui->deltaFrequency->setValue(0);
|
||||||
ui->spanLog2->setValue(3);
|
ui->spanLog2->setValue(3);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,16 +72,21 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data)
|
|||||||
{
|
{
|
||||||
SimpleDeserializer d(data);
|
SimpleDeserializer d(data);
|
||||||
|
|
||||||
if(!d.isValid()) {
|
if(!d.isValid())
|
||||||
|
{
|
||||||
resetToDefaults();
|
resetToDefaults();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(d.getVersion() == 1) {
|
if(d.getVersion() == 1)
|
||||||
|
{
|
||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
quint32 u32tmp;
|
quint32 u32tmp;
|
||||||
qint32 tmp;
|
qint32 tmp;
|
||||||
bool tmpBool;
|
bool tmpBool;
|
||||||
|
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
d.readS32(1, &tmp, 0);
|
d.readS32(1, &tmp, 0);
|
||||||
m_channelMarker->setCenterFrequency(tmp);
|
m_channelMarker->setCenterFrequency(tmp);
|
||||||
d.readS32(2, &tmp, 30);
|
d.readS32(2, &tmp, 30);
|
||||||
@ -95,9 +104,14 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data)
|
|||||||
ui->ssb->setChecked(tmpBool);
|
ui->ssb->setChecked(tmpBool);
|
||||||
d.readBlob(8, &bytetmp);
|
d.readBlob(8, &bytetmp);
|
||||||
ui->scopeGUI->deserialize(bytetmp);
|
ui->scopeGUI->deserialize(bytetmp);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
return true;
|
return true;
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
resetToDefaults();
|
resetToDefaults();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -253,6 +267,7 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, QWidget* parent) :
|
|||||||
ui(new Ui::ChannelAnalyzerGUI),
|
ui(new Ui::ChannelAnalyzerGUI),
|
||||||
m_pluginAPI(pluginAPI),
|
m_pluginAPI(pluginAPI),
|
||||||
m_basicSettingsShown(false),
|
m_basicSettingsShown(false),
|
||||||
|
m_doApplySettings(true),
|
||||||
m_rate(6000),
|
m_rate(6000),
|
||||||
m_spanLog2(3)
|
m_spanLog2(3)
|
||||||
{
|
{
|
||||||
@ -369,6 +384,14 @@ bool ChannelAnalyzerGUI::setNewRate(int spanLog2)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ChannelAnalyzerGUI::blockApplySettings(bool block)
|
||||||
|
{
|
||||||
|
ui->glScope->blockSignals(block);
|
||||||
|
ui->glSpectrum->blockSignals(block);
|
||||||
|
m_channelMarker->blockSignals(block);
|
||||||
|
m_doApplySettings = !block;
|
||||||
|
}
|
||||||
|
|
||||||
void ChannelAnalyzerGUI::applySettings()
|
void ChannelAnalyzerGUI::applySettings()
|
||||||
{
|
{
|
||||||
setTitleColor(m_channelMarker->getColor());
|
setTitleColor(m_channelMarker->getColor());
|
||||||
@ -388,11 +411,15 @@ void ChannelAnalyzerGUI::applySettings()
|
|||||||
|
|
||||||
void ChannelAnalyzerGUI::leaveEvent(QEvent*)
|
void ChannelAnalyzerGUI::leaveEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(false);
|
m_channelMarker->setHighlighted(false);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ChannelAnalyzerGUI::enterEvent(QEvent*)
|
void ChannelAnalyzerGUI::enterEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(true);
|
m_channelMarker->setHighlighted(true);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -52,6 +52,7 @@ private:
|
|||||||
PluginAPI* m_pluginAPI;
|
PluginAPI* m_pluginAPI;
|
||||||
ChannelMarker* m_channelMarker;
|
ChannelMarker* m_channelMarker;
|
||||||
bool m_basicSettingsShown;
|
bool m_basicSettingsShown;
|
||||||
|
bool m_doApplySettings;
|
||||||
int m_rate;
|
int m_rate;
|
||||||
int m_spanLog2;
|
int m_spanLog2;
|
||||||
|
|
||||||
@ -62,10 +63,12 @@ private:
|
|||||||
ScopeVis* m_scopeVis;
|
ScopeVis* m_scopeVis;
|
||||||
|
|
||||||
explicit ChannelAnalyzerGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
explicit ChannelAnalyzerGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
||||||
~ChannelAnalyzerGUI();
|
virtual ~ChannelAnalyzerGUI();
|
||||||
|
|
||||||
int getEffectiveLowCutoff(int lowCutoff);
|
int getEffectiveLowCutoff(int lowCutoff);
|
||||||
bool setNewRate(int spanLog2);
|
bool setNewRate(int spanLog2);
|
||||||
|
|
||||||
|
void blockApplySettings(bool block);
|
||||||
void applySettings();
|
void applySettings();
|
||||||
|
|
||||||
void leaveEvent(QEvent*);
|
void leaveEvent(QEvent*);
|
||||||
|
@ -41,8 +41,12 @@ qint64 LoRaDemodGUI::getCenterFrequency() const {
|
|||||||
|
|
||||||
void LoRaDemodGUI::resetToDefaults()
|
void LoRaDemodGUI::resetToDefaults()
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
ui->BW->setValue(0);
|
ui->BW->setValue(0);
|
||||||
ui->Spread->setValue(0);
|
ui->Spread->setValue(0);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,14 +64,19 @@ bool LoRaDemodGUI::deserialize(const QByteArray& data)
|
|||||||
{
|
{
|
||||||
SimpleDeserializer d(data);
|
SimpleDeserializer d(data);
|
||||||
|
|
||||||
if(!d.isValid()) {
|
if(!d.isValid())
|
||||||
|
{
|
||||||
resetToDefaults();
|
resetToDefaults();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(d.getVersion() == 1) {
|
if(d.getVersion() == 1)
|
||||||
|
{
|
||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
qint32 tmp;
|
qint32 tmp;
|
||||||
|
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
d.readS32(1, &tmp, 0);
|
d.readS32(1, &tmp, 0);
|
||||||
m_channelMarker->setCenterFrequency(tmp);
|
m_channelMarker->setCenterFrequency(tmp);
|
||||||
d.readS32(2, &tmp, 0);
|
d.readS32(2, &tmp, 0);
|
||||||
@ -76,9 +85,14 @@ bool LoRaDemodGUI::deserialize(const QByteArray& data)
|
|||||||
ui->Spread->setValue(tmp);
|
ui->Spread->setValue(tmp);
|
||||||
d.readBlob(4, &bytetmp);
|
d.readBlob(4, &bytetmp);
|
||||||
ui->spectrumGUI->deserialize(bytetmp);
|
ui->spectrumGUI->deserialize(bytetmp);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
return true;
|
return true;
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
resetToDefaults();
|
resetToDefaults();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -128,7 +142,8 @@ LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, QWidget* parent) :
|
|||||||
RollupWidget(parent),
|
RollupWidget(parent),
|
||||||
ui(new Ui::LoRaDemodGUI),
|
ui(new Ui::LoRaDemodGUI),
|
||||||
m_pluginAPI(pluginAPI),
|
m_pluginAPI(pluginAPI),
|
||||||
m_basicSettingsShown(false)
|
m_basicSettingsShown(false),
|
||||||
|
m_doApplySettings(true)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
setAttribute(Qt::WA_DeleteOnClose, true);
|
setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
@ -171,6 +186,12 @@ LoRaDemodGUI::~LoRaDemodGUI()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void LoRaDemodGUI::blockApplySettings(bool block)
|
||||||
|
{
|
||||||
|
m_channelMarker->blockSignals(block);
|
||||||
|
m_doApplySettings = !block;
|
||||||
|
}
|
||||||
|
|
||||||
void LoRaDemodGUI::applySettings()
|
void LoRaDemodGUI::applySettings()
|
||||||
{
|
{
|
||||||
const int loraBW[] = BANDWIDTHSTRING;
|
const int loraBW[] = BANDWIDTHSTRING;
|
||||||
|
@ -45,14 +45,16 @@ private:
|
|||||||
PluginAPI* m_pluginAPI;
|
PluginAPI* m_pluginAPI;
|
||||||
ChannelMarker* m_channelMarker;
|
ChannelMarker* m_channelMarker;
|
||||||
bool m_basicSettingsShown;
|
bool m_basicSettingsShown;
|
||||||
|
bool m_doApplySettings;
|
||||||
|
|
||||||
Channelizer* m_channelizer;
|
Channelizer* m_channelizer;
|
||||||
LoRaDemod* m_LoRaDemod;
|
LoRaDemod* m_LoRaDemod;
|
||||||
SpectrumVis* m_spectrumVis;
|
SpectrumVis* m_spectrumVis;
|
||||||
|
|
||||||
explicit LoRaDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
explicit LoRaDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
||||||
~LoRaDemodGUI();
|
virtual ~LoRaDemodGUI();
|
||||||
|
|
||||||
|
void blockApplySettings(bool block);
|
||||||
void applySettings();
|
void applySettings();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
#include <QDockWidget>
|
#include <QDockWidget>
|
||||||
#include <QMainWindow>
|
#include <QMainWindow>
|
||||||
|
#include <QDebug>
|
||||||
#include "nfmdemodgui.h"
|
#include "nfmdemodgui.h"
|
||||||
#include "ui_nfmdemodgui.h"
|
#include "ui_nfmdemodgui.h"
|
||||||
#include "dsp/threadedsamplesink.h"
|
#include "dsp/threadedsamplesink.h"
|
||||||
@ -44,7 +45,7 @@ qint64 NFMDemodGUI::getCenterFrequency() const
|
|||||||
|
|
||||||
void NFMDemodGUI::resetToDefaults()
|
void NFMDemodGUI::resetToDefaults()
|
||||||
{
|
{
|
||||||
blockGUISignals(true);
|
blockApplySettings(true);
|
||||||
|
|
||||||
ui->rfBW->setValue(4);
|
ui->rfBW->setValue(4);
|
||||||
ui->afBW->setValue(3);
|
ui->afBW->setValue(3);
|
||||||
@ -52,7 +53,7 @@ void NFMDemodGUI::resetToDefaults()
|
|||||||
ui->squelch->setValue(-40);
|
ui->squelch->setValue(-40);
|
||||||
ui->deltaFrequency->setValue(0);
|
ui->deltaFrequency->setValue(0);
|
||||||
|
|
||||||
blockGUISignals(false);
|
blockApplySettings(false);
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -64,7 +65,6 @@ QByteArray NFMDemodGUI::serialize() const
|
|||||||
s.writeS32(3, ui->afBW->value());
|
s.writeS32(3, ui->afBW->value());
|
||||||
s.writeS32(4, ui->volume->value());
|
s.writeS32(4, ui->volume->value());
|
||||||
s.writeS32(5, ui->squelch->value());
|
s.writeS32(5, ui->squelch->value());
|
||||||
//s.writeBlob(6, ui->spectrumGUI->serialize());
|
|
||||||
s.writeU32(7, m_channelMarker->getColor().rgb());
|
s.writeU32(7, m_channelMarker->getColor().rgb());
|
||||||
s.writeS32(8, ui->ctcss->currentIndex());
|
s.writeS32(8, ui->ctcss->currentIndex());
|
||||||
return s.final();
|
return s.final();
|
||||||
@ -86,7 +86,7 @@ bool NFMDemodGUI::deserialize(const QByteArray& data)
|
|||||||
quint32 u32tmp;
|
quint32 u32tmp;
|
||||||
qint32 tmp;
|
qint32 tmp;
|
||||||
|
|
||||||
blockGUISignals(true);
|
blockApplySettings(true);
|
||||||
|
|
||||||
d.readS32(1, &tmp, 0);
|
d.readS32(1, &tmp, 0);
|
||||||
m_channelMarker->setCenterFrequency(tmp);
|
m_channelMarker->setCenterFrequency(tmp);
|
||||||
@ -98,14 +98,16 @@ bool NFMDemodGUI::deserialize(const QByteArray& data)
|
|||||||
ui->volume->setValue(tmp);
|
ui->volume->setValue(tmp);
|
||||||
d.readS32(5, &tmp, -40);
|
d.readS32(5, &tmp, -40);
|
||||||
ui->squelch->setValue(tmp);
|
ui->squelch->setValue(tmp);
|
||||||
//d.readBlob(6, &bytetmp);
|
|
||||||
//ui->spectrumGUI->deserialize(bytetmp);
|
|
||||||
if(d.readU32(7, &u32tmp))
|
if(d.readU32(7, &u32tmp))
|
||||||
|
{
|
||||||
m_channelMarker->setColor(u32tmp);
|
m_channelMarker->setColor(u32tmp);
|
||||||
|
}
|
||||||
|
|
||||||
d.readS32(8, &tmp, 0);
|
d.readS32(8, &tmp, 0);
|
||||||
ui->ctcss->setCurrentIndex(tmp);
|
ui->ctcss->setCurrentIndex(tmp);
|
||||||
|
|
||||||
blockGUISignals(false);
|
blockApplySettings(false);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
return true;
|
return true;
|
||||||
@ -205,7 +207,8 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent) :
|
|||||||
RollupWidget(parent),
|
RollupWidget(parent),
|
||||||
ui(new Ui::NFMDemodGUI),
|
ui(new Ui::NFMDemodGUI),
|
||||||
m_pluginAPI(pluginAPI),
|
m_pluginAPI(pluginAPI),
|
||||||
m_basicSettingsShown(false)
|
m_basicSettingsShown(false),
|
||||||
|
m_doApplySettings(true)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
setAttribute(Qt::WA_DeleteOnClose, true);
|
setAttribute(Qt::WA_DeleteOnClose, true);
|
||||||
@ -259,6 +262,10 @@ NFMDemodGUI::~NFMDemodGUI()
|
|||||||
|
|
||||||
void NFMDemodGUI::applySettings()
|
void NFMDemodGUI::applySettings()
|
||||||
{
|
{
|
||||||
|
if (m_doApplySettings)
|
||||||
|
{
|
||||||
|
qDebug() << "NFMDemodGUI::applySettings";
|
||||||
|
|
||||||
setTitleColor(m_channelMarker->getColor());
|
setTitleColor(m_channelMarker->getColor());
|
||||||
|
|
||||||
m_channelizer->configure(m_channelizer->getInputMessageQueue(),
|
m_channelizer->configure(m_channelizer->getInputMessageQueue(),
|
||||||
@ -273,16 +280,21 @@ void NFMDemodGUI::applySettings()
|
|||||||
ui->afBW->value() * 1000.0,
|
ui->afBW->value() * 1000.0,
|
||||||
ui->volume->value() / 10.0,
|
ui->volume->value() / 10.0,
|
||||||
ui->squelch->value());
|
ui->squelch->value());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void NFMDemodGUI::leaveEvent(QEvent*)
|
void NFMDemodGUI::leaveEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(false);
|
m_channelMarker->setHighlighted(false);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void NFMDemodGUI::enterEvent(QEvent*)
|
void NFMDemodGUI::enterEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(true);
|
m_channelMarker->setHighlighted(true);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void NFMDemodGUI::setCtcssFreq(Real ctcssFreq)
|
void NFMDemodGUI::setCtcssFreq(Real ctcssFreq)
|
||||||
@ -297,14 +309,9 @@ void NFMDemodGUI::setCtcssFreq(Real ctcssFreq)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void NFMDemodGUI::blockGUISignals(bool block)
|
void NFMDemodGUI::blockApplySettings(bool block)
|
||||||
{
|
{
|
||||||
m_channelMarker->blockSignals(block);
|
m_channelMarker->blockSignals(block);
|
||||||
ui->deltaFrequency->blockSignals(block);
|
m_doApplySettings = !block;
|
||||||
ui->deltaMinus->blockSignals(block);
|
|
||||||
ui->rfBW->blockSignals(block);
|
|
||||||
ui->afBW->blockSignals(block);
|
|
||||||
ui->volume->blockSignals(block);
|
|
||||||
ui->squelch->blockSignals(block);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,6 +51,7 @@ private:
|
|||||||
PluginAPI* m_pluginAPI;
|
PluginAPI* m_pluginAPI;
|
||||||
ChannelMarker* m_channelMarker;
|
ChannelMarker* m_channelMarker;
|
||||||
bool m_basicSettingsShown;
|
bool m_basicSettingsShown;
|
||||||
|
bool m_doApplySettings;
|
||||||
|
|
||||||
AudioFifo* m_audioFifo;
|
AudioFifo* m_audioFifo;
|
||||||
Channelizer* m_channelizer;
|
Channelizer* m_channelizer;
|
||||||
@ -61,7 +62,7 @@ private:
|
|||||||
explicit NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
explicit NFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
||||||
virtual ~NFMDemodGUI();
|
virtual ~NFMDemodGUI();
|
||||||
|
|
||||||
void blockGUISignals(bool block);
|
void blockApplySettings(bool block);
|
||||||
void applySettings();
|
void applySettings();
|
||||||
|
|
||||||
void leaveEvent(QEvent*);
|
void leaveEvent(QEvent*);
|
||||||
|
@ -43,10 +43,14 @@ qint64 SSBDemodGUI::getCenterFrequency() const
|
|||||||
|
|
||||||
void SSBDemodGUI::resetToDefaults()
|
void SSBDemodGUI::resetToDefaults()
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
ui->BW->setValue(30);
|
ui->BW->setValue(30);
|
||||||
ui->volume->setValue(40);
|
ui->volume->setValue(40);
|
||||||
ui->deltaFrequency->setValue(0);
|
ui->deltaFrequency->setValue(0);
|
||||||
ui->spanLog2->setValue(3);
|
ui->spanLog2->setValue(3);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -78,6 +82,9 @@ bool SSBDemodGUI::deserialize(const QByteArray& data)
|
|||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
quint32 u32tmp;
|
quint32 u32tmp;
|
||||||
qint32 tmp;
|
qint32 tmp;
|
||||||
|
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
d.readS32(1, &tmp, 0);
|
d.readS32(1, &tmp, 0);
|
||||||
m_channelMarker->setCenterFrequency(tmp);
|
m_channelMarker->setCenterFrequency(tmp);
|
||||||
d.readS32(2, &tmp, 30);
|
d.readS32(2, &tmp, 30);
|
||||||
@ -93,6 +100,9 @@ bool SSBDemodGUI::deserialize(const QByteArray& data)
|
|||||||
d.readS32(7, &tmp, 20);
|
d.readS32(7, &tmp, 20);
|
||||||
ui->spanLog2->setValue(tmp);
|
ui->spanLog2->setValue(tmp);
|
||||||
setNewRate(tmp);
|
setNewRate(tmp);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -234,6 +244,7 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, QWidget* parent) :
|
|||||||
ui(new Ui::SSBDemodGUI),
|
ui(new Ui::SSBDemodGUI),
|
||||||
m_pluginAPI(pluginAPI),
|
m_pluginAPI(pluginAPI),
|
||||||
m_basicSettingsShown(false),
|
m_basicSettingsShown(false),
|
||||||
|
m_doApplySettings(true),
|
||||||
m_rate(6000),
|
m_rate(6000),
|
||||||
m_spanLog2(3)
|
m_spanLog2(3)
|
||||||
{
|
{
|
||||||
@ -331,6 +342,12 @@ bool SSBDemodGUI::setNewRate(int spanLog2)
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SSBDemodGUI::blockApplySettings(bool block)
|
||||||
|
{
|
||||||
|
m_channelMarker->blockSignals(block);
|
||||||
|
m_doApplySettings = !block;
|
||||||
|
}
|
||||||
|
|
||||||
void SSBDemodGUI::applySettings()
|
void SSBDemodGUI::applySettings()
|
||||||
{
|
{
|
||||||
setTitleColor(m_channelMarker->getColor());
|
setTitleColor(m_channelMarker->getColor());
|
||||||
@ -350,11 +367,15 @@ void SSBDemodGUI::applySettings()
|
|||||||
|
|
||||||
void SSBDemodGUI::leaveEvent(QEvent*)
|
void SSBDemodGUI::leaveEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(false);
|
m_channelMarker->setHighlighted(false);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SSBDemodGUI::enterEvent(QEvent*)
|
void SSBDemodGUI::enterEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(true);
|
m_channelMarker->setHighlighted(true);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -49,6 +49,7 @@ private:
|
|||||||
PluginAPI* m_pluginAPI;
|
PluginAPI* m_pluginAPI;
|
||||||
ChannelMarker* m_channelMarker;
|
ChannelMarker* m_channelMarker;
|
||||||
bool m_basicSettingsShown;
|
bool m_basicSettingsShown;
|
||||||
|
bool m_doApplySettings;
|
||||||
int m_rate;
|
int m_rate;
|
||||||
int m_spanLog2;
|
int m_spanLog2;
|
||||||
|
|
||||||
@ -58,10 +59,12 @@ private:
|
|||||||
SpectrumVis* m_spectrumVis;
|
SpectrumVis* m_spectrumVis;
|
||||||
|
|
||||||
explicit SSBDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
explicit SSBDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
||||||
~SSBDemodGUI();
|
virtual ~SSBDemodGUI();
|
||||||
|
|
||||||
int getEffectiveLowCutoff(int lowCutoff);
|
int getEffectiveLowCutoff(int lowCutoff);
|
||||||
bool setNewRate(int spanLog2);
|
bool setNewRate(int spanLog2);
|
||||||
|
|
||||||
|
void blockApplySettings(bool block);
|
||||||
void applySettings();
|
void applySettings();
|
||||||
|
|
||||||
void leaveEvent(QEvent*);
|
void leaveEvent(QEvent*);
|
||||||
|
@ -36,14 +36,17 @@ QString TCPSrcGUI::getName() const
|
|||||||
|
|
||||||
void TCPSrcGUI::resetToDefaults()
|
void TCPSrcGUI::resetToDefaults()
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
ui->sampleFormat->setCurrentIndex(0);
|
ui->sampleFormat->setCurrentIndex(0);
|
||||||
ui->sampleRate->setText("48000");
|
ui->sampleRate->setText("48000");
|
||||||
ui->rfBandwidth->setText("32000");
|
ui->rfBandwidth->setText("32000");
|
||||||
ui->tcpPort->setText("9999");
|
ui->tcpPort->setText("9999");
|
||||||
ui->spectrumGUI->resetToDefaults();
|
ui->spectrumGUI->resetToDefaults();
|
||||||
ui->boost->setValue(1);
|
ui->boost->setValue(1);
|
||||||
applySettings();
|
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
QByteArray TCPSrcGUI::serialize() const
|
QByteArray TCPSrcGUI::serialize() const
|
||||||
@ -75,6 +78,9 @@ bool TCPSrcGUI::deserialize(const QByteArray& data)
|
|||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
qint32 s32tmp;
|
qint32 s32tmp;
|
||||||
Real realtmp;
|
Real realtmp;
|
||||||
|
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
d.readBlob(1, &bytetmp);
|
d.readBlob(1, &bytetmp);
|
||||||
restoreState(bytetmp);
|
restoreState(bytetmp);
|
||||||
d.readS32(2, &s32tmp, 0);
|
d.readS32(2, &s32tmp, 0);
|
||||||
@ -104,6 +110,9 @@ bool TCPSrcGUI::deserialize(const QByteArray& data)
|
|||||||
ui->spectrumGUI->deserialize(bytetmp);
|
ui->spectrumGUI->deserialize(bytetmp);
|
||||||
d.readS32(8, &s32tmp, 1);
|
d.readS32(8, &s32tmp, 1);
|
||||||
ui->boost->setValue(s32tmp);
|
ui->boost->setValue(s32tmp);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -153,7 +162,8 @@ TCPSrcGUI::TCPSrcGUI(PluginAPI* pluginAPI, QWidget* parent) :
|
|||||||
ui(new Ui::TCPSrcGUI),
|
ui(new Ui::TCPSrcGUI),
|
||||||
m_pluginAPI(pluginAPI),
|
m_pluginAPI(pluginAPI),
|
||||||
m_tcpSrc(NULL),
|
m_tcpSrc(NULL),
|
||||||
m_basicSettingsShown(false)
|
m_basicSettingsShown(false),
|
||||||
|
m_doApplySettings(true)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
ui->connectedClientsBox->hide();
|
ui->connectedClientsBox->hide();
|
||||||
@ -196,6 +206,12 @@ TCPSrcGUI::~TCPSrcGUI()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void TCPSrcGUI::blockApplySettings(bool block)
|
||||||
|
{
|
||||||
|
m_channelizer->blockSignals(block);
|
||||||
|
m_doApplySettings = !block;
|
||||||
|
}
|
||||||
|
|
||||||
void TCPSrcGUI::applySettings()
|
void TCPSrcGUI::applySettings()
|
||||||
{
|
{
|
||||||
bool ok;
|
bool ok;
|
||||||
|
@ -56,6 +56,7 @@ private:
|
|||||||
int m_boost;
|
int m_boost;
|
||||||
int m_tcpPort;
|
int m_tcpPort;
|
||||||
bool m_basicSettingsShown;
|
bool m_basicSettingsShown;
|
||||||
|
bool m_doApplySettings;
|
||||||
|
|
||||||
// RF path
|
// RF path
|
||||||
Channelizer* m_channelizer;
|
Channelizer* m_channelizer;
|
||||||
@ -64,6 +65,7 @@ private:
|
|||||||
explicit TCPSrcGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
explicit TCPSrcGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
||||||
virtual ~TCPSrcGUI();
|
virtual ~TCPSrcGUI();
|
||||||
|
|
||||||
|
void blockApplySettings(bool block);
|
||||||
void applySettings();
|
void applySettings();
|
||||||
|
|
||||||
void addConnection(quint32 id, const QHostAddress& peerAddress, int peerPort);
|
void addConnection(quint32 id, const QHostAddress& peerAddress, int peerPort);
|
||||||
|
@ -55,11 +55,15 @@ qint64 WFMDemodGUI::getCenterFrequency() const
|
|||||||
|
|
||||||
void WFMDemodGUI::resetToDefaults()
|
void WFMDemodGUI::resetToDefaults()
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
ui->rfBW->setValue(4);
|
ui->rfBW->setValue(4);
|
||||||
ui->afBW->setValue(3);
|
ui->afBW->setValue(3);
|
||||||
ui->volume->setValue(20);
|
ui->volume->setValue(20);
|
||||||
ui->squelch->setValue(-40);
|
ui->squelch->setValue(-40);
|
||||||
ui->deltaFrequency->setValue(0);
|
ui->deltaFrequency->setValue(0);
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,7 +75,6 @@ QByteArray WFMDemodGUI::serialize() const
|
|||||||
s.writeS32(3, ui->afBW->value());
|
s.writeS32(3, ui->afBW->value());
|
||||||
s.writeS32(4, ui->volume->value());
|
s.writeS32(4, ui->volume->value());
|
||||||
s.writeS32(5, ui->squelch->value());
|
s.writeS32(5, ui->squelch->value());
|
||||||
//s.writeBlob(6, ui->spectrumGUI->serialize());
|
|
||||||
s.writeU32(7, m_channelMarker->getColor().rgb());
|
s.writeU32(7, m_channelMarker->getColor().rgb());
|
||||||
return s.final();
|
return s.final();
|
||||||
}
|
}
|
||||||
@ -91,6 +94,9 @@ bool WFMDemodGUI::deserialize(const QByteArray& data)
|
|||||||
QByteArray bytetmp;
|
QByteArray bytetmp;
|
||||||
quint32 u32tmp;
|
quint32 u32tmp;
|
||||||
qint32 tmp;
|
qint32 tmp;
|
||||||
|
|
||||||
|
blockApplySettings(true);
|
||||||
|
|
||||||
d.readS32(1, &tmp, 0);
|
d.readS32(1, &tmp, 0);
|
||||||
m_channelMarker->setCenterFrequency(tmp);
|
m_channelMarker->setCenterFrequency(tmp);
|
||||||
d.readS32(2, &tmp, 4);
|
d.readS32(2, &tmp, 4);
|
||||||
@ -101,10 +107,14 @@ bool WFMDemodGUI::deserialize(const QByteArray& data)
|
|||||||
ui->volume->setValue(tmp);
|
ui->volume->setValue(tmp);
|
||||||
d.readS32(5, &tmp, -40);
|
d.readS32(5, &tmp, -40);
|
||||||
ui->squelch->setValue(tmp);
|
ui->squelch->setValue(tmp);
|
||||||
//d.readBlob(6, &bytetmp);
|
|
||||||
//ui->spectrumGUI->deserialize(bytetmp);
|
|
||||||
if(d.readU32(7, &u32tmp))
|
if(d.readU32(7, &u32tmp))
|
||||||
|
{
|
||||||
m_channelMarker->setColor(u32tmp);
|
m_channelMarker->setColor(u32tmp);
|
||||||
|
}
|
||||||
|
|
||||||
|
blockApplySettings(false);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -228,6 +238,12 @@ WFMDemodGUI::~WFMDemodGUI()
|
|||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WFMDemodGUI::blockApplySettings(bool block)
|
||||||
|
{
|
||||||
|
m_channelMarker->blockSignals(block);
|
||||||
|
m_doApplySettings = !block;
|
||||||
|
}
|
||||||
|
|
||||||
void WFMDemodGUI::applySettings()
|
void WFMDemodGUI::applySettings()
|
||||||
{
|
{
|
||||||
setTitleColor(m_channelMarker->getColor());
|
setTitleColor(m_channelMarker->getColor());
|
||||||
@ -248,11 +264,15 @@ void WFMDemodGUI::applySettings()
|
|||||||
|
|
||||||
void WFMDemodGUI::leaveEvent(QEvent*)
|
void WFMDemodGUI::leaveEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(false);
|
m_channelMarker->setHighlighted(false);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WFMDemodGUI::enterEvent(QEvent*)
|
void WFMDemodGUI::enterEvent(QEvent*)
|
||||||
{
|
{
|
||||||
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(true);
|
m_channelMarker->setHighlighted(true);
|
||||||
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -48,6 +48,7 @@ private:
|
|||||||
PluginAPI* m_pluginAPI;
|
PluginAPI* m_pluginAPI;
|
||||||
ChannelMarker* m_channelMarker;
|
ChannelMarker* m_channelMarker;
|
||||||
bool m_basicSettingsShown;
|
bool m_basicSettingsShown;
|
||||||
|
bool m_doApplySettings;
|
||||||
|
|
||||||
AudioFifo* m_audioFifo;
|
AudioFifo* m_audioFifo;
|
||||||
Channelizer* m_channelizer;
|
Channelizer* m_channelizer;
|
||||||
@ -58,6 +59,7 @@ private:
|
|||||||
explicit WFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
explicit WFMDemodGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
||||||
virtual ~WFMDemodGUI();
|
virtual ~WFMDemodGUI();
|
||||||
|
|
||||||
|
void blockApplySettings(bool block);
|
||||||
void applySettings();
|
void applySettings();
|
||||||
|
|
||||||
void leaveEvent(QEvent*);
|
void leaveEvent(QEvent*);
|
||||||
|
@ -61,15 +61,11 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||||||
delete ui->mainToolBar;
|
delete ui->mainToolBar;
|
||||||
createStatusBar();
|
createStatusBar();
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #1";
|
|
||||||
|
|
||||||
setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
|
setCorner(Qt::TopLeftCorner, Qt::LeftDockWidgetArea);
|
||||||
setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
|
setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea);
|
||||||
setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
|
setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
|
||||||
setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
|
setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #2";
|
|
||||||
|
|
||||||
// work around broken Qt dock widget ordering
|
// work around broken Qt dock widget ordering
|
||||||
removeDockWidget(ui->inputDock);
|
removeDockWidget(ui->inputDock);
|
||||||
removeDockWidget(ui->processingDock);
|
removeDockWidget(ui->processingDock);
|
||||||
@ -80,26 +76,18 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||||||
addDockWidget(Qt::LeftDockWidgetArea, ui->presetDock);
|
addDockWidget(Qt::LeftDockWidgetArea, ui->presetDock);
|
||||||
addDockWidget(Qt::RightDockWidgetArea, ui->channelDock);
|
addDockWidget(Qt::RightDockWidgetArea, ui->channelDock);
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #3";
|
|
||||||
|
|
||||||
ui->inputDock->show();
|
ui->inputDock->show();
|
||||||
ui->processingDock->show();
|
ui->processingDock->show();
|
||||||
ui->presetDock->show();
|
ui->presetDock->show();
|
||||||
ui->channelDock->show();
|
ui->channelDock->show();
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #4";
|
|
||||||
|
|
||||||
ui->menu_Window->addAction(ui->inputDock->toggleViewAction());
|
ui->menu_Window->addAction(ui->inputDock->toggleViewAction());
|
||||||
ui->menu_Window->addAction(ui->processingDock->toggleViewAction());
|
ui->menu_Window->addAction(ui->processingDock->toggleViewAction());
|
||||||
ui->menu_Window->addAction(ui->presetDock->toggleViewAction());
|
ui->menu_Window->addAction(ui->presetDock->toggleViewAction());
|
||||||
ui->menu_Window->addAction(ui->channelDock->toggleViewAction());
|
ui->menu_Window->addAction(ui->channelDock->toggleViewAction());
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #5";
|
|
||||||
|
|
||||||
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleMessages()), Qt::QueuedConnection);
|
connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleMessages()), Qt::QueuedConnection);
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #6";
|
|
||||||
|
|
||||||
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
|
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
|
||||||
m_statusTimer.start(500);
|
m_statusTimer.start(500);
|
||||||
|
|
||||||
@ -107,14 +95,10 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||||||
|
|
||||||
m_pluginManager->loadPlugins();
|
m_pluginManager->loadPlugins();
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #7";
|
|
||||||
|
|
||||||
bool sampleSourceSignalsBlocked = ui->sampleSource->blockSignals(true);
|
bool sampleSourceSignalsBlocked = ui->sampleSource->blockSignals(true);
|
||||||
m_pluginManager->fillSampleSourceSelector(ui->sampleSource);
|
m_pluginManager->fillSampleSourceSelector(ui->sampleSource);
|
||||||
ui->sampleSource->blockSignals(sampleSourceSignalsBlocked);
|
ui->sampleSource->blockSignals(sampleSourceSignalsBlocked);
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #8 (was DSP engine start)";
|
|
||||||
|
|
||||||
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
|
m_spectrumVis = new SpectrumVis(ui->glSpectrum);
|
||||||
m_dspEngine->addSink(m_spectrumVis);
|
m_dspEngine->addSink(m_spectrumVis);
|
||||||
|
|
||||||
@ -124,16 +108,14 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||||||
ui->glSpectrum->connectTimer(m_masterTimer);
|
ui->glSpectrum->connectTimer(m_masterTimer);
|
||||||
ui->glSpectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
|
ui->glSpectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #9";
|
qDebug() << "MainWindow::MainWindow: loadSettings...";
|
||||||
|
|
||||||
loadSettings();
|
loadSettings();
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #10";
|
qDebug() << "MainWindow::MainWindow: select SampleSource from settings...";
|
||||||
|
|
||||||
int sampleSourceIndex = m_pluginManager->selectSampleSource(m_settings.getCurrent()->getSource()); // select SampleSource from settings
|
int sampleSourceIndex = m_pluginManager->selectSampleSource(m_settings.getCurrent()->getSource()); // select SampleSource from settings
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #11";
|
|
||||||
|
|
||||||
if(sampleSourceIndex >= 0)
|
if(sampleSourceIndex >= 0)
|
||||||
{
|
{
|
||||||
bool sampleSourceSignalsBlocked = ui->sampleSource->blockSignals(true);
|
bool sampleSourceSignalsBlocked = ui->sampleSource->blockSignals(true);
|
||||||
@ -141,15 +123,15 @@ MainWindow::MainWindow(QWidget* parent) :
|
|||||||
ui->sampleSource->blockSignals(sampleSourceSignalsBlocked);
|
ui->sampleSource->blockSignals(sampleSourceSignalsBlocked);
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #12";
|
qDebug() << "MainWindow::MainWindow: load current settings...";
|
||||||
|
|
||||||
loadSettings(m_settings.getCurrent());
|
loadSettings(m_settings.getCurrent());
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #13";
|
qDebug() << "MainWindow::MainWindow: apply settings...";
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
|
|
||||||
qDebug() << "MainWindow::MainWindow: step #14";
|
qDebug() << "MainWindow::MainWindow: update presets...";
|
||||||
|
|
||||||
updatePresets();
|
updatePresets();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user