diff --git a/plugins/samplesink/localoutput/localoutputgui.cpp b/plugins/samplesink/localoutput/localoutputgui.cpp
index 6e9f91234..6f75dc0a3 100644
--- a/plugins/samplesink/localoutput/localoutputgui.cpp
+++ b/plugins/samplesink/localoutput/localoutputgui.cpp
@@ -63,12 +63,6 @@ LocalOutputGui::LocalOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
ui->setupUi(this);
- ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequency->setValueRange(7, 0, 9999999U);
-
- ui->centerFrequencyHz->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequencyHz->setValueRange(3, 0, 999U);
-
CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStop);
connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &)));
@@ -215,8 +209,7 @@ void LocalOutputGui::updateSampleRateAndFrequency()
m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency);
ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000));
blockApplySettings(true);
- ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
- ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
+ ui->centerFrequency->setText(QString("%L1").arg(m_streamCenterFrequency / 1000));
blockApplySettings(false);
}
@@ -224,8 +217,7 @@ void LocalOutputGui::displaySettings()
{
blockApplySettings(true);
- ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
- ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
+ ui->centerFrequency->setText(QString("%L1").arg(m_streamCenterFrequency / 1000));
ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0));
blockApplySettings(false);
diff --git a/plugins/samplesink/localoutput/localoutputgui.ui b/plugins/samplesink/localoutput/localoutputgui.ui
index e610cdb76..66467b17d 100644
--- a/plugins/samplesink/localoutput/localoutputgui.ui
+++ b/plugins/samplesink/localoutput/localoutputgui.ui
@@ -100,89 +100,42 @@
-
-
-
- false
-
-
-
- 0
- 0
-
-
+
- 32
- 16
+ 170
+ 0
- Liberation Mono
- 20
+ Liberation Sans
+ 16
-
- ForbiddenCursor
+
+ 10,000,000,000
-
- Qt::StrongFocus
-
-
- Remote center frequency kHz
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- 32
- 0
-
-
-
-
- Liberation Mono
- 12
-
-
-
- ForbiddenCursor
-
-
- Remote center frequency sub kHz
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Hz
-
-
- Qt::AlignCenter
-
-
-
-
+
+
+
+ 0
+ 0
+
+
+
+ Hz
+
+
+ Qt::AlignCenter
+
+
-
@@ -226,12 +179,6 @@
-
- ValueDial
- QWidget
-
- 1
-
ButtonSwitch
QToolButton
diff --git a/plugins/samplesink/remoteoutput/remoteoutputgui.ui b/plugins/samplesink/remoteoutput/remoteoutputgui.ui
index 9c2e5deea..2935a78f9 100644
--- a/plugins/samplesink/remoteoutput/remoteoutputgui.ui
+++ b/plugins/samplesink/remoteoutput/remoteoutputgui.ui
@@ -136,18 +136,17 @@
+ -
+
+
+ Hz
+
+
+
-
-
-
-
-
-
-
- Hz
-
-
-
-
+
-
diff --git a/plugins/samplesource/fileinput/fileinputgui.cpp b/plugins/samplesource/fileinput/fileinputgui.cpp
index d7d42b92c..15ee71c2b 100644
--- a/plugins/samplesource/fileinput/fileinputgui.cpp
+++ b/plugins/samplesource/fileinput/fileinputgui.cpp
@@ -56,8 +56,6 @@ FileInputGUI::FileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
m_lastEngineState(DeviceAPI::StNotStarted)
{
ui->setupUi(this);
- ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequency->setValueRange(7, 0, pow(10,7));
ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }");
connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
@@ -339,7 +337,7 @@ void FileInputGUI::updateWithAcquisition()
void FileInputGUI::updateWithStreamData()
{
- ui->centerFrequency->setValue(m_centerFrequency/1000);
+ ui->centerFrequency->setText(tr("%L1").arg(m_centerFrequency));
ui->sampleRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000));
ui->sampleSizeText->setText(tr("%1b").arg(m_sampleSize));
ui->play->setEnabled(m_acquisition);
diff --git a/plugins/samplesource/fileinput/fileinputgui.ui b/plugins/samplesource/fileinput/fileinputgui.ui
index aae43b3a0..6d9c9bbde 100644
--- a/plugins/samplesource/fileinput/fileinputgui.ui
+++ b/plugins/samplesource/fileinput/fileinputgui.ui
@@ -115,43 +115,34 @@
-
-
-
- false
-
-
-
- 0
- 0
-
-
+
- 32
- 16
+ 170
+ 0
- Liberation Mono
- 20
+ Liberation Sans
+ 16
+ 50
+ false
+ false
-
- PointingHandCursor
+
+ 10,000,000,000
-
- Qt::StrongFocus
-
-
- Record center frequency in kHz
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
- kHz
+ Hz
@@ -242,7 +233,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -273,7 +268,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -298,7 +297,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -434,7 +437,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -605,12 +612,6 @@
-
- ValueDial
- QWidget
-
- 1
-
ButtonSwitch
QToolButton
diff --git a/plugins/samplesource/localinput/localinputgui.cpp b/plugins/samplesource/localinput/localinputgui.cpp
index 1adaa0dfe..6b40eb63b 100644
--- a/plugins/samplesource/localinput/localinputgui.cpp
+++ b/plugins/samplesource/localinput/localinputgui.cpp
@@ -76,12 +76,6 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_startingTimeStampms = 0;
ui->setupUi(this);
- ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequency->setValueRange(7, 0, 9999999U);
-
- ui->centerFrequencyHz->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequencyHz->setValueRange(3, 0, 999U);
-
CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStop);
connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &)));
@@ -228,8 +222,7 @@ void LocalInputGui::updateSampleRateAndFrequency()
m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency);
ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000));
blockApplySettings(true);
- ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
- ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
+ ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
blockApplySettings(false);
}
@@ -237,8 +230,7 @@ void LocalInputGui::displaySettings()
{
blockApplySettings(true);
- ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
- ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
+ ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0));
ui->dcOffset->setChecked(m_settings.m_dcBlock);
diff --git a/plugins/samplesource/localinput/localinputgui.ui b/plugins/samplesource/localinput/localinputgui.ui
index 09383c2bf..39b4ca876 100644
--- a/plugins/samplesource/localinput/localinputgui.ui
+++ b/plugins/samplesource/localinput/localinputgui.ui
@@ -100,89 +100,45 @@
-
-
-
- false
-
-
-
- 0
- 0
-
-
+
- 32
- 16
+ 170
+ 0
- Liberation Mono
- 20
+ Liberation Sans
+ 16
+ 50
+ false
+ false
-
- ForbiddenCursor
+
+ 10,000,000,000
-
- Qt::StrongFocus
-
-
- Remote center frequency kHz
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- 32
- 0
-
-
-
-
- Liberation Mono
- 12
-
-
-
- ForbiddenCursor
-
-
- Remote center frequency sub kHz
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Hz
-
-
- Qt::AlignCenter
-
-
-
-
+
+
+
+ 0
+ 0
+
+
+
+ Hz
+
+
+ Qt::AlignCenter
+
+
-
@@ -263,12 +219,6 @@
-
- ValueDial
- QWidget
-
- 1
-
ButtonSwitch
QToolButton
diff --git a/plugins/samplesource/remoteinput/remoteinputgui.cpp b/plugins/samplesource/remoteinput/remoteinputgui.cpp
index 21bf37930..18c5486a9 100644
--- a/plugins/samplesource/remoteinput/remoteinputgui.cpp
+++ b/plugins/samplesource/remoteinput/remoteinputgui.cpp
@@ -76,12 +76,6 @@ RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_startingTimeStampms = 0;
ui->setupUi(this);
- ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequency->setValueRange(7, 0, 9999999U);
-
- ui->centerFrequencyHz->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequencyHz->setValueRange(3, 0, 999U);
-
CRightClickEnabler *startStopRightClickEnabler = new CRightClickEnabler(ui->startStop);
connect(startStopRightClickEnabler, SIGNAL(rightClick(const QPoint &)), this, SLOT(openDeviceSettingsDialog(const QPoint &)));
@@ -265,8 +259,7 @@ void RemoteInputGui::updateSampleRateAndFrequency()
m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency);
ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000));
blockApplySettings(true);
- ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
- ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
+ ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
blockApplySettings(false);
}
@@ -274,8 +267,7 @@ void RemoteInputGui::displaySettings()
{
blockApplySettings(true);
- ui->centerFrequency->setValue(m_streamCenterFrequency / 1000);
- ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
+ ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0));
ui->apiAddress->setText(m_settings.m_apiAddress);
diff --git a/plugins/samplesource/remoteinput/remoteinputgui.ui b/plugins/samplesource/remoteinput/remoteinputgui.ui
index cea36c09e..75dad94ef 100644
--- a/plugins/samplesource/remoteinput/remoteinputgui.ui
+++ b/plugins/samplesource/remoteinput/remoteinputgui.ui
@@ -6,8 +6,8 @@
0
0
- 360
- 270
+ 400
+ 312
@@ -100,89 +100,45 @@
-
-
-
- false
-
-
-
- 0
- 0
-
-
+
- 32
- 16
+ 170
+ 0
- Liberation Mono
- 20
+ Liberation Sans
+ 16
+ 50
+ false
+ false
-
- ForbiddenCursor
+
+ 10,000,000,000
-
- Qt::StrongFocus
-
-
- Remote center frequency kHz
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- 32
- 0
-
-
-
-
- Liberation Mono
- 12
-
-
-
- ForbiddenCursor
-
-
- Remote center frequency sub kHz
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Hz
-
-
- Qt::AlignCenter
-
-
-
-
+
+
+
+ 0
+ 0
+
+
+
+ Hz
+
+
+ Qt::AlignCenter
+
+
-
@@ -899,12 +855,6 @@
-
- ValueDial
- QWidget
-
- 1
-
ButtonSwitch
QToolButton
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
index 66d403bed..2e60cef5d 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
+++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
@@ -63,12 +63,6 @@ SigMFFileInputGUI::SigMFFileInputGUI(DeviceUISet *deviceUISet, QWidget* parent)
{
ui->setupUi(this);
- ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequency->setValueRange(8, 0, pow(10,8));
-
- ui->centerFrequencyHz->setColorMapper(ColorMapper(ColorMapper::GrayGold));
- ui->centerFrequencyHz->setValueRange(3, 0, 999U);
-
ui->fileNameText->setText(m_metaFileName);
ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }");
ui->captureTable->setSelectionMode(QAbstractItemView::NoSelection);
@@ -570,8 +564,7 @@ void SigMFFileInputGUI::updateWithStreamData()
ui->captureTable->blockSignals(false);
ui->trackNumberText->setText(tr("%1").arg(m_currentTrackIndex + 1, 3, 10, QChar('0')));
- ui->centerFrequency->setValue(m_centerFrequency/1000);
- ui->centerFrequencyHz->setValue(m_centerFrequency % 1000);
+ ui->centerFrequency->setText(tr("%L1").arg(m_centerFrequency));
ui->sampleRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000));
QTime recordLength(0, 0, 0, 0);
recordLength = recordLength.addSecs(m_recordLength / m_sampleRate);
diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui b/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui
index 4c326d7e2..8db2c990b 100644
--- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui
+++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui
@@ -115,89 +115,36 @@
-
-
-
- false
-
-
-
- 0
- 0
-
-
+
- 32
- 16
+ 170
+ 0
- Liberation Mono
- 20
+ Liberation Sans
+ 16
+ 50
+ false
+ false
-
- PointingHandCursor
+
+ 10,000,000,000
-
- Qt::StrongFocus
-
-
- Record center frequency in kHz
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- 6
+
+
+ Hz
-
- 6
-
-
-
-
-
- false
-
-
-
- 0
- 0
-
-
-
-
- 32
- 16
-
-
-
-
- Liberation Mono
- 12
-
-
-
- PointingHandCursor
-
-
- Qt::StrongFocus
-
-
- Record center frequency in kHz
-
-
-
- -
-
-
- Hz
-
-
-
-
+
-
@@ -338,7 +285,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -369,7 +320,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -394,7 +349,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -409,7 +368,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -732,7 +695,11 @@
+ Liberation Sans
8
+ 50
+ false
+ false
@@ -876,12 +843,6 @@
-
- ValueDial
- QWidget
-
- 1
-
ButtonSwitch
QToolButton