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

enable acc and pre freband,add 2 config params

Browse Source
This commit is contained in:
DESKTOP-7I8SUIC\zhang 2025-12-25 11:04:48 +08:00
parent 18741a9f22
commit b62d3a4773
7 changed files with 318 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
acceleration.cpp
View File

@ -25,6 +25,8 @@ Acceleration::Acceleration(int slot_no_, int channel_, bool active, QWidget *par
} else {
ui->label_active->setText("（停用）");
}
ui->comboBox_fre_domain_resolution->setCurrentIndex(2);
ui->comboBox_lines_number->setCurrentIndex(2);
Init();
}
@ -92,7 +94,9 @@ void Acceleration::Init() {
ui->checkBox_alert_low_enable->setChecked(variable_ptr->alert_low.enable);
ui->checkBox_alert_low_latch->setChecked(variable_ptr->alert_low.latch);
//
// freband output
ui->comboBox_fre_domain_resolution->setCurrentText(QString::number( variable_ptr->freband_output_item.fre_domain_resolution));
ui->comboBox_lines_number->setCurrentText(QString::number( variable_ptr->freband_output_item.lines_number));
ui->checkBox_enable->setChecked(variable_ptr->freband_output[0].enable);
ui->lineEdit_start->setText(QString::number(variable_ptr->freband_output[0].start));
ui->lineEdit_end->setText(QString::number(variable_ptr->freband_output[0].end));
@ -189,6 +193,8 @@ void Acceleration::on_pushButton_confirm_clicked() {
variable->alert_low.enable = ui->checkBox_alert_low_enable->isChecked();
variable->alert_low.latch = ui->checkBox_alert_low_latch->isChecked();
// -freband output
variable->freband_output_item.fre_domain_resolution = ui->comboBox_fre_domain_resolution->currentText().toFloat();
variable->freband_output_item.lines_number = ui->comboBox_lines_number->currentText().toInt();
variable->freband_output[0].enable = ui->checkBox_enable->isChecked();
variable->freband_output[0].start = ui->lineEdit_start->text().toDouble();
variable->freband_output[0].end = ui->lineEdit_end->text().toDouble();
@ -263,6 +269,8 @@ void Acceleration::on_pushButton_confirm_clicked() {
variable->alert_low.enable = ui->checkBox_alert_low_enable->isChecked();
variable->alert_low.latch = ui->checkBox_alert_low_latch->isChecked();
// -freband output
variable->freband_output_item.fre_domain_resolution = ui->comboBox_fre_domain_resolution->currentText().toFloat();
variable->freband_output_item.lines_number = ui->comboBox_lines_number->currentText().toInt();
variable->freband_output[0].enable = ui->checkBox_enable->isChecked();
variable->freband_output[0].start = ui->lineEdit_start->text().toDouble();
variable->freband_output[0].end = ui->lineEdit_end->text().toDouble();

152
acceleration.ui
View File

@ -107,7 +107,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -1170,7 +1170,7 @@
<attribute name="title">
<string>分频段选择</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout_24">
<layout class="QHBoxLayout" name="horizontalLayout_26">
<item>
<layout class="QVBoxLayout" name="verticalLayout_15">
<item>
@ -1347,7 +1347,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_5">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1357,7 +1357,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_5">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1370,7 +1370,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_5">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1387,7 +1387,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_6">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1397,7 +1397,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_6">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1410,7 +1410,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_6">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1427,7 +1427,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_7">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1437,7 +1437,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_7">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1450,7 +1450,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_7">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1467,7 +1467,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_8">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1477,7 +1477,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_8">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1490,7 +1490,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_8">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1507,7 +1507,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_9">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1517,7 +1517,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_9">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1530,7 +1530,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_9">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1547,7 +1547,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_10">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1557,7 +1557,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_10">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1570,7 +1570,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_10">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1598,19 +1598,123 @@
</layout>
</item>
<item>
<spacer name="horizontalSpacer_8">
<layout class="QVBoxLayout" name="verticalLayout_16">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_25">
<item>
<widget class="QLabel" name="label_5">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>频域分辨率(Hz)：</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_fre_domain_resolution">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>2.5</string>
</property>
</item>
<item>
<property name="text">
<string>5</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_24">
<item>
<widget class="QLabel" name="label_6">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>线数：</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_lines_number">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>400</string>
</property>
</item>
<item>
<property name="text">
<string>800</string>
</property>
</item>
<item>
<property name="text">
<string>1600</string>
</property>
</item>
<item>
<property name="text">
<string>3200</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>231</width>
<height>20</height>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>

1
cardbase.h
View File

@ -39,6 +39,7 @@ class VariableBase {
AlarmAlertLow gap_alert_low;
FrequencybandOutput freband_output[10];
FrequencybandOutputItem freband_output_item;
};
// 位移

24
config_mgr.cpp
View File

@ -303,7 +303,7 @@ void ConfigMgr::Save(QString & file_path) {
alarm["alert_high_latch"] = pressure_ptr->alert_high.latch;
processed_output["general"] = general;
processed_output["alarm"] = alarm;
QJsonObject freband_output,number;
QJsonObject freband_output,number,item;
for (int var = 0; var < 10; ++var) {
if(pressure_ptr->freband_output[var].start != 0 || pressure_ptr->freband_output[var].end != 0){
freband_output["enable"] = pressure_ptr->freband_output[var].enable;
@ -312,6 +312,9 @@ void ConfigMgr::Save(QString & file_path) {
number[QString::number(var + 1)] = freband_output;
}
}
item["fre_domain_resolution"] = pressure_ptr->freband_output_item.fre_domain_resolution;
item["lines_number"] = pressure_ptr->freband_output_item.lines_number;
number["config_params"] = item;
variables["freband_output"] = number;
variables["processed_output"] = processed_output;
@ -367,7 +370,7 @@ void ConfigMgr::Save(QString & file_path) {
processed_output["general"] = general;
processed_output["alarm"] = alarm;
variables["processed_output"] = processed_output;
QJsonObject freband_output,number;
QJsonObject freband_output,number,item;
for (int var = 0; var < 10; ++var) {
if(av_ptr->freband_output[var].start != 0 || av_ptr->freband_output[var].end != 0){
freband_output["enable"] = av_ptr->freband_output[var].enable;
@ -376,6 +379,9 @@ void ConfigMgr::Save(QString & file_path) {
number[QString::number(var + 1)] = freband_output;
}
}
item["fre_domain_resolution"] = av_ptr->freband_output_item.fre_domain_resolution;
item["lines_number"] = av_ptr->freband_output_item.lines_number;
number["config_params"] = item;
variables["freband_output"] = number;
}else if(ptr->base_config_[cid].channel_type == kVibVelocity){
@ -925,7 +931,7 @@ void ConfigMgr::Load(QString filename) {
// variable->alert_low.enable = alarm["alert_low_enable"].toBool();
// variable->alert_low.latch = alarm["alert_low_latch"].toBool();
QJsonObject freband_output_obj = tmp_variable["freband_output"].toObject();
QJsonObject number_obj;
QJsonObject number_obj,config_params;
for (int k = 0; k < 10; ++k) {
number_obj = freband_output_obj[QString::number(k + 1)].toObject();
if(number_obj.isEmpty())
@ -936,6 +942,11 @@ void ConfigMgr::Load(QString filename) {
output.end = number_obj["end"].toInt();
variable->freband_output[k] = output;
}
config_params = freband_output_obj["config_params"].toObject();
if(!config_params.isEmpty()){
variable->freband_output_item.fre_domain_resolution = config_params["fre_domain_resolution"].toDouble();
variable->freband_output_item.lines_number = config_params["lines_number"].toInt();
}
vib_data->variables_.push_back(variable);
break;
}
@ -1019,7 +1030,7 @@ void ConfigMgr::Load(QString filename) {
// variable->alert_low.enable = alarm["alert_low_enable"].toBool();
// variable->alert_low.latch = alarm["alert_low_latch"].toBool();
QJsonObject freband_output_obj = tmp_variable["freband_output"].toObject();
QJsonObject number_obj;
QJsonObject number_obj,config_params;
for (int k = 0; k < 10; ++k) {
number_obj = freband_output_obj[QString::number(k + 1)].toObject();
if(number_obj.isEmpty())
@ -1030,6 +1041,11 @@ void ConfigMgr::Load(QString filename) {
output.end = number_obj["end"].toInt();
variable->freband_output[k] = output;
}
config_params = freband_output_obj["config_params"].toObject();
if(!config_params.isEmpty()){
variable->freband_output_item.fre_domain_resolution = config_params["fre_domain_resolution"].toDouble();
variable->freband_output_item.lines_number = config_params["lines_number"].toInt();
}
vib_data->variables_.push_back(variable);
break;
}

9
data_config.h
View File

@ -334,6 +334,15 @@ typedef struct FrequencybandOutput_{
}
}FrequencybandOutput ;
typedef struct FrequencybandOutputItem_ {
float fre_domain_resolution;
int lines_number;
FrequencybandOutputItem_(){
fre_domain_resolution = 2.5;
lines_number = 1600;
}
}FrequencybandOutputItem;
typedef struct DCOutput_{
int output_channel;
float minmum;

10
pressure_pulsation.cpp
View File

@ -25,6 +25,8 @@ PressurePulsation::PressurePulsation(int slot_no_, int channel_, bool active,QWi
} else {
ui->label_active->setText("（停用）");
}
ui->comboBox_fre_domain_resolution->setCurrentIndex(2);
ui->comboBox_lines_number->setCurrentIndex(2);
Init();
}
@ -91,7 +93,9 @@ void PressurePulsation::Init() {
ui->checkBox_alert_low_enable->setChecked(variable_ptr->alert_low.enable);
ui->checkBox_alert_low_latch->setChecked(variable_ptr->alert_low.latch);
//
// freband output
ui->comboBox_fre_domain_resolution->setCurrentText(QString::number( variable_ptr->freband_output_item.fre_domain_resolution));
ui->comboBox_lines_number->setCurrentText(QString::number( variable_ptr->freband_output_item.lines_number));
ui->checkBox_enable->setChecked(variable_ptr->freband_output[0].enable);
ui->lineEdit_start->setText(QString::number(variable_ptr->freband_output[0].start));
ui->lineEdit_end->setText(QString::number(variable_ptr->freband_output[0].end));
@ -190,6 +194,8 @@ void PressurePulsation::on_pushButton_confirm_clicked()
variable->alert_low.enable = ui->checkBox_alert_low_enable->isChecked();
variable->alert_low.latch = ui->checkBox_alert_low_latch->isChecked();
// -freband output
variable->freband_output_item.fre_domain_resolution = ui->comboBox_fre_domain_resolution->currentText().toFloat();
variable->freband_output_item.lines_number = ui->comboBox_lines_number->currentText().toInt();
variable->freband_output[0].enable = ui->checkBox_enable->isChecked();
variable->freband_output[0].start = ui->lineEdit_start->text().toDouble();
variable->freband_output[0].end = ui->lineEdit_end->text().toDouble();
@ -264,6 +270,8 @@ void PressurePulsation::on_pushButton_confirm_clicked()
variable->alert_low.enable = ui->checkBox_alert_low_enable->isChecked();
variable->alert_low.latch = ui->checkBox_alert_low_latch->isChecked();
// -freband output
variable->freband_output_item.fre_domain_resolution = ui->comboBox_fre_domain_resolution->currentText().toFloat();
variable->freband_output_item.lines_number = ui->comboBox_lines_number->currentText().toInt();
variable->freband_output[0].enable = ui->checkBox_enable->isChecked();
variable->freband_output[0].start = ui->lineEdit_start->text().toDouble();
variable->freband_output[0].end = ui->lineEdit_end->text().toDouble();

152
pressure_pulsation.ui
View File

@ -98,7 +98,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
<number>2</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@ -1177,7 +1177,7 @@
<attribute name="title">
<string>分频段选择</string>
</attribute>
<layout class="QHBoxLayout" name="horizontalLayout">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<layout class="QVBoxLayout" name="verticalLayout_15">
<item>
@ -1354,7 +1354,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_5">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1364,7 +1364,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_5">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1377,7 +1377,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_5">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1394,7 +1394,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_6">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1404,7 +1404,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_6">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1417,7 +1417,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_6">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1434,7 +1434,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_7">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1444,7 +1444,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_7">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1457,7 +1457,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_7">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1474,7 +1474,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_8">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1484,7 +1484,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_8">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1497,7 +1497,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_8">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1514,7 +1514,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_9">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1524,7 +1524,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_9">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1537,7 +1537,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_9">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1554,7 +1554,7 @@
<item>
<widget class="QCheckBox" name="checkBox_enable_10">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="text">
<string>使能</string>
@ -1564,7 +1564,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_start_10">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1577,7 +1577,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_end_10">
<property name="enabled">
<bool>false</bool>
<bool>true</bool>
</property>
<property name="minimumSize">
<size>
@ -1605,19 +1605,123 @@
</layout>
</item>
<item>
<spacer name="horizontalSpacer_8">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="label">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>频域分辨率(Hz)：</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_fre_domain_resolution">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>2.5</string>
</property>
</item>
<item>
<property name="text">
<string>5</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label_6">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>线数：</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="comboBox_lines_number">
<property name="minimumSize">
<size>
<width>125</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>400</string>
</property>
</item>
<item>
<property name="text">
<string>800</string>
</property>
</item>
<item>
<property name="text">
<string>1600</string>
</property>
</item>
<item>
<property name="text">
<string>3200</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>247</width>
<height>20</height>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>