modify code
This commit is contained in:
parent
f83cbfc753
commit
4f299f2fdd
@ -939,10 +939,10 @@ void MainWindow::onGetDeviceID(){
|
|||||||
qDebug() << "bytesWritten: " << bytesWritten;
|
qDebug() << "bytesWritten: " << bytesWritten;
|
||||||
}
|
}
|
||||||
void MainWindow::onConfigDeviceID(){
|
void MainWindow::onConfigDeviceID(){
|
||||||
QString strTips =QString("请输入0到100之间的数值");
|
QString strTips =QString("请输入0到99之间的数值");
|
||||||
|
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
int value = QInputDialog::getInt(this, tr("输入整数对话框"), strTips, 1, 1, 10, 1, &ok);
|
int value = QInputDialog::getInt(this, tr("输入整数对话框"), strTips, 0, 0, 99, 1, &ok);
|
||||||
if(!ok) return;
|
if(!ok) return;
|
||||||
|
|
||||||
if(value < 1){
|
if(value < 1){
|
||||||
|
@ -464,7 +464,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab_8">
|
<widget class="QWidget" name="tab_8">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>2</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab_5">
|
<widget class="QWidget" name="tab_5">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@ -300,7 +300,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab_8">
|
<widget class="QWidget" name="tab_8">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@ -438,11 +438,6 @@
|
|||||||
<string>inch/s**2</string>
|
<string>inch/s**2</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QComboBox" name="comboBox_rectifier_funtion">
|
<widget class="QComboBox" name="comboBox_rectifier_funtion">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
@ -894,7 +889,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab_10">
|
<widget class="QWidget" name="tab_10">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@ -1059,41 +1054,11 @@
|
|||||||
<height>25</height>
|
<height>25</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>True Peak</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>True Peak-To-Peak</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>RMS Scaled Peak</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>RMS Scaled Peak-To-Peak</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>AVG</string>
|
<string>AVG</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>RMS Scaled AVG</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>RMS</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="tab_11">
|
<widget class="QWidget" name="tab_11">
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>862</width>
|
<width>862</width>
|
||||||
<height>632</height>
|
<height>601</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="windowTitle">
|
<property name="windowTitle">
|
||||||
@ -178,7 +178,7 @@
|
|||||||
<widget class="QWidget" name="layoutWidget_3">
|
<widget class="QWidget" name="layoutWidget_3">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
<rect>
|
<rect>
|
||||||
<x>420</x>
|
<x>430</x>
|
||||||
<y>203</y>
|
<y>203</y>
|
||||||
<width>52</width>
|
<width>52</width>
|
||||||
<height>75</height>
|
<height>75</height>
|
||||||
|
35
trust.ui
35
trust.ui
@ -470,11 +470,6 @@
|
|||||||
<string>inch/s**2</string>
|
<string>inch/s**2</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QLabel" name="label_26">
|
<widget class="QLabel" name="label_26">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
@ -510,41 +505,11 @@
|
|||||||
<height>25</height>
|
<height>25</height>
|
||||||
</size>
|
</size>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>True Peak</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>True Peak-To-Peak</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>RMS Scaled Peak</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>RMS Scaled Peak-To-Peak</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string>AVG</string>
|
<string>AVG</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>RMS Scaled AVG</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>RMS</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="tab_9">
|
<widget class="QWidget" name="tab_9">
|
||||||
|
@ -300,7 +300,7 @@
|
|||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>1</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="tab_8">
|
<widget class="QWidget" name="tab_8">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
@ -450,11 +450,6 @@
|
|||||||
<string>inch/s**2</string>
|
<string>inch/s**2</string>
|
||||||
</property>
|
</property>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string/>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QLabel" name="label_28">
|
<widget class="QLabel" name="label_28">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user