1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 06:04:39 -04:00

Deep redesign: phase #4. Compiles

This commit is contained in:
f4exb
2015-08-17 08:29:34 +02:00
parent b5f2475fbf
commit a6a7145f3d
77 changed files with 1816 additions and 1429 deletions
+61 -47
View File
@@ -2,13 +2,14 @@
#include "ui_rtlsdrgui.h"
#include "plugin/pluginapi.h"
#include "gui/colormapper.h"
#include "dsp/dspengine.h"
RTLSDRGui::RTLSDRGui(PluginAPI* pluginAPI, QWidget* parent) :
QWidget(parent),
ui(new Ui::RTLSDRGui),
m_pluginAPI(pluginAPI),
m_settings(),
m_sampleSource(NULL)
m_sampleSource(0)
{
ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
@@ -16,8 +17,8 @@ RTLSDRGui::RTLSDRGui(PluginAPI* pluginAPI, QWidget* parent) :
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
displaySettings();
m_sampleSource = new RTLSDRInput(m_pluginAPI->getMainWindowMessageQueue());
m_pluginAPI->setSampleSource(m_sampleSource);
m_sampleSource = new RTLSDRInput();
DSPEngine::instance()->setSource(m_sampleSource);
}
RTLSDRGui::~RTLSDRGui()
@@ -42,32 +43,14 @@ QString RTLSDRGui::getName() const
void RTLSDRGui::resetToDefaults()
{
m_generalSettings.resetToDefaults();
m_settings.resetToDefaults();
displaySettings();
sendSettings();
}
QByteArray RTLSDRGui::serializeGeneral() const
{
return m_generalSettings.serialize();
}
bool RTLSDRGui::deserializeGeneral(const QByteArray&data)
{
if(m_generalSettings.deserialize(data)) {
displaySettings();
sendSettings();
return true;
} else {
resetToDefaults();
return false;
}
}
qint64 RTLSDRGui::getCenterFrequency() const
{
return m_generalSettings.m_centerFrequency;
return m_settings.m_centerFrequency;
}
QByteArray RTLSDRGui::serialize() const
@@ -77,53 +60,65 @@ QByteArray RTLSDRGui::serialize() const
bool RTLSDRGui::deserialize(const QByteArray& data)
{
if(m_settings.deserialize(data)) {
if (m_settings.deserialize(data))
{
displaySettings();
sendSettings();
return true;
} else {
}
else
{
resetToDefaults();
return false;
}
}
bool RTLSDRGui::handleMessage(Message* message)
bool RTLSDRGui::handleMessage(const Message& message)
{
if(RTLSDRInput::MsgReportRTLSDR::match(message)) {
m_gains = ((RTLSDRInput::MsgReportRTLSDR*)message)->getGains();
if (RTLSDRInput::MsgReportRTLSDR::match(message))
{
m_gains = ((RTLSDRInput::MsgReportRTLSDR&) message).getGains();
displaySettings();
message->completed();
return true;
} else {
}
else
{
return false;
}
}
void RTLSDRGui::displaySettings()
{
ui->centerFrequency->setValue(m_generalSettings.m_centerFrequency / 1000);
ui->samplerateText->setText(tr("%1k").arg(m_settings.m_samplerate / 1000));
unsigned int sampleRateIndex = RTLSDRSampleRates::getRateIndex(m_settings.m_samplerate);
ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
ui->samplerateText->setText(tr("%1k").arg(m_settings.m_devSampleRate / 1000));
unsigned int sampleRateIndex = RTLSDRSampleRates::getRateIndex(m_settings.m_devSampleRate);
ui->samplerate->setValue(sampleRateIndex);
ui->ppm->setValue(m_settings.m_loPpmCorrection);
ui->ppmText->setText(tr("%1").arg(m_settings.m_loPpmCorrection));
ui->decimText->setText(tr("%1").arg(1<<m_settings.m_log2Decim));
ui->decim->setValue(m_settings.m_log2Decim);
if(m_gains.size() > 0) {
if (m_gains.size() > 0)
{
int dist = abs(m_settings.m_gain - m_gains[0]);
int pos = 0;
for(uint i = 1; i < m_gains.size(); i++) {
if(abs(m_settings.m_gain - m_gains[i]) < dist) {
for (uint i = 1; i < m_gains.size(); i++)
{
if (abs(m_settings.m_gain - m_gains[i]) < dist)
{
dist = abs(m_settings.m_gain - m_gains[i]);
pos = i;
}
}
ui->gainText->setText(tr("%1.%2").arg(m_gains[pos] / 10).arg(abs(m_gains[pos] % 10)));
ui->gain->setMaximum(m_gains.size() - 1);
ui->gain->setEnabled(true);
ui->gain->setValue(pos);
} else {
}
else
{
ui->gain->setMaximum(0);
ui->gain->setEnabled(false);
ui->gain->setValue(0);
@@ -133,40 +128,54 @@ void RTLSDRGui::displaySettings()
void RTLSDRGui::sendSettings()
{
if(!m_updateTimer.isActive())
{
m_updateTimer.start(100);
}
}
void RTLSDRGui::on_centerFrequency_changed(quint64 value)
{
m_generalSettings.m_centerFrequency = value * 1000;
m_settings.m_centerFrequency = value * 1000;
sendSettings();
}
void RTLSDRGui::on_decim_valueChanged(int value)
{
if ((value <0) || (value > 4))
{
return;
}
ui->decimText->setText(tr("%1").arg(1<<value));
m_settings.m_log2Decim = value;
sendSettings();
}
void RTLSDRGui::on_ppm_valueChanged(int value)
{
if((value > 99) || (value < -99))
if ((value > 99) || (value < -99))
{
return;
}
ui->ppmText->setText(tr("%1").arg(value));
m_settings.m_loPpmCorrection = value;
sendSettings();
}
void RTLSDRGui::on_gain_valueChanged(int value)
{
if(value > (int)m_gains.size())
if (value > (int)m_gains.size())
{
return;
}
int gain = m_gains[value];
ui->gainText->setText(tr("%1.%2").arg(gain / 10).arg(abs(gain % 10)));
m_settings.m_gain = gain;
sendSettings();
}
@@ -174,34 +183,39 @@ void RTLSDRGui::on_samplerate_valueChanged(int value)
{
int newrate = RTLSDRSampleRates::getRate(value);
ui->samplerateText->setText(tr("%1k").arg(newrate));
m_settings.m_samplerate = newrate * 1000;
m_settings.m_devSampleRate = newrate * 1000;
sendSettings();
}
void RTLSDRGui::updateHardware()
{
RTLSDRInput::MsgConfigureRTLSDR* message = RTLSDRInput::MsgConfigureRTLSDR::create(m_generalSettings, m_settings);
message->submit(m_pluginAPI->getDSPEngineMessageQueue());
RTLSDRInput::MsgConfigureRTLSDR* message = RTLSDRInput::MsgConfigureRTLSDR::create(m_settings);
m_sampleSource->getInputMessageQueue()->push(message);
m_updateTimer.stop();
}
void RTLSDRGui::on_checkBox_stateChanged(int state) {
if (state == Qt::Checked){
void RTLSDRGui::on_checkBox_stateChanged(int state)
{
if (state == Qt::Checked)
{
// Direct Modes: 0: off, 1: I, 2: Q, 3: NoMod.
((RTLSDRInput*)m_sampleSource)->set_ds_mode(3);
ui->gain->setEnabled(false);
ui->centerFrequency->setValueRange(7, 1000U, 275000U);
ui->centerFrequency->setValue(7000);
m_generalSettings.m_centerFrequency = 7000 * 1000;
m_settings.m_centerFrequency = 7000 * 1000;
}
else {
else
{
((RTLSDRInput*)m_sampleSource)->set_ds_mode(0);
ui->gain->setEnabled(true);
ui->centerFrequency->setValueRange(7, 28500U, 1700000U);
ui->centerFrequency->setValue(434000);
ui->gain->setValue(0);
m_generalSettings.m_centerFrequency = 434000 * 1000;
m_settings.m_centerFrequency = 435000 * 1000;
}
sendSettings();
}