From 091d3c7be71b8184200d0c36bf6f209487630e2a Mon Sep 17 00:00:00 2001 From: zhangsheng Date: Thu, 15 Jan 2026 20:02:12 +0800 Subject: [PATCH] fix iepe config bugs --- mainwindow.cpp | 2 +- seismic_monitor.cpp | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 6bcdf46..876708d 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -116,7 +116,7 @@ MainWindow::MainWindow(QWidget *parent) //qInstallMessageHandler(messageHandler); #endif QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy"); - QString Version = "V1.0_" + buildDate.toString("yyyyMMdd") + "_e658"; + QString Version = "V1.0_" + buildDate.toString("yyyyMMdd") + "_ef10"; ui->label_version->setText(Version); } diff --git a/seismic_monitor.cpp b/seismic_monitor.cpp index 624f4b2..68f0506 100644 --- a/seismic_monitor.cpp +++ b/seismic_monitor.cpp @@ -28,6 +28,10 @@ Seismic_monitor::Seismic_monitor(int slot,CardType cardtype, QWidget *parent) : ui->comboBox_chan_type_2->setView(new QListView()); ui->comboBox_chan_type_3->setView(new QListView()); ui->comboBox_chan_type_4->setView(new QListView()); + ui->comboBox_power_supply_1->setView(new QListView()); + ui->comboBox_power_supply_2->setView(new QListView()); + ui->comboBox_power_supply_3->setView(new QListView()); + ui->comboBox_power_supply_4->setView(new QListView()); slot_no = slot; card_type = cardtype; @@ -227,9 +231,9 @@ void Seismic_monitor::UpdateData(std::shared_ptr vib_data,int sav vib_data->base_config_[var].channel_type = ui->comboBox_chan_type_2->currentIndex(); vib_data->base_config_[var].sensitivity_unit = SetUnit(ui->comboBox_sensitivity_unit_2->currentText()); vib_data->base_config_[var].signal_sensitivity = ui->lineEdit_signal_sensitivity_2->text().toFloat(); - if(ui->comboBox_power_supply_1->currentIndex() == 0) + if(ui->comboBox_power_supply_2->currentIndex() == 0) vib_data->base_config_[var].power = true; - else if(ui->comboBox_power_supply_1->currentIndex() == 1) + else if(ui->comboBox_power_supply_2->currentIndex() == 1) vib_data->base_config_[var].power = false; vib_data->base_config_[var].normal_voltage_low = ui->doubleSpinBox_low_2->value(); vib_data->base_config_[var].normal_voltage_high = ui->doubleSpinBox_high_2->value(); @@ -249,9 +253,9 @@ void Seismic_monitor::UpdateData(std::shared_ptr vib_data,int sav vib_data->base_config_[var].channel_type = ui->comboBox_chan_type_3->currentIndex(); vib_data->base_config_[var].sensitivity_unit = SetUnit(ui->comboBox_sensitivity_unit_3->currentText()); vib_data->base_config_[var].signal_sensitivity = ui->lineEdit_signal_sensitivity_3->text().toFloat(); - if(ui->comboBox_power_supply_1->currentIndex() == 0) + if(ui->comboBox_power_supply_3->currentIndex() == 0) vib_data->base_config_[var].power = true; - else if(ui->comboBox_power_supply_1->currentIndex() == 1) + else if(ui->comboBox_power_supply_3->currentIndex() == 1) vib_data->base_config_[var].power = false; vib_data->base_config_[var].normal_voltage_low = ui->doubleSpinBox_low_3->value(); vib_data->base_config_[var].normal_voltage_high = ui->doubleSpinBox_high_3->value(); @@ -272,9 +276,9 @@ void Seismic_monitor::UpdateData(std::shared_ptr vib_data,int sav vib_data->base_config_[var].channel_type = ui->comboBox_chan_type_4->currentIndex(); vib_data->base_config_[var].sensitivity_unit = SetUnit(ui->comboBox_sensitivity_unit_4->currentText()); vib_data->base_config_[var].signal_sensitivity = ui->lineEdit_signal_sensitivity_4->text().toFloat(); - if(ui->comboBox_power_supply_1->currentIndex() == 0) + if(ui->comboBox_power_supply_4->currentIndex() == 0) vib_data->base_config_[var].power = true; - else if(ui->comboBox_power_supply_1->currentIndex() == 1) + else if(ui->comboBox_power_supply_4->currentIndex() == 1) vib_data->base_config_[var].power = false; vib_data->base_config_[var].normal_voltage_low = ui->doubleSpinBox_low_4->value(); vib_data->base_config_[var].normal_voltage_high = ui->doubleSpinBox_high_4->value();