zhangsheng/TSI_Config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
zhangsheng 2025-08-07 19:35:59 +08:00
parent 71cc0c4f1a
commit 6c908697bf
15 changed files with 345 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acceleration.cpp
View File

@ -123,8 +123,6 @@ void Acceleration::Init() {
ui->checkBox_enable_10->setChecked(variable_ptr->freband_output[9].enable); ui->checkBox_enable_10->setChecked(variable_ptr->freband_output[9].enable);
ui->lineEdit_start_10->setText(QString::number(variable_ptr->freband_output[9].start)); ui->lineEdit_start_10->setText(QString::number(variable_ptr->freband_output[9].start));
ui->lineEdit_end_10->setText(QString::number(variable_ptr->freband_output[9].end)); ui->lineEdit_end_10->setText(QString::number(variable_ptr->freband_output[9].end));
} }
void Acceleration::on_pushButton_confirm_clicked() { void Acceleration::on_pushButton_confirm_clicked() {

87
acceleration.ui
View File

@ -403,7 +403,7 @@
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_8"> <widget class="QWidget" name="tab_8">
<attribute name="title"> <attribute name="title">
@ -414,8 +414,8 @@
<rect> <rect>
<x>200</x> <x>200</x>
<y>150</y> <y>150</y>
<width>54</width> <width>71</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -427,8 +427,8 @@
<rect> <rect>
<x>200</x> <x>200</x>
<y>50</y> <y>50</y>
<width>54</width> <width>81</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -492,8 +492,8 @@
<rect> <rect>
<x>200</x> <x>200</x>
<y>100</y> <y>100</y>
<width>54</width> <width>81</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -651,13 +651,12 @@
<rect> <rect>
<x>90</x> <x>90</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string> 等级 <string> 等级</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_41"> <widget class="QLabel" name="label_41">
@ -665,13 +664,12 @@
<rect> <rect>
<x>170</x> <x>170</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>回差 <string>回差</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_42"> <widget class="QLabel" name="label_42">
@ -679,13 +677,12 @@
<rect> <rect>
<x>230</x> <x>230</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>延时 <string>延时</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_43"> <widget class="QLabel" name="label_43">
@ -693,7 +690,7 @@
<rect> <rect>
<x>280</x> <x>280</x>
<y>40</y> <y>40</y>
<width>31</width> <width>41</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -706,7 +703,7 @@
<rect> <rect>
<x>340</x> <x>340</x>
<y>40</y> <y>40</y>
<width>31</width> <width>41</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -1134,6 +1131,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_5"> <widget class="QCheckBox" name="checkBox_enable_5">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1147,6 +1147,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_5"> <widget class="QLineEdit" name="lineEdit_end_5">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1157,6 +1160,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_5"> <widget class="QLineEdit" name="lineEdit_start_5">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1167,6 +1173,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_6"> <widget class="QCheckBox" name="checkBox_enable_6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1180,6 +1189,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_6"> <widget class="QLineEdit" name="lineEdit_end_6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1190,6 +1202,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_6"> <widget class="QLineEdit" name="lineEdit_start_6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1200,6 +1215,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_7"> <widget class="QCheckBox" name="checkBox_enable_7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1213,6 +1231,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_7"> <widget class="QLineEdit" name="lineEdit_end_7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1223,6 +1244,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_7"> <widget class="QLineEdit" name="lineEdit_start_7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1233,6 +1257,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_8"> <widget class="QCheckBox" name="checkBox_enable_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1246,6 +1273,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_8"> <widget class="QLineEdit" name="lineEdit_end_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1256,6 +1286,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_8"> <widget class="QLineEdit" name="lineEdit_start_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1266,6 +1299,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_9"> <widget class="QCheckBox" name="checkBox_enable_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1279,6 +1315,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_9"> <widget class="QLineEdit" name="lineEdit_end_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1289,6 +1328,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_9"> <widget class="QLineEdit" name="lineEdit_start_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1299,6 +1341,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_10"> <widget class="QCheckBox" name="checkBox_enable_10">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1312,6 +1357,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_10"> <widget class="QLineEdit" name="lineEdit_end_10">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1322,6 +1370,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_10"> <widget class="QLineEdit" name="lineEdit_start_10">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>

9
data_config.h
View File

@ -240,7 +240,7 @@ typedef enum {
kVibRackTMR = 1 // 三冗余 kVibRackTMR = 1 // 三冗余
} VibRackType; } VibRackType;
typedef struct { typedef struct SeismicMonitor_{
int id; int id;
QString point_name; QString point_name;
QString chan_id; QString chan_id;
@ -260,6 +260,13 @@ typedef struct {
int keyphase_ch; int keyphase_ch;
int sensitivity_unit; int sensitivity_unit;
float signal_sensitivity; float signal_sensitivity;
SeismicMonitor_(){
standby = false;
active = false;
normal_voltage_high = 20;
normal_voltage_low = -20;
signal_sensitivity = 8;
}
} SeismicMonitor; } SeismicMonitor;
typedef enum { typedef enum {

2
dc_outputs.ui
View File

@ -56,7 +56,7 @@
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>通道1 &amp; 通道4</string> <string>通道1 &amp; 通道2</string>
</property> </property>
</item> </item>
<item> <item>

32
keyphase.ui
View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>660</width> <width>691</width>
<height>580</height> <height>598</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -76,7 +76,7 @@
<widget class="QLabel" name="label_39"> <widget class="QLabel" name="label_39">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>326</x>
<y>310</y> <y>310</y>
<width>41</width> <width>41</width>
<height>16</height> <height>16</height>
@ -89,7 +89,7 @@
<widget class="QPushButton" name="pushButton_2"> <widget class="QPushButton" name="pushButton_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>296</x> <x>322</x>
<y>250</y> <y>250</y>
<width>51</width> <width>51</width>
<height>32</height> <height>32</height>
@ -104,7 +104,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>60</y> <y>60</y>
<width>281</width> <width>301</width>
<height>451</height> <height>451</height>
</rect> </rect>
</property> </property>
@ -550,7 +550,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>40</y> <y>40</y>
<width>251</width> <width>281</width>
<height>71</height> <height>71</height>
</rect> </rect>
</property> </property>
@ -717,7 +717,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>130</y> <y>130</y>
<width>251</width> <width>281</width>
<height>181</height> <height>181</height>
</rect> </rect>
</property> </property>
@ -809,7 +809,7 @@
<rect> <rect>
<x>140</x> <x>140</x>
<y>90</y> <y>90</y>
<width>111</width> <width>131</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -822,7 +822,7 @@
<rect> <rect>
<x>140</x> <x>140</x>
<y>130</y> <y>130</y>
<width>101</width> <width>131</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -897,7 +897,7 @@
<widget class="QPushButton" name="pushButton_3"> <widget class="QPushButton" name="pushButton_3">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>294</x> <x>320</x>
<y>360</y> <y>360</y>
<width>51</width> <width>51</width>
<height>32</height> <height>32</height>
@ -926,9 +926,9 @@
<widget class="QTabWidget" name="tabWidget_2"> <widget class="QTabWidget" name="tabWidget_2">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>350</x> <x>380</x>
<y>60</y> <y>60</y>
<width>281</width> <width>301</width>
<height>451</height> <height>451</height>
</rect> </rect>
</property> </property>
@ -1374,7 +1374,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>40</y> <y>40</y>
<width>251</width> <width>281</width>
<height>71</height> <height>71</height>
</rect> </rect>
</property> </property>
@ -1538,7 +1538,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>130</y> <y>130</y>
<width>251</width> <width>281</width>
<height>181</height> <height>181</height>
</rect> </rect>
</property> </property>
@ -1630,7 +1630,7 @@
<rect> <rect>
<x>140</x> <x>140</x>
<y>90</y> <y>90</y>
<width>111</width> <width>131</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -1643,7 +1643,7 @@
<rect> <rect>
<x>140</x> <x>140</x>
<y>130</y> <y>130</y>
<width>101</width> <width>121</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>

35
mainwindow.cpp
View File

@ -5,7 +5,7 @@
#include <QJsonDocument> #include <QJsonDocument>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonObject> #include <QJsonObject>
#include <QInputDialog>
#include "keyphase.h" #include "keyphase.h"
#include "singlerelay.h" #include "singlerelay.h"
#include "tachometer.h" #include "tachometer.h"
@ -36,9 +36,6 @@ MainWindow::MainWindow(QWidget *parent)
: QMainWindow(parent) : QMainWindow(parent)
, ui(new Ui::MainWindow) { , ui(new Ui::MainWindow) {
ui->setupUi(this); ui->setupUi(this);
// QMenuBar *menuBar = this->menuBar();
// this->setMenuBar(menuBar); //添加到对象树
// menuBar->addMenu(ui->menu_start);
g_version = "1.1"; g_version = "1.1";
current_slot = -1; current_slot = -1;
tsi_config_file = ""; tsi_config_file = "";
@ -571,12 +568,28 @@ uint8_t calculate_crc(const QByteArray &data) {
} }
void MainWindow::on_pushButton_save_clicked() { void MainWindow::on_pushButton_save_clicked() {
QString filepath = QFileDialog::getExistingDirectory(this, tr("选择文件夹"), tr("")); QString file_name = "";
if(filepath == "") if(tsi_config_file == ""){
return; QString strTips =QString("请输入保存的文件名称");
QString file_name = filepath + "\\tsi_config_file.json"; bool ok = false;
ConfigMgr::Instance()->Save(file_name); QString defaultInput = "tsi_config_file";
tsi_config_file = file_name; file_name = QInputDialog::getText(this, tr("输入名称对话框"), strTips, QLineEdit::Normal, defaultInput, &ok);
if(!ok) return;
if( file_name == ""){
QMessageBox::information(this, QStringLiteral("提示"), QStringLiteral("请输入正确的文件名称！"));
return ;
}
QString filepath = QFileDialog::getExistingDirectory(this, tr("选择文件夹"), tr(""));
if(filepath == "")
return;
file_name = filepath + "\\"+file_name +".json";
ConfigMgr::Instance()->Save(file_name);
tsi_config_file = file_name;
}else {
ConfigMgr::Instance()->Save(tsi_config_file);
}
return; return;
} }
@ -598,7 +611,7 @@ void MainWindow::on_pushButton_open_clicked() {
return; return;
} }
QList<QAbstractButton *> buttonList = btnGroup_slot->buttons(); QList<QAbstractButton *> buttonList = btnGroup_slot->buttons();
for (int i = 0; i < buttonList.count(); i++) { for (int i = 1; i < buttonList.count(); i++) {
buttonList[i]->setText(""); buttonList[i]->setText("");
} }
for (int i = 0; i < SLOT_NUM; i++) { for (int i = 0; i < SLOT_NUM; i++) {

2
mainwindow.ui
View File

@ -724,7 +724,7 @@
</size> </size>
</property> </property>
<property name="text"> <property name="text">
<string>电源板</string> <string/>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignCenter</set> <set>Qt::AlignCenter</set>

69
pressure_pulsation.ui
View File

@ -464,7 +464,7 @@
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_8"> <widget class="QWidget" name="tab_8">
<attribute name="title"> <attribute name="title">
@ -687,8 +687,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string> 等级 <string> 等级</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_41"> <widget class="QLabel" name="label_41">
@ -701,8 +700,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>回差 <string>回差</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_42"> <widget class="QLabel" name="label_42">
@ -715,8 +713,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>延时 <string>延时</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_43"> <widget class="QLabel" name="label_43">
@ -724,7 +721,7 @@
<rect> <rect>
<x>280</x> <x>280</x>
<y>40</y> <y>40</y>
<width>31</width> <width>41</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -737,7 +734,7 @@
<rect> <rect>
<x>340</x> <x>340</x>
<y>40</y> <y>40</y>
<width>31</width> <width>41</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -1165,6 +1162,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_5"> <widget class="QCheckBox" name="checkBox_enable_5">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1178,6 +1178,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_5"> <widget class="QLineEdit" name="lineEdit_end_5">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1188,6 +1191,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_5"> <widget class="QLineEdit" name="lineEdit_start_5">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1198,6 +1204,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_6"> <widget class="QCheckBox" name="checkBox_enable_6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1211,6 +1220,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_6"> <widget class="QLineEdit" name="lineEdit_end_6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1221,6 +1233,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_6"> <widget class="QLineEdit" name="lineEdit_start_6">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1231,6 +1246,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_7"> <widget class="QCheckBox" name="checkBox_enable_7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1244,6 +1262,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_7"> <widget class="QLineEdit" name="lineEdit_end_7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1254,6 +1275,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_7"> <widget class="QLineEdit" name="lineEdit_start_7">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1264,6 +1288,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_8"> <widget class="QCheckBox" name="checkBox_enable_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1277,6 +1304,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_8"> <widget class="QLineEdit" name="lineEdit_end_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1287,6 +1317,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_8"> <widget class="QLineEdit" name="lineEdit_start_8">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1297,6 +1330,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_9"> <widget class="QCheckBox" name="checkBox_enable_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1310,6 +1346,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_9"> <widget class="QLineEdit" name="lineEdit_end_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1320,6 +1359,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_9"> <widget class="QLineEdit" name="lineEdit_start_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>
@ -1330,6 +1372,9 @@
</property> </property>
</widget> </widget>
<widget class="QCheckBox" name="checkBox_enable_10"> <widget class="QCheckBox" name="checkBox_enable_10">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>50</x> <x>50</x>
@ -1343,6 +1388,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_end_10"> <widget class="QLineEdit" name="lineEdit_end_10">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>300</x> <x>300</x>
@ -1353,6 +1401,9 @@
</property> </property>
</widget> </widget>
<widget class="QLineEdit" name="lineEdit_start_10"> <widget class="QLineEdit" name="lineEdit_start_10">
<property name="enabled">
<bool>false</bool>
</property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>150</x> <x>150</x>

62
radial_vibration.ui
View File

@ -23,7 +23,7 @@
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>1</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>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_8"> <widget class="QWidget" name="tab_8">
<attribute name="title"> <attribute name="title">
@ -563,27 +563,25 @@
<rect> <rect>
<x>90</x> <x>90</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string> 等级 <string>等级</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_41"> <widget class="QLabel" name="label_41">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>170</x> <x>160</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>回差 <string>回差</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_42"> <widget class="QLabel" name="label_42">
@ -591,13 +589,12 @@
<rect> <rect>
<x>230</x> <x>230</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>延时 <string>延时</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_43"> <widget class="QLabel" name="label_43">
@ -605,7 +602,7 @@
<rect> <rect>
<x>280</x> <x>280</x>
<y>40</y> <y>40</y>
<width>31</width> <width>51</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -618,7 +615,7 @@
<rect> <rect>
<x>340</x> <x>340</x>
<y>40</y> <y>40</y>
<width>31</width> <width>41</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -897,7 +894,7 @@
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_10"> <widget class="QWidget" name="tab_10">
<attribute name="title"> <attribute name="title">
@ -908,8 +905,8 @@
<rect> <rect>
<x>210</x> <x>210</x>
<y>150</y> <y>150</y>
<width>54</width> <width>91</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -921,8 +918,8 @@
<rect> <rect>
<x>210</x> <x>210</x>
<y>50</y> <y>50</y>
<width>54</width> <width>71</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -934,8 +931,8 @@
<rect> <rect>
<x>210</x> <x>210</x>
<y>100</y> <y>100</y>
<width>54</width> <width>91</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -1160,27 +1157,25 @@
<rect> <rect>
<x>90</x> <x>90</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string> 等级 <string>等级</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_52"> <widget class="QLabel" name="label_52">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>170</x> <x>160</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>回差 <string>回差</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_53"> <widget class="QLabel" name="label_53">
@ -1188,13 +1183,12 @@
<rect> <rect>
<x>230</x> <x>230</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>延时 <string>延时</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_54"> <widget class="QLabel" name="label_54">
@ -1202,7 +1196,7 @@
<rect> <rect>
<x>280</x> <x>280</x>
<y>40</y> <y>40</y>
<width>31</width> <width>51</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -1215,7 +1209,7 @@
<rect> <rect>
<x>340</x> <x>340</x>
<y>40</y> <y>40</y>
<width>31</width> <width>51</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -1486,7 +1480,7 @@
<rect> <rect>
<x>21</x> <x>21</x>
<y>10</y> <y>10</y>
<width>105</width> <width>141</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>

28
seismic_monitor.cpp
View File

@ -474,3 +474,31 @@ void Seismic_monitor::DisableKeyphase4(){
ui->comboBox_keyphase_ch_4->setEnabled(false); ui->comboBox_keyphase_ch_4->setEnabled(false);
ui->comboBox_keyphase_slot_4->setEnabled(false); ui->comboBox_keyphase_slot_4->setEnabled(false);
} }
void Seismic_monitor::on_comboBox_sensitivity_unit_1_currentTextChanged(const QString &arg1)
{
QString str = QString("信号灵敏度(mV/%1)").arg(arg1);
ui->label_signal_sensitivity_1->setText(str);
}
void Seismic_monitor::on_comboBox_sensitivity_unit_2_currentTextChanged(const QString &arg1)
{
QString str = QString("信号灵敏度(mV/%1)").arg(arg1);
ui->label_signal_sensitivity_2->setText(str);
}
void Seismic_monitor::on_comboBox_sensitivity_unit_3_currentTextChanged(const QString &arg1)
{
QString str = QString("信号灵敏度(mV/%1)").arg(arg1);
ui->label_signal_sensitivity_3->setText(str);
}
void Seismic_monitor::on_comboBox_sensitivity_unit_4_currentTextChanged(const QString &arg1)
{
QString str = QString("信号灵敏度(mV/%1)").arg(arg1);
ui->label_signal_sensitivity_4->setText(str);
}

10
seismic_monitor.h
View File

@ -49,7 +49,15 @@ class Seismic_monitor : public QWidget {
void on_comboBox_transducer_name_4_currentTextChanged(const QString &arg1); void on_comboBox_transducer_name_4_currentTextChanged(const QString &arg1);
private: void on_comboBox_sensitivity_unit_1_currentTextChanged(const QString &arg1);
void on_comboBox_sensitivity_unit_2_currentTextChanged(const QString &arg1);
void on_comboBox_sensitivity_unit_3_currentTextChanged(const QString &arg1);
void on_comboBox_sensitivity_unit_4_currentTextChanged(const QString &arg1);
private:
Ui::Seismic_monitor *ui; Ui::Seismic_monitor *ui;
void UpdateData(std::shared_ptr<VibrationData> vib_data); void UpdateData(std::shared_ptr<VibrationData> vib_data);
int card_type; int card_type;

64
seismic_monitor.ui
View File

@ -280,7 +280,7 @@
<widget class="QGroupBox" name="groupBox_6"> <widget class="QGroupBox" name="groupBox_6">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>200</x> <x>220</x>
<y>380</y> <y>380</y>
<width>120</width> <width>120</width>
<height>81</height> <height>81</height>
@ -324,7 +324,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>50</y> <y>50</y>
<width>311</width> <width>341</width>
<height>321</height> <height>321</height>
</rect> </rect>
</property> </property>
@ -366,32 +366,32 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>轴振</string> <string>轴振传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>加速度</string> <string>加速度传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>速度</string> <string>速度传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>轴位移</string> <string>轴位移传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>压力脉动</string> <string>压力脉动传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>DC</string> <string>DC传感器</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -507,7 +507,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_13"> <widget class="QLabel" name="label_signal_sensitivity_1">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
@ -804,32 +804,32 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>轴振</string> <string>轴振传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>加速度</string> <string>加速度传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>速度</string> <string>速度传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>轴位移</string> <string>轴位移传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>压力脉动</string> <string>压力脉动传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>DC</string> <string>DC传感器</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -945,7 +945,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_26"> <widget class="QLabel" name="label_signal_sensitivity_2">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
@ -1306,7 +1306,7 @@
<widget class="QWidget" name="layoutWidget_4"> <widget class="QWidget" name="layoutWidget_4">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>140</x> <x>150</x>
<y>390</y> <y>390</y>
<width>52</width> <width>52</width>
<height>75</height> <height>75</height>
@ -1458,7 +1458,7 @@
<rect> <rect>
<x>10</x> <x>10</x>
<y>50</y> <y>50</y>
<width>321</width> <width>331</width>
<height>321</height> <height>321</height>
</rect> </rect>
</property> </property>
@ -1500,32 +1500,32 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>轴振</string> <string>轴振传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>加速度</string> <string>加速度传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>速度</string> <string>速度传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>轴位移</string> <string>轴位移传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>压力脉动</string> <string>压力脉动传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>DC</string> <string>DC传感器</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -1641,7 +1641,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_28"> <widget class="QLabel" name="label_signal_sensitivity_3">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>
@ -1938,32 +1938,32 @@
</property> </property>
<item> <item>
<property name="text"> <property name="text">
<string>轴振</string> <string>轴振传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>加速度</string> <string>加速度传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>速度</string> <string>速度传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>轴位移</string> <string>轴位移传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>压力脉动</string> <string>压力脉动传感器</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>DC</string> <string>DC传感器</string>
</property> </property>
</item> </item>
</widget> </widget>
@ -2079,7 +2079,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLabel" name="label_29"> <widget class="QLabel" name="label_signal_sensitivity_4">
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>90</width> <width>90</width>

58
singlerelay.cpp
View File

@ -112,17 +112,29 @@ void SingleRelay::Init(){
qDebug() << "i" << i; qDebug() << "i" << i;
std::shared_ptr<VibrationData> ptr = std::dynamic_pointer_cast<VibrationData>(cardbase_ptr); std::shared_ptr<VibrationData> ptr = std::dynamic_pointer_cast<VibrationData>(cardbase_ptr);
for (int var = 0; var < CHANNEL_COUNT; ++var) { for (int var = 0; var < CHANNEL_COUNT; ++var) {
std::shared_ptr<VariableBase> variable_base = ptr->GetChannelPtr(var + 1);
QString item_data,item_str; QString item_data,item_str;
if(ptr->alert_danger[var].direct_enable || if(variable_base->alert_high.enable){
ptr->alert_danger[var].x1_ampl_enable || item_str = QString("%1 (槽位 %2 通道 %3 警报高)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2));
ptr->alert_danger[var].x2_ampl_enable){ item_data = QString("%1A2").arg(ptr->base_config_[var].chan_id);
item_str = QString("%1 (槽位 %2 通道 %3 警报)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2)); }
channelNameMap[item_data] = item_str;
if(variable_base->danger_high.enable){
item_str = QString("%1 (槽位 %2 通道 %3 危险高)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2));
item_data = QString("%1A1").arg(ptr->base_config_[var].chan_id); item_data = QString("%1A1").arg(ptr->base_config_[var].chan_id);
} }
channelNameMap[item_data] = item_str; channelNameMap[item_data] = item_str;
if(ptr->alert_danger[var].danger_enable){ if(variable_base->alert_low.enable){
item_str = QString("%1 (槽位 %2 通道 %3 危险)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2)); item_str = QString("%1 (槽位 %2 通道 %3 警报低)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2));
item_data = QString("%1A2").arg(ptr->base_config_[var].chan_id); item_data = QString("%1A3").arg(ptr->base_config_[var].chan_id);
}
channelNameMap[item_data] = item_str;
if(variable_base->danger_low.enable){
item_str = QString("%1 (槽位 %2 通道 %3 危险低)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2));
item_data = QString("%1A4").arg(ptr->base_config_[var].chan_id);
}
if(var == 3){
qDebug() << "alert" << variable_base->danger_high.enable<<variable_base->danger_high.enable;
} }
channelNameMap[item_data] = item_str; channelNameMap[item_data] = item_str;
item_str = QString("%1 (槽位 %2 通道 %3 非OK)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2)); item_str = QString("%1 (槽位 %2 通道 %3 非OK)").arg(ptr->base_config_[var].point_name).arg(ptr->base_config_[var].chan_id.mid(1,2)).arg(ptr->base_config_[var].chan_id.mid(4,2));
@ -162,24 +174,35 @@ void SingleRelay::OnButtonGroup(QAbstractButton *slot_btn) {
for(int var = 0; var < CHANNEL_COUNT ; ++var){ for(int var = 0; var < CHANNEL_COUNT ; ++var){
std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id); std::shared_ptr<CardBase> base_ptr = ConfigMgr::Instance()->GetSlotPtr(button_id);
std::shared_ptr<VariableBase> variable_base = ptr->GetChannelPtr(var + 1);
if(base_ptr->card_type_ == kCardVibSingle){ if(base_ptr->card_type_ == kCardVibSingle){
QString item_data; QString item_data;
if(ptr->base_config_[var].standby && (var % 2)) if(variable_base->alert_high.enable){
continue; QString item_str = QString("%1 (槽位 %3 通道 %4 警报高)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
if(ptr->alert_danger[var].direct_enable || QListWidgetItem *item = new QListWidgetItem(item_str);
ptr->alert_danger[var].x1_ampl_enable || item_data = QString("S%1C%2A2").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
ptr->alert_danger[var].x2_ampl_enable){ item->setData(Qt::UserRole, item_data);
QString item_str = QString("%1 (槽位 %3 通道 %4 警报)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); list_widget_available->addItem(item);
}
if(variable_base->danger_high.enable){
QString item_str = QString("%1 (槽位 %3 通道 %4 危险高)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
QListWidgetItem *item = new QListWidgetItem(item_str); QListWidgetItem *item = new QListWidgetItem(item_str);
item_data = QString("S%1C%2A1").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); item_data = QString("S%1C%2A1").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
item->setData(Qt::UserRole, item_data); item->setData(Qt::UserRole, item_data);
list_widget_available->addItem(item); list_widget_available->addItem(item);
} }
if(variable_base->danger_low.enable){
if(ptr->alert_danger[var].danger_enable){ QString item_str = QString("%1 (槽位 %3 通道 %4 危险低)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
QString item_str = QString("%1 (槽位 %3 通道 %4 危险)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
QListWidgetItem *item = new QListWidgetItem(item_str); QListWidgetItem *item = new QListWidgetItem(item_str);
item_data = QString("S%1C%2A2").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0')); item_data = QString("S%1C%2A4").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
item->setData(Qt::UserRole, item_data);
list_widget_available->addItem(item);
}
if(variable_base->alert_low.enable){
QString item_str = QString("%1 (槽位 %3 通道 %4 警报低)").arg(ptr->base_config_[var].point_name).arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
QListWidgetItem *item = new QListWidgetItem(item_str);
item_data = QString("S%1C%2A3").arg(QString::number(button_id, 10).rightJustified(2, '0')).arg(QString::number(var+1, 10).rightJustified(2, '0'));
item->setData(Qt::UserRole, item_data); item->setData(Qt::UserRole, item_data);
list_widget_available->addItem(item); list_widget_available->addItem(item);
} }
@ -425,6 +448,7 @@ ExprValidationResult SingleRelay::validateLogicExpression(const QString& expr) {
void SingleRelay::setExpressionToTreeView(QTreeView* treeView, const QString& expr) { void SingleRelay::setExpressionToTreeView(QTreeView* treeView, const QString& expr) {
int pos = 0; int pos = 0;
model_Relay->clear(); model_Relay->clear();
qDebug() << "expr" << expr;
ExprNode* root = parseExpression(expr, pos); ExprNode* root = parseExpression(expr, pos);
QStandardItem* rootItem = buildItemTree(root); QStandardItem* rootItem = buildItemTree(root);

27
trust.ui
View File

@ -298,8 +298,8 @@
<rect> <rect>
<x>230</x> <x>230</x>
<y>50</y> <y>50</y>
<width>54</width> <width>81</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -311,8 +311,8 @@
<rect> <rect>
<x>230</x> <x>230</x>
<y>100</y> <y>100</y>
<width>54</width> <width>81</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -481,8 +481,8 @@
<rect> <rect>
<x>230</x> <x>230</x>
<y>150</y> <y>150</y>
<width>54</width> <width>81</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -613,8 +613,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string> 等级 <string>等级</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_41"> <widget class="QLabel" name="label_41">
@ -627,8 +626,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>回差 <string>回差</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_42"> <widget class="QLabel" name="label_42">
@ -641,8 +639,7 @@
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>延时 <string>延时</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_43"> <widget class="QLabel" name="label_43">
@ -650,7 +647,7 @@
<rect> <rect>
<x>280</x> <x>280</x>
<y>40</y> <y>40</y>
<width>31</width> <width>51</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -663,7 +660,7 @@
<rect> <rect>
<x>340</x> <x>340</x>
<y>40</y> <y>40</y>
<width>31</width> <width>51</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -904,7 +901,7 @@
<rect> <rect>
<x>21</x> <x>21</x>
<y>10</y> <y>10</y>
<width>105</width> <width>131</width>
<height>17</height> <height>17</height>
</rect> </rect>
</property> </property>

35
velocity.ui
View File

@ -300,7 +300,7 @@
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tab_8"> <widget class="QWidget" name="tab_8">
<attribute name="title"> <attribute name="title">
@ -311,8 +311,8 @@
<rect> <rect>
<x>220</x> <x>220</x>
<y>150</y> <y>150</y>
<width>54</width> <width>61</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -381,8 +381,8 @@
<rect> <rect>
<x>220</x> <x>220</x>
<y>50</y> <y>50</y>
<width>54</width> <width>71</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -461,8 +461,8 @@
<rect> <rect>
<x>220</x> <x>220</x>
<y>100</y> <y>100</y>
<width>54</width> <width>71</width>
<height>12</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -563,27 +563,25 @@
<rect> <rect>
<x>90</x> <x>90</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string> 等级 <string>等级</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_41"> <widget class="QLabel" name="label_41">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>170</x> <x>160</x>
<y>30</y> <y>30</y>
<width>31</width> <width>41</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>回差 <string>回差</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_42"> <widget class="QLabel" name="label_42">
@ -591,13 +589,12 @@
<rect> <rect>
<x>230</x> <x>230</x>
<y>30</y> <y>30</y>
<width>31</width> <width>51</width>
<height>31</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>延时 <string>延时</string>
(um)</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_43"> <widget class="QLabel" name="label_43">
@ -605,7 +602,7 @@
<rect> <rect>
<x>280</x> <x>280</x>
<y>40</y> <y>40</y>
<width>31</width> <width>41</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>
@ -618,7 +615,7 @@
<rect> <rect>
<x>340</x> <x>340</x>
<y>40</y> <y>40</y>
<width>31</width> <width>41</width>
<height>16</height> <height>16</height>
</rect> </rect>
</property> </property>