modify vib template file

This commit is contained in:
SHENG-PC\admin 2026-01-15 22:10:12 +08:00
parent 091d3c7be7
commit a5a7eb8464
2 changed files with 12 additions and 31 deletions

View File

@ -20,13 +20,13 @@
"filter": [ "filter": [
{ {
"checked": false, "checked": false,
"high": 0, "high": 3000,
"low": 0 "low": 30
}, },
{ {
"checked": false, "checked": false,
"high": 500, "high": 3000,
"low": 5 "low": 3
}, },
{ {
"checked": false, "checked": false,
@ -94,13 +94,13 @@
"filter": [ "filter": [
{ {
"checked": false, "checked": false,
"high": 0, "high": 3000,
"low": 0 "low": 30
}, },
{ {
"checked": true, "checked": true,
"high": 500, "high": 3000,
"low": 5 "low": 3
}, },
{ {
"checked": false, "checked": false,
@ -168,8 +168,8 @@
"filter": [ "filter": [
{ {
"checked": false, "checked": false,
"high": 0, "high": 3000,
"low": 0 "low": 30
}, },
{ {
"checked": false, "checked": false,
@ -223,8 +223,8 @@
"filter": [ "filter": [
{ {
"checked": false, "checked": false,
"high": 0, "high": 3000,
"low": 0 "low": 30
}, },
{ {
"checked": false, "checked": false,

View File

@ -198,11 +198,6 @@ void Seismic_monitor::UpdateData(std::shared_ptr<VibrationData> vib_data,int sav
std::shared_ptr<VibrationData> ptr = std::dynamic_pointer_cast<VibrationData>(base_ptr); std::shared_ptr<VibrationData> ptr = std::dynamic_pointer_cast<VibrationData>(base_ptr);
for (int var = 0; var < CHANNEL_COUNT; ++var) { for (int var = 0; var < CHANNEL_COUNT; ++var) {
if (var + 1 == 1) { if (var + 1 == 1) {
std::shared_ptr<VariableBase> base_channel_ptr = ptr->GetChannelPtr(var + 1);
if(base_channel_ptr == nullptr && save == 1){
QMessageBox::information(this, QStringLiteral("提示"), "通道1未配置完整");
return;
}
vib_data->base_config_[var].standby = ui->checkBox_standby_1->isChecked(); vib_data->base_config_[var].standby = ui->checkBox_standby_1->isChecked();
vib_data->base_config_[var].active = ui->checkBox_enable_1->isChecked(); vib_data->base_config_[var].active = ui->checkBox_enable_1->isChecked();
vib_data->base_config_[var].rack_type = 0; vib_data->base_config_[var].rack_type = 0;
@ -221,10 +216,6 @@ void Seismic_monitor::UpdateData(std::shared_ptr<VibrationData> vib_data,int sav
vib_data->base_config_[var].keyphase_ch = ui->comboBox_keyphase_ch->currentText().toInt(); vib_data->base_config_[var].keyphase_ch = ui->comboBox_keyphase_ch->currentText().toInt();
} else if (var + 1 == 2) { } else if (var + 1 == 2) {
std::shared_ptr<VariableBase> base_channel_ptr = ptr->GetChannelPtr(var + 1); std::shared_ptr<VariableBase> base_channel_ptr = ptr->GetChannelPtr(var + 1);
if(base_channel_ptr == nullptr && save == 1){
QMessageBox::information(this, QStringLiteral("提示"), "通道2未配置完整");
return;
}
vib_data->base_config_[var].standby = ui->checkBox_standby_1->isChecked(); vib_data->base_config_[var].standby = ui->checkBox_standby_1->isChecked();
vib_data->base_config_[var].active = ui->checkBox_enable_2->isChecked(); vib_data->base_config_[var].active = ui->checkBox_enable_2->isChecked();
vib_data->base_config_[var].rack_type = 0; vib_data->base_config_[var].rack_type = 0;
@ -242,11 +233,6 @@ void Seismic_monitor::UpdateData(std::shared_ptr<VibrationData> vib_data,int sav
vib_data->base_config_[var].keyphase_slot = ui->comboBox_keyphase_slot_2->currentText().toInt(); vib_data->base_config_[var].keyphase_slot = ui->comboBox_keyphase_slot_2->currentText().toInt();
vib_data->base_config_[var].keyphase_ch = ui->comboBox_keyphase_ch_2->currentText().toInt(); vib_data->base_config_[var].keyphase_ch = ui->comboBox_keyphase_ch_2->currentText().toInt();
} else if (var + 1 == 3) { } else if (var + 1 == 3) {
std::shared_ptr<VariableBase> base_channel_ptr = ptr->GetChannelPtr(var + 1);
if(base_channel_ptr == nullptr && save == 1){
QMessageBox::information(this, QStringLiteral("提示"), "通道3未配置完整");
return;
}
vib_data->base_config_[var].standby = ui->checkBox_standby_2->isChecked(); vib_data->base_config_[var].standby = ui->checkBox_standby_2->isChecked();
vib_data->base_config_[var].active = ui->checkBox_enable_3->isChecked(); vib_data->base_config_[var].active = ui->checkBox_enable_3->isChecked();
vib_data->base_config_[var].rack_type = 0; vib_data->base_config_[var].rack_type = 0;
@ -265,11 +251,6 @@ void Seismic_monitor::UpdateData(std::shared_ptr<VibrationData> vib_data,int sav
vib_data->base_config_[var].keyphase_slot = ui->comboBox_keyphase_slot_3->currentText().toInt(); vib_data->base_config_[var].keyphase_slot = ui->comboBox_keyphase_slot_3->currentText().toInt();
vib_data->base_config_[var].keyphase_ch = ui->comboBox_keyphase_ch_3->currentText().toInt(); vib_data->base_config_[var].keyphase_ch = ui->comboBox_keyphase_ch_3->currentText().toInt();
} else if (var + 1 == 4) { } else if (var + 1 == 4) {
std::shared_ptr<VariableBase> base_channel_ptr = ptr->GetChannelPtr(var + 1);
if(base_channel_ptr == nullptr && save == 1){
QMessageBox::information(this, QStringLiteral("提示"), "通道4未配置完整");
return;
}
vib_data->base_config_[var].standby = ui->checkBox_standby_2->isChecked(); vib_data->base_config_[var].standby = ui->checkBox_standby_2->isChecked();
vib_data->base_config_[var].active = ui->checkBox_enable_4->isChecked(); vib_data->base_config_[var].active = ui->checkBox_enable_4->isChecked();
vib_data->base_config_[var].rack_type = 0; vib_data->base_config_[var].rack_type = 0;