From 66a38280b80987ecbebf9d4cccaa4dc2c7ce079f Mon Sep 17 00:00:00 2001 From: "DESKTOP-7I8SUIC\\zhang" Date: Wed, 17 Dec 2025 20:18:53 +0800 Subject: [PATCH] modify pressure_p config bugs --- config_mgr.cpp | 4 ++++ pressure_pulsation.ui | 30 ++++++++++++++++++++++++++++++ seismic_monitor.cpp | 2 +- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/config_mgr.cpp b/config_mgr.cpp index cc1b72e..8607108 100644 --- a/config_mgr.cpp +++ b/config_mgr.cpp @@ -223,6 +223,7 @@ void ConfigMgr::Save(QString & file_path) { QJsonObject gap,gap_general,gap_alarm; gap_general["output_used"] = thrust_ptr->gap_general.output_used; gap_general["engieneering_unit"] = thrust_ptr->gap_general.engineering_unit; + gap_general["rectifier_function"] = thrust_ptr->gap_general.rectifier_function; gap_alarm["danger_high_level"] = thrust_ptr->gap_danger_high.level; gap_alarm["danger_high_hysteresis"] = thrust_ptr->gap_danger_high.hysteresis; @@ -286,7 +287,10 @@ void ConfigMgr::Save(QString & file_path) { variables["sampling"] = sampling; variables["scaling"] = scaling; QJsonObject general; + general["output_used"] = pressure_ptr->general.output_used; general["engieneering_unit"] = pressure_ptr->general.engineering_unit; + general["rectifier_function"] = pressure_ptr->general.rectifier_function; + variables["general"] = general; QJsonObject freband_output,number; for (int var = 0; var < 10; ++var) { diff --git a/pressure_pulsation.ui b/pressure_pulsation.ui index ffe6e47..0fe8108 100644 --- a/pressure_pulsation.ui +++ b/pressure_pulsation.ui @@ -484,6 +484,36 @@ mm + + + mils + + + + + inch/s**2 + + + + + mbar + + + + + bar + + + + + psi + + + + + pa + + diff --git a/seismic_monitor.cpp b/seismic_monitor.cpp index b8d11a0..344325e 100644 --- a/seismic_monitor.cpp +++ b/seismic_monitor.cpp @@ -135,7 +135,7 @@ void Seismic_monitor::Init() { ui->doubleSpinBox_high_4->setValue(vib_data->base_config_[i].normal_voltage_high); }else if (i + 1 == 5) { - vib_data->base_config_[var].function = ui->comboBox_function_1->currentIndex(); + vib_data->base_config_[i].function = ui->comboBox_function_1->currentIndex(); if(ui->comboBox_function_1->currentIndex() == 3){ vib_data->base_config_[i].fisrt_channel_angle = ui->lineEdit_first_1->text().toFloat(); vib_data->base_config_[i].second_channel_angle = ui->lineEdit_second_1->text().toFloat();