VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-04 23:12:25 -04:00
Code Issues Projects Releases Wiki Activity

IQ swap: fixed transverter dialog

Browse Source
This commit is contained in:
f4exb 2020-06-23 22:21:39 +02:00
parent 5e10105dac
commit f13783b4e5
9 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/samplesink/bladerf2output/bladerf2outputgui.cpp
View File

@ -70,7 +70,6 @@ BladeRF2OutputGui::BladeRF2OutputGui(DeviceUISet *deviceUISet, QWidget* parent)
ui->gain->setMaximum(0); ui->gain->setMaximum(0);
ui->gain->setPageStep(1); ui->gain->setPageStep(1);
ui->gain->setSingleStep(1); ui->gain->setSingleStep(1);
ui->transverter->setIQOrderEnabled(false);
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));

2
plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp
View File

@ -54,8 +54,6 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow));
ui->sampleRate->setValueRange(8, 1000000U, 20000000U); ui->sampleRate->setValueRange(8, 1000000U, 20000000U);
ui->transverter->setIQOrderEnabled(false);
connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware())); connect(&m_updateTimer, SIGNAL(timeout()), this, SLOT(updateHardware()));
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);

1
plugins/samplesink/limesdroutput/limesdroutputgui.cpp
View File

@ -65,7 +65,6 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
ui->ncoFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->ncoFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
ui->channelNumberText->setText(tr("#%1").arg(m_limeSDROutput->getChannelIndex())); ui->channelNumberText->setText(tr("#%1").arg(m_limeSDROutput->getChannelIndex()));
ui->transverter->setIQOrderEnabled(false);
if (m_limeSDROutput->getLimeType() == DeviceLimeSDRParams::LimeMini) if (m_limeSDROutput->getLimeType() == DeviceLimeSDRParams::LimeMini)
{ {

1
plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp
View File

@ -65,7 +65,6 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent)
ui->swInterpLabel->setText(QString::fromUtf8("S\u2191")); ui->swInterpLabel->setText(QString::fromUtf8("S\u2191"));
ui->lpFIRInterpolationLabel->setText(QString::fromUtf8("\u2191")); ui->lpFIRInterpolationLabel->setText(QString::fromUtf8("\u2191"));
ui->transverter->setIQOrderEnabled(false);
CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStop); CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStop);
connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &))); connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &)));

1
plugins/samplesink/soapysdroutput/soapysdroutputgui.cpp
View File

@ -64,7 +64,6 @@ SoapySDROutputGui::SoapySDROutputGui(DeviceUISet *deviceUISet, QWidget* parent)
uint64_t f_min, f_max; uint64_t f_min, f_max;
m_sampleSink->getFrequencyRange(f_min, f_max); m_sampleSink->getFrequencyRange(f_min, f_max);
ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000); ui->centerFrequency->setValueRange(7, f_min/1000, f_max/1000);
ui->transverter->setIQOrderEnabled(false);
createCorrectionsControl(); createCorrectionsControl();
createAntennasControl(m_sampleSink->getAntennas()); createAntennasControl(m_sampleSink->getAntennas());

1
sdrgui/gui/transverterbutton.cpp
View File

@ -35,7 +35,6 @@ TransverterButton::TransverterButton(QWidget* parent) :
void TransverterButton::onClicked() void TransverterButton::onClicked()
{ {
TransverterDialog transverterDialog(m_deltaFrequency, m_deltaFrequencyActive, m_iqOrder, this); TransverterDialog transverterDialog(m_deltaFrequency, m_deltaFrequencyActive, m_iqOrder, this);
transverterDialog.setIQSwapEnabled(m_iqOrderEnabled);
transverterDialog.exec(); transverterDialog.exec();
updateState(); updateState();
} }

7
sdrgui/gui/transverterbutton.h
View File

@ -53,12 +53,6 @@ public:
updateState(); updateState();
} }
void setIQOrderEnabled(bool enabled)
{
m_iqOrderEnabled = enabled;
updateState();
}
private slots: private slots:
void onClicked(); void onClicked();
@ -66,7 +60,6 @@ private:
qint64 m_deltaFrequency; qint64 m_deltaFrequency;
bool m_deltaFrequencyActive; bool m_deltaFrequencyActive;
bool m_iqOrder; bool m_iqOrder;
bool m_iqOrderEnabled;
void updateState(); void updateState();
}; };

12
sdrgui/gui/transverterdialog.cpp
View File

@ -42,6 +42,7 @@ TransverterDialog::TransverterDialog(qint64& deltaFrequency, bool& deltaFrequenc
ui->deltaFrequencyActive->setChecked(m_deltaFrequencyActive); ui->deltaFrequencyActive->setChecked(m_deltaFrequencyActive);
ui->iqOrder->setEnabled(true); ui->iqOrder->setEnabled(true);
ui->iqOrder->setChecked(m_iqOrder); ui->iqOrder->setChecked(m_iqOrder);
ui->iqOrder->setText(m_iqOrder ? "IQ" : "QI");
} }
TransverterDialog::~TransverterDialog() TransverterDialog::~TransverterDialog()
@ -49,17 +50,6 @@ TransverterDialog::~TransverterDialog()
delete ui; delete ui;
} }
void TransverterDialog::setIQSwapEnabled(bool enabled)
{
ui->iqOrder->setEnabled(enabled);
if (enabled) {
ui->iqOrder->setChecked(m_iqOrder);
} else {
ui->iqOrder->setChecked(true);
}
}
void TransverterDialog::accept() void TransverterDialog::accept()
{ {
m_deltaFrequency = ui->deltaFrequency->getValueNew(); m_deltaFrequency = ui->deltaFrequency->getValueNew();

1
sdrgui/gui/transverterdialog.h
View File

@ -36,7 +36,6 @@ class SDRGUI_API TransverterDialog : public QDialog {
public: public:
explicit TransverterDialog(qint64& deltaFrequency, bool& deltaFrequencyActive, bool& iqOrder, QWidget* parent = 0); explicit TransverterDialog(qint64& deltaFrequency, bool& deltaFrequencyActive, bool& iqOrder, QWidget* parent = 0);
~TransverterDialog(); ~TransverterDialog();
void setIQSwapEnabled(bool enabled);
private: private:
Ui::TransverterDialog* ui; Ui::TransverterDialog* ui;