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

modify pressure_p config bugs

Browse Source
This commit is contained in:
DESKTOP-7I8SUIC\zhang 2025-12-17 20:18:53 +08:00
parent 9328c2caad
commit 66a38280b8
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config_mgr.cpp
View File

@ -223,6 +223,7 @@ void ConfigMgr::Save(QString & file_path) {
QJsonObject gap,gap_general,gap_alarm; QJsonObject gap,gap_general,gap_alarm;
gap_general["output_used"] = thrust_ptr->gap_general.output_used; gap_general["output_used"] = thrust_ptr->gap_general.output_used;
gap_general["engieneering_unit"] = thrust_ptr->gap_general.engineering_unit; 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_level"] = thrust_ptr->gap_danger_high.level;
gap_alarm["danger_high_hysteresis"] = thrust_ptr->gap_danger_high.hysteresis; 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["sampling"] = sampling;
variables["scaling"] = scaling; variables["scaling"] = scaling;
QJsonObject general; QJsonObject general;
general["output_used"] = pressure_ptr->general.output_used;
general["engieneering_unit"] = pressure_ptr->general.engineering_unit; general["engieneering_unit"] = pressure_ptr->general.engineering_unit;
general["rectifier_function"] = pressure_ptr->general.rectifier_function;
variables["general"] = general; variables["general"] = general;
QJsonObject freband_output,number; QJsonObject freband_output,number;
for (int var = 0; var < 10; ++var) { for (int var = 0; var < 10; ++var) {

30
pressure_pulsation.ui
View File

@ -484,6 +484,36 @@
<string>mm</string> <string>mm</string>
</property> </property>
</item> </item>
<item>
<property name="text">
<string>mils</string>
</property>
</item>
<item>
<property name="text">
<string>inch/s**2</string>
</property>
</item>
<item>
<property name="text">
<string>mbar</string>
</property>
</item>
<item>
<property name="text">
<string>bar</string>
</property>
</item>
<item>
<property name="text">
<string>psi</string>
</property>
</item>
<item>
<property name="text">
<string>pa</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item> <item>

2
seismic_monitor.cpp
View File

@ -135,7 +135,7 @@ void Seismic_monitor::Init() {
ui->doubleSpinBox_high_4->setValue(vib_data->base_config_[i].normal_voltage_high); ui->doubleSpinBox_high_4->setValue(vib_data->base_config_[i].normal_voltage_high);
}else if (i + 1 == 5) { }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){ 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].fisrt_channel_angle = ui->lineEdit_first_1->text().toFloat();
vib_data->base_config_[i].second_channel_angle = ui->lineEdit_second_1->text().toFloat(); vib_data->base_config_[i].second_channel_angle = ui->lineEdit_second_1->text().toFloat();