VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-21 23:55:13 -05:00
Code Issues Projects Releases Wiki Activity

Replaced frequency dials by labels for unmodifiable frequency displays

Browse Source
This commit is contained in:
f4exb 2021-12-16 00:18:11 +01:00
parent 9097e2f6d4
commit d471f09cc2
11 changed files with 158 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/samplesink/localoutput/localoutputgui.cpp
View File

@ -63,12 +63,6 @@ LocalOutputGui::LocalOutputGui(DeviceUISet *deviceUISet, QWidget* parent) :
ui->setupUi(this); 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); 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 &)));
@ -215,8 +209,7 @@ void LocalOutputGui::updateSampleRateAndFrequency()
m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency); m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency);
ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000)); ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000));
blockApplySettings(true); blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000); ui->centerFrequency->setText(QString("%L1").arg(m_streamCenterFrequency / 1000));
ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
blockApplySettings(false); blockApplySettings(false);
} }
@ -224,8 +217,7 @@ void LocalOutputGui::displaySettings()
{ {
blockApplySettings(true); blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000); ui->centerFrequency->setText(QString("%L1").arg(m_streamCenterFrequency / 1000));
ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0)); ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0));
blockApplySettings(false); blockApplySettings(false);

99
plugins/samplesink/localoutput/localoutputgui.ui
View File

@ -100,89 +100,42 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="ValueDial" name="centerFrequency" native="true"> <widget class="QLabel" name="centerFrequency">
<property name="enabled">
<bool>false</bool>
</property>
<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>32</width> <width>170</width>
<height>16</height> <height>0</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Sans</family>
<pointsize>20</pointsize> <pointsize>16</pointsize>
</font> </font>
</property> </property>
<property name="cursor"> <property name="text">
<cursorShape>ForbiddenCursor</cursorShape> <string>10,000,000,000</string>
</property> </property>
<property name="focusPolicy"> <property name="alignment">
<enum>Qt::StrongFocus</enum> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="toolTip">
<string>Remote center frequency kHz</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="hertzLayout"> <widget class="QLabel" name="freqUnits">
<item> <property name="sizePolicy">
<widget class="ValueDial" name="centerFrequencyHz" native="true"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<property name="enabled"> <horstretch>0</horstretch>
<bool>false</bool> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <property name="text">
<horstretch>0</horstretch> <string> Hz</string>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="alignment">
</property> <set>Qt::AlignCenter</set>
<property name="minimumSize"> </property>
<size> </widget>
<width>32</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<family>Liberation Mono</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>ForbiddenCursor</cursorShape>
</property>
<property name="toolTip">
<string>Remote center frequency sub kHz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="freqUnits">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string> Hz</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
@ -226,12 +179,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>

17
plugins/samplesink/remoteoutput/remoteoutputgui.ui
View File

@ -136,18 +136,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="freqUnits">
<property name="text">
<string>Hz</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QVBoxLayout" name="freqRightLayout"> <layout class="QVBoxLayout" name="freqRightLayout">
<item> <item>
<layout class="QHBoxLayout" name="freqRightTopLayout"> <layout class="QHBoxLayout" name="freqRightTopLayout"/>
<item>
<widget class="QLabel" name="freqUnits">
<property name="text">
<string>Hz</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="freqRightBotLayout"> <layout class="QHBoxLayout" name="freqRightBotLayout">

4
plugins/samplesource/fileinput/fileinputgui.cpp
View File

@ -56,8 +56,6 @@ FileInputGUI::FileInputGUI(DeviceUISet *deviceUISet, QWidget* parent) :
m_lastEngineState(DeviceAPI::StNotStarted) m_lastEngineState(DeviceAPI::StNotStarted)
{ {
ui->setupUi(this); 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); }"); ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }");
connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick())); connect(&(m_deviceUISet->m_deviceAPI->getMasterTimer()), SIGNAL(timeout()), this, SLOT(tick()));
@ -339,7 +337,7 @@ void FileInputGUI::updateWithAcquisition()
void FileInputGUI::updateWithStreamData() 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->sampleRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000));
ui->sampleSizeText->setText(tr("%1b").arg(m_sampleSize)); ui->sampleSizeText->setText(tr("%1b").arg(m_sampleSize));
ui->play->setEnabled(m_acquisition); ui->play->setEnabled(m_acquisition);

57
plugins/samplesource/fileinput/fileinputgui.ui
View File

@ -115,43 +115,34 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="ValueDial" name="centerFrequency" native="true"> <widget class="QLabel" name="centerFrequency">
<property name="enabled">
<bool>false</bool>
</property>
<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>32</width> <width>170</width>
<height>16</height> <height>0</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Sans</family>
<pointsize>20</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="cursor"> <property name="text">
<cursorShape>PointingHandCursor</cursorShape> <string>10,000,000,000</string>
</property> </property>
<property name="focusPolicy"> <property name="alignment">
<enum>Qt::StrongFocus</enum> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="toolTip">
<string>Record center frequency in kHz</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="freqUnits"> <widget class="QLabel" name="freqUnits">
<property name="text"> <property name="text">
<string> kHz</string> <string>Hz</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -242,7 +233,11 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -273,7 +268,11 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -298,7 +297,11 @@
<widget class="QLabel" name="crcLabel"> <widget class="QLabel" name="crcLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -434,7 +437,11 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -605,12 +612,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>

12
plugins/samplesource/localinput/localinputgui.cpp
View File

@ -76,12 +76,6 @@ LocalInputGui::LocalInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_startingTimeStampms = 0; m_startingTimeStampms = 0;
ui->setupUi(this); 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); 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 &)));
@ -228,8 +222,7 @@ void LocalInputGui::updateSampleRateAndFrequency()
m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency); m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency);
ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000)); ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000));
blockApplySettings(true); blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000); ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
blockApplySettings(false); blockApplySettings(false);
} }
@ -237,8 +230,7 @@ void LocalInputGui::displaySettings()
{ {
blockApplySettings(true); blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000); ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0)); ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0));
ui->dcOffset->setChecked(m_settings.m_dcBlock); ui->dcOffset->setChecked(m_settings.m_dcBlock);

102
plugins/samplesource/localinput/localinputgui.ui
View File

@ -100,89 +100,45 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="ValueDial" name="centerFrequency" native="true"> <widget class="QLabel" name="centerFrequency">
<property name="enabled">
<bool>false</bool>
</property>
<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>32</width> <width>170</width>
<height>16</height> <height>0</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Sans</family>
<pointsize>20</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="cursor"> <property name="text">
<cursorShape>ForbiddenCursor</cursorShape> <string>10,000,000,000</string>
</property> </property>
<property name="focusPolicy"> <property name="alignment">
<enum>Qt::StrongFocus</enum> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="toolTip">
<string>Remote center frequency kHz</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="hertzLayout"> <widget class="QLabel" name="freqUnits">
<item> <property name="sizePolicy">
<widget class="ValueDial" name="centerFrequencyHz" native="true"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<property name="enabled"> <horstretch>0</horstretch>
<bool>false</bool> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <property name="text">
<horstretch>0</horstretch> <string> Hz</string>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="alignment">
</property> <set>Qt::AlignCenter</set>
<property name="minimumSize"> </property>
<size> </widget>
<width>32</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<family>Liberation Mono</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>ForbiddenCursor</cursorShape>
</property>
<property name="toolTip">
<string>Remote center frequency sub kHz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="freqUnits">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string> Hz</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
@ -263,12 +219,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>

12
plugins/samplesource/remoteinput/remoteinputgui.cpp
View File

@ -76,12 +76,6 @@ RemoteInputGui::RemoteInputGui(DeviceUISet *deviceUISet, QWidget* parent) :
m_startingTimeStampms = 0; m_startingTimeStampms = 0;
ui->setupUi(this); 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); 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 &)));
@ -265,8 +259,7 @@ void RemoteInputGui::updateSampleRateAndFrequency()
m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency); m_deviceUISet->getSpectrum()->setCenterFrequency(m_streamCenterFrequency);
ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000)); ui->deviceRateText->setText(tr("%1k").arg((float)m_streamSampleRate / 1000));
blockApplySettings(true); blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000); ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
blockApplySettings(false); blockApplySettings(false);
} }
@ -274,8 +267,7 @@ void RemoteInputGui::displaySettings()
{ {
blockApplySettings(true); blockApplySettings(true);
ui->centerFrequency->setValue(m_streamCenterFrequency / 1000); ui->centerFrequency->setText(tr("%L1").arg(m_streamCenterFrequency));
ui->centerFrequencyHz->setValue(m_streamCenterFrequency % 1000);
ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0)); ui->deviceRateText->setText(tr("%1k").arg(m_streamSampleRate / 1000.0));
ui->apiAddress->setText(m_settings.m_apiAddress); ui->apiAddress->setText(m_settings.m_apiAddress);

106
plugins/samplesource/remoteinput/remoteinputgui.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>360</width> <width>400</width>
<height>270</height> <height>312</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
@ -100,89 +100,45 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="ValueDial" name="centerFrequency" native="true"> <widget class="QLabel" name="centerFrequency">
<property name="enabled">
<bool>false</bool>
</property>
<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>32</width> <width>170</width>
<height>16</height> <height>0</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Sans</family>
<pointsize>20</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="cursor"> <property name="text">
<cursorShape>ForbiddenCursor</cursorShape> <string>10,000,000,000</string>
</property> </property>
<property name="focusPolicy"> <property name="alignment">
<enum>Qt::StrongFocus</enum> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="toolTip">
<string>Remote center frequency kHz</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="hertzLayout"> <widget class="QLabel" name="freqUnits">
<item> <property name="sizePolicy">
<widget class="ValueDial" name="centerFrequencyHz" native="true"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<property name="enabled"> <horstretch>0</horstretch>
<bool>false</bool> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="sizePolicy"> </property>
<sizepolicy hsizetype="Maximum" vsizetype="Preferred"> <property name="text">
<horstretch>0</horstretch> <string> Hz</string>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="alignment">
</property> <set>Qt::AlignCenter</set>
<property name="minimumSize"> </property>
<size> </widget>
<width>32</width>
<height>0</height>
</size>
</property>
<property name="font">
<font>
<family>Liberation Mono</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>ForbiddenCursor</cursorShape>
</property>
<property name="toolTip">
<string>Remote center frequency sub kHz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="freqUnits">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string> Hz</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
@ -899,12 +855,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>

9
plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
View File

@ -63,12 +63,6 @@ SigMFFileInputGUI::SigMFFileInputGUI(DeviceUISet *deviceUISet, QWidget* parent)
{ {
ui->setupUi(this); 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->fileNameText->setText(m_metaFileName);
ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }"); ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }");
ui->captureTable->setSelectionMode(QAbstractItemView::NoSelection); ui->captureTable->setSelectionMode(QAbstractItemView::NoSelection);
@ -570,8 +564,7 @@ void SigMFFileInputGUI::updateWithStreamData()
ui->captureTable->blockSignals(false); ui->captureTable->blockSignals(false);
ui->trackNumberText->setText(tr("%1").arg(m_currentTrackIndex + 1, 3, 10, QChar('0'))); ui->trackNumberText->setText(tr("%1").arg(m_currentTrackIndex + 1, 3, 10, QChar('0')));
ui->centerFrequency->setValue(m_centerFrequency/1000); ui->centerFrequency->setText(tr("%L1").arg(m_centerFrequency));
ui->centerFrequencyHz->setValue(m_centerFrequency % 1000);
ui->sampleRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000)); ui->sampleRateText->setText(tr("%1k").arg((float)m_sampleRate / 1000));
QTime recordLength(0, 0, 0, 0); QTime recordLength(0, 0, 0, 0);
recordLength = recordLength.addSecs(m_recordLength / m_sampleRate); recordLength = recordLength.addSecs(m_recordLength / m_sampleRate);

111
plugins/samplesource/sigmffileinput/sigmffileinputgui.ui
View File

@ -115,89 +115,36 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="ValueDial" name="centerFrequency" native="true"> <widget class="QLabel" name="centerFrequency">
<property name="enabled">
<bool>false</bool>
</property>
<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>32</width> <width>170</width>
<height>16</height> <height>0</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Sans</family>
<pointsize>20</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="cursor"> <property name="text">
<cursorShape>PointingHandCursor</cursorShape> <string>10,000,000,000</string>
</property> </property>
<property name="focusPolicy"> <property name="alignment">
<enum>Qt::StrongFocus</enum> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
<property name="toolTip">
<string>Record center frequency in kHz</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="HzLayout"> <widget class="QLabel" name="freqUnits">
<property name="leftMargin"> <property name="text">
<number>6</number> <string>Hz</string>
</property> </property>
<property name="rightMargin"> </widget>
<number>6</number>
</property>
<item>
<widget class="ValueDial" name="centerFrequencyHz" native="true">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>32</width>
<height>16</height>
</size>
</property>
<property name="font">
<font>
<family>Liberation Mono</family>
<pointsize>12</pointsize>
</font>
</property>
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="focusPolicy">
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip">
<string>Record center frequency in kHz</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="freqUnits">
<property name="text">
<string>Hz</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item> <item>
<spacer name="freqRightlSpacer"> <spacer name="freqRightlSpacer">
@ -338,7 +285,11 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -369,7 +320,11 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -394,7 +349,11 @@
<widget class="QLabel" name="crcLabel"> <widget class="QLabel" name="crcLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -409,7 +368,11 @@
<widget class="QLabel" name="totalLabel"> <widget class="QLabel" name="totalLabel">
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -732,7 +695,11 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic>
<bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">
@ -876,12 +843,6 @@
</layout> </layout>
</widget> </widget>
<customwidgets> <customwidgets>
<customwidget>
<class>ValueDial</class>
<extends>QWidget</extends>
<header>gui/valuedial.h</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>ButtonSwitch</class> <class>ButtonSwitch</class>
<extends>QToolButton</extends> <extends>QToolButton</extends>