caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12 from nbgsmk/graph_update

Browse Source 
SignalGen - more precision digits; ui panel mod.
This commit is contained in:
jankae 2020-11-25 15:30:27 +01:00 committed by GitHub
commit 641f4ccd98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Software/PC_Application/Generator/signalgenwidget.cpp
View File

@ -8,6 +8,7 @@ SignalgeneratorWidget::SignalgeneratorWidget(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
ui->frequency->setUnit("Hz"); ui->frequency->setUnit("Hz");
ui->frequency->setPrefixes(" kMG"); ui->frequency->setPrefixes(" kMG");
ui->frequency->setPrecision(6); // show enough digits
connect(ui->frequency, &SIUnitEdit::valueChanged, [=](double newval) { connect(ui->frequency, &SIUnitEdit::valueChanged, [=](double newval) {
if(newval < Device::Info().limits_minFreq) { if(newval < Device::Info().limits_minFreq) {

29
Software/PC_Application/Generator/signalgenwidget.ui
View File

@ -39,7 +39,7 @@
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -51,21 +51,30 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QLabel" name="label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Generator</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QGroupBox" name="groupBox"> <widget class="QGroupBox" name="groupBox">
<property name="title"> <property name="title">
<string>Generator</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Frequency:</string> <string>Frequency:</string>
</property> </property>
</widget> <layout class="QVBoxLayout" name="verticalLayout_2">
</item>
<item> <item>
<widget class="SIUnitEdit" name="frequency"/> <widget class="SIUnitEdit" name="frequency"/>
</item> </item>
@ -148,7 +157,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<spacer name="verticalSpacer"> <spacer name="verticalSpacer_2">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>