From a5a7eb84649908acc2729afddef0633836ee95b7 Mon Sep 17 00:00:00 2001 From: "SHENG-PC\\admin" Date: Thu, 15 Jan 2026 22:10:12 +0800 Subject: [PATCH] modify vib template file --- config/template_vib.json | 24 ++++++++++++------------ seismic_monitor.cpp | 19 ------------------- 2 files changed, 12 insertions(+), 31 deletions(-) diff --git a/config/template_vib.json b/config/template_vib.json index 7e1d48f..5182ae7 100644 --- a/config/template_vib.json +++ b/config/template_vib.json @@ -20,13 +20,13 @@ "filter": [ { "checked": false, - "high": 0, - "low": 0 + "high": 3000, + "low": 30 }, { "checked": false, - "high": 500, - "low": 5 + "high": 3000, + "low": 3 }, { "checked": false, @@ -94,13 +94,13 @@ "filter": [ { "checked": false, - "high": 0, - "low": 0 + "high": 3000, + "low": 30 }, { "checked": true, - "high": 500, - "low": 5 + "high": 3000, + "low": 3 }, { "checked": false, @@ -168,8 +168,8 @@ "filter": [ { "checked": false, - "high": 0, - "low": 0 + "high": 3000, + "low": 30 }, { "checked": false, @@ -223,8 +223,8 @@ "filter": [ { "checked": false, - "high": 0, - "low": 0 + "high": 3000, + "low": 30 }, { "checked": false, diff --git a/seismic_monitor.cpp b/seismic_monitor.cpp index 68f0506..640f2c7 100644 --- a/seismic_monitor.cpp +++ b/seismic_monitor.cpp @@ -198,11 +198,6 @@ void Seismic_monitor::UpdateData(std::shared_ptr vib_data,int sav std::shared_ptr ptr = std::dynamic_pointer_cast(base_ptr); for (int var = 0; var < CHANNEL_COUNT; ++var) { if (var + 1 == 1) { - std::shared_ptr 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].active = ui->checkBox_enable_1->isChecked(); vib_data->base_config_[var].rack_type = 0; @@ -221,10 +216,6 @@ void Seismic_monitor::UpdateData(std::shared_ptr vib_data,int sav vib_data->base_config_[var].keyphase_ch = ui->comboBox_keyphase_ch->currentText().toInt(); } else if (var + 1 == 2) { std::shared_ptr 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].active = ui->checkBox_enable_2->isChecked(); vib_data->base_config_[var].rack_type = 0; @@ -242,11 +233,6 @@ void Seismic_monitor::UpdateData(std::shared_ptr vib_data,int sav 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(); } else if (var + 1 == 3) { - std::shared_ptr 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].active = ui->checkBox_enable_3->isChecked(); vib_data->base_config_[var].rack_type = 0; @@ -265,11 +251,6 @@ void Seismic_monitor::UpdateData(std::shared_ptr vib_data,int sav 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(); } else if (var + 1 == 4) { - std::shared_ptr 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].active = ui->checkBox_enable_4->isChecked(); vib_data->base_config_[var].rack_type = 0;