1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-15 21:01:45 -05:00

SDRdaemonFEC: implemented value dial for desired center frequency

This commit is contained in:
f4exb 2017-06-09 01:03:56 +02:00
parent 4349a7d622
commit 9c1a38a8cf
4 changed files with 44 additions and 43 deletions

View File

@ -280,7 +280,7 @@
<item> <item>
<widget class="QLabel" name="txDelayLabel"> <widget class="QLabel" name="txDelayLabel">
<property name="text"> <property name="text">
<string>Dt</string> <string>UDly</string>
</property> </property>
</widget> </widget>
</item> </item>

View File

@ -86,10 +86,13 @@ SDRdaemonFECGui::SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
ui->setupUi(this); ui->setupUi(this);
ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
ui->centerFrequency->setValueRange(7, 0, pow(10,7)); ui->centerFrequency->setValueRange(7, 0, 9999999U);
ui->freq->setColorMapper(ColorMapper(ColorMapper::GrayGold));
ui->freq->setValueRange(7, 0, 9999999U);
ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow)); ui->sampleRate->setColorMapper(ColorMapper(ColorMapper::GrayGreenYellow));
ui->sampleRate->setValueRange(7, 32000U, 9000000U); ui->sampleRate->setValueRange(7, 32000U, 9999999U);
connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus())); connect(&m_statusTimer, SIGNAL(timeout()), this, SLOT(updateStatus()));
m_statusTimer.start(500); m_statusTimer.start(500);
@ -311,7 +314,7 @@ void SDRdaemonFECGui::displaySettings()
ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000); ui->centerFrequency->setValue(m_settings.m_centerFrequency / 1000);
ui->deviceRateText->setText(tr("%1k").arg(m_sampleRate / 1000.0)); ui->deviceRateText->setText(tr("%1k").arg(m_sampleRate / 1000.0));
ui->freq->setText(QString::number(m_settings.m_centerFrequency / 1000)); ui->freq->setValue(m_settings.m_centerFrequency / 1000);
ui->decim->setCurrentIndex(m_settings.m_log2Decim); ui->decim->setCurrentIndex(m_settings.m_log2Decim);
ui->fcPos->setCurrentIndex(m_settings.m_fcPos); ui->fcPos->setCurrentIndex(m_settings.m_fcPos);
ui->sampleRate->setValue(m_settings.m_sampleRate); ui->sampleRate->setValue(m_settings.m_sampleRate);
@ -546,17 +549,11 @@ void SDRdaemonFECGui::on_iqImbalance_toggled(bool checked)
} }
} }
void SDRdaemonFECGui::on_freq_returnPressed() void SDRdaemonFECGui::on_freq_changed(quint64 value)
{ {
bool ok; m_settings.m_centerFrequency = value * 1000;
uint64_t freq = ui->freq->text().toInt(&ok);
if (ok)
{
m_settings.m_centerFrequency = freq * 1000;
sendControl(); sendControl();
} }
}
void SDRdaemonFECGui::on_sampleRate_changed(quint64 value) void SDRdaemonFECGui::on_sampleRate_changed(quint64 value)
{ {

View File

@ -130,7 +130,7 @@ private slots:
void on_dataPort_returnPressed(); void on_dataPort_returnPressed();
void on_controlPort_returnPressed(); void on_controlPort_returnPressed();
void on_sendButton_clicked(bool checked); void on_sendButton_clicked(bool checked);
void on_freq_returnPressed(); void on_freq_changed(quint64 value);
void on_sampleRate_changed(quint64 value); void on_sampleRate_changed(quint64 value);
void on_specificParms_returnPressed(); void on_specificParms_returnPressed();
void on_decim_currentIndexChanged(int index); void on_decim_currentIndexChanged(int index);

View File

@ -737,27 +737,31 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="freq"> <widget class="ValueDial" name="freq" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>0</width> <width>32</width>
<height>0</height> <height>16</height>
</size> </size>
</property> </property>
<property name="maximumSize"> <property name="font">
<size> <font>
<width>100</width> <family>DejaVu Sans Mono</family>
<height>16777215</height> <pointsize>12</pointsize>
</size> <italic>false</italic>
</font>
</property>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property> </property>
<property name="toolTip"> <property name="toolTip">
<string>Set center frequency (kHz)</string> <string>Desired device center frequency</string>
</property>
<property name="text">
<string>00000000</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -791,7 +795,7 @@
<item> <item>
<widget class="QLabel" name="txDelayLabel"> <widget class="QLabel" name="txDelayLabel">
<property name="text"> <property name="text">
<string>Dt</string> <string>UDly</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -886,6 +890,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QLabel" name="decimLabel"> <widget class="QLabel" name="decimLabel">
<property name="text"> <property name="text">
@ -988,19 +1005,6 @@
</item> </item>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</item> </item>
<item> <item>