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

fix iepe config bugs

Browse Source
This commit is contained in:
zhangsheng 2026-01-15 20:02:12 +08:00
parent ef103a92f3
commit 091d3c7be7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mainwindow.cpp
View File

@ -116,7 +116,7 @@ MainWindow::MainWindow(QWidget *parent)
//qInstallMessageHandler(messageHandler); //qInstallMessageHandler(messageHandler);
#endif #endif
QDate buildDate = QLocale( QLocale::English ).toDate( QString(__DATE__).replace(" ", " 0"), "MMM dd yyyy"); 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); ui->label_version->setText(Version);
} }

16
seismic_monitor.cpp
View File

@ -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_2->setView(new QListView());
ui->comboBox_chan_type_3->setView(new QListView()); ui->comboBox_chan_type_3->setView(new QListView());
ui->comboBox_chan_type_4->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; slot_no = slot;
card_type = cardtype; card_type = cardtype;
@ -227,9 +231,9 @@ void Seismic_monitor::UpdateData(std::shared_ptr<VibrationData> vib_data,int sav
vib_data->base_config_[var].channel_type = ui->comboBox_chan_type_2->currentIndex(); 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].sensitivity_unit = SetUnit(ui->comboBox_sensitivity_unit_2->currentText());
vib_data->base_config_[var].signal_sensitivity = ui->lineEdit_signal_sensitivity_2->text().toFloat(); 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; 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].power = false;
vib_data->base_config_[var].normal_voltage_low = ui->doubleSpinBox_low_2->value(); 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(); vib_data->base_config_[var].normal_voltage_high = ui->doubleSpinBox_high_2->value();
@ -249,9 +253,9 @@ void Seismic_monitor::UpdateData(std::shared_ptr<VibrationData> vib_data,int sav
vib_data->base_config_[var].channel_type = ui->comboBox_chan_type_3->currentIndex(); 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].sensitivity_unit = SetUnit(ui->comboBox_sensitivity_unit_3->currentText());
vib_data->base_config_[var].signal_sensitivity = ui->lineEdit_signal_sensitivity_3->text().toFloat(); 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; 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].power = false;
vib_data->base_config_[var].normal_voltage_low = ui->doubleSpinBox_low_3->value(); 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(); vib_data->base_config_[var].normal_voltage_high = ui->doubleSpinBox_high_3->value();
@ -272,9 +276,9 @@ void Seismic_monitor::UpdateData(std::shared_ptr<VibrationData> vib_data,int sav
vib_data->base_config_[var].channel_type = ui->comboBox_chan_type_4->currentIndex(); 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].sensitivity_unit = SetUnit(ui->comboBox_sensitivity_unit_4->currentText());
vib_data->base_config_[var].signal_sensitivity = ui->lineEdit_signal_sensitivity_4->text().toFloat(); 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; 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].power = false;
vib_data->base_config_[var].normal_voltage_low = ui->doubleSpinBox_low_4->value(); 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(); vib_data->base_config_[var].normal_voltage_high = ui->doubleSpinBox_high_4->value();