modify scale factor from lineedit to double spin box.

This commit is contained in:
pandx 2025-03-29 10:20:29 +08:00
parent 653d994f9c
commit 50901aefed
3 changed files with 1487 additions and 1511 deletions

View File

@ -60,7 +60,7 @@ typedef struct {
QString tmr_group; QString tmr_group;
int channel_type; // VibChannelType int channel_type; // VibChannelType
QString transducer_name; QString transducer_name;
QString scale_factor; float scale_factor;
int sampling_rate; // VibSamplingRate int sampling_rate; // VibSamplingRate
float normal_voltage_low; float normal_voltage_low;
float normal_voltage_high; float normal_voltage_high;

View File

@ -70,7 +70,7 @@ void Seismic_monitor::readJsonFile(const QString &filePath) {
seismic_monitor[i].tmr_group = temp_obj["tmr_group"].toString(); seismic_monitor[i].tmr_group = temp_obj["tmr_group"].toString();
seismic_monitor[i].channel_type = temp_obj["channel_type"].toInt(); seismic_monitor[i].channel_type = temp_obj["channel_type"].toInt();
seismic_monitor[i].transducer_name = temp_obj["transducer_name"].toString(); seismic_monitor[i].transducer_name = temp_obj["transducer_name"].toString();
seismic_monitor[i].scale_factor = temp_obj["scale_factor"].toString(); seismic_monitor[i].scale_factor = temp_obj["scale_factor"].toDouble();
seismic_monitor[i].sampling_rate = temp_obj["sample_rate"].toInt(); seismic_monitor[i].sampling_rate = temp_obj["sample_rate"].toInt();
QJsonArray voltage_range_array = temp_obj["normal_voltage_range"].toArray(); QJsonArray voltage_range_array = temp_obj["normal_voltage_range"].toArray();
seismic_monitor[i].normal_voltage_low = voltage_range_array[0].toDouble(); seismic_monitor[i].normal_voltage_low = voltage_range_array[0].toDouble();
@ -121,7 +121,7 @@ void Seismic_monitor::Init() {
// } // }
ui->comboBox_chan_type_1->setCurrentIndex(seismic_monitor[i].channel_type); ui->comboBox_chan_type_1->setCurrentIndex(seismic_monitor[i].channel_type);
//ui->comboBox_transducer_name_1->setText(seismic_monitor[i].transducer_name); //ui->comboBox_transducer_name_1->setText(seismic_monitor[i].transducer_name);
ui->lineEdit_scale_factor_1->setText(seismic_monitor[i].scale_factor); ui->doubleSpinBox_scale_factor_1->setValue(seismic_monitor[i].scale_factor);
ui->checkBox_enable_1->setCheckable(seismic_monitor[i].active); ui->checkBox_enable_1->setCheckable(seismic_monitor[i].active);
ui->doubleSpinBox_low_1->setValue(seismic_monitor[i].normal_voltage_low); ui->doubleSpinBox_low_1->setValue(seismic_monitor[i].normal_voltage_low);
ui->doubleSpinBox_high_1->setValue(seismic_monitor[i].normal_voltage_high); ui->doubleSpinBox_high_1->setValue(seismic_monitor[i].normal_voltage_high);
@ -140,7 +140,7 @@ void Seismic_monitor::Init() {
// } // }
ui->comboBox_chan_type_2->setCurrentIndex(seismic_monitor[i].channel_type); ui->comboBox_chan_type_2->setCurrentIndex(seismic_monitor[i].channel_type);
//ui->comboBox_transducer_name_2->setText(seismic_monitor[i].transducer_name); //ui->comboBox_transducer_name_2->setText(seismic_monitor[i].transducer_name);
ui->lineEdit_scale_factor_2->setText(seismic_monitor[i].scale_factor); ui->doubleSpinBox_scale_factor_2->setValue(seismic_monitor[i].scale_factor);
ui->checkBox_enable_2->setCheckable(seismic_monitor[i].active); ui->checkBox_enable_2->setCheckable(seismic_monitor[i].active);
ui->doubleSpinBox_low_2->setValue(seismic_monitor[i].normal_voltage_low); ui->doubleSpinBox_low_2->setValue(seismic_monitor[i].normal_voltage_low);
ui->doubleSpinBox_high_2->setValue(seismic_monitor[i].normal_voltage_high); ui->doubleSpinBox_high_2->setValue(seismic_monitor[i].normal_voltage_high);
@ -159,7 +159,7 @@ void Seismic_monitor::Init() {
// } // }
ui->comboBox_chan_type_3->setCurrentIndex(seismic_monitor[i].channel_type); ui->comboBox_chan_type_3->setCurrentIndex(seismic_monitor[i].channel_type);
//ui->lineEdit_transducer_name_3->setText(seismic_monitor[i].transducer_name); //ui->lineEdit_transducer_name_3->setText(seismic_monitor[i].transducer_name);
ui->lineEdit_scale_factor_3->setText(seismic_monitor[i].scale_factor); ui->doubleSpinBox_scale_factor_3->setValue(seismic_monitor[i].scale_factor);
ui->checkBox_enable_3->setCheckable(seismic_monitor[i].active); ui->checkBox_enable_3->setCheckable(seismic_monitor[i].active);
ui->doubleSpinBox_low_3->setValue(seismic_monitor[i].normal_voltage_low); ui->doubleSpinBox_low_3->setValue(seismic_monitor[i].normal_voltage_low);
ui->doubleSpinBox_high_3->setValue(seismic_monitor[i].normal_voltage_high); ui->doubleSpinBox_high_3->setValue(seismic_monitor[i].normal_voltage_high);
@ -178,7 +178,7 @@ void Seismic_monitor::Init() {
// } // }
ui->comboBox_chan_type_4->setCurrentIndex(seismic_monitor[i].channel_type); ui->comboBox_chan_type_4->setCurrentIndex(seismic_monitor[i].channel_type);
//ui->lineEdit_transducer_name_4->setText(seismic_monitor[i].transducer_name); //ui->lineEdit_transducer_name_4->setText(seismic_monitor[i].transducer_name);
ui->lineEdit_scale_factor_4->setText(seismic_monitor[i].scale_factor); ui->doubleSpinBox_scale_factor_4->setValue(seismic_monitor[i].scale_factor);
ui->checkBox_enable_4->setCheckable(seismic_monitor[i].active); ui->checkBox_enable_4->setCheckable(seismic_monitor[i].active);
ui->doubleSpinBox_low_4->setValue(seismic_monitor[i].normal_voltage_low); ui->doubleSpinBox_low_4->setValue(seismic_monitor[i].normal_voltage_low);
ui->doubleSpinBox_high_4->setValue(seismic_monitor[i].normal_voltage_high); ui->doubleSpinBox_high_4->setValue(seismic_monitor[i].normal_voltage_high);
@ -193,7 +193,7 @@ void Seismic_monitor::on_pushButton_confirm_clicked() {
for (int var = 0; var < CHANNLE_COUNT; ++var) { for (int var = 0; var < CHANNLE_COUNT; ++var) {
if (seismic_monitor[var].id == 1) { if (seismic_monitor[var].id == 1) {
seismic_monitor[var].transducer_name = ui->comboBox_transducer_name_1->currentText(); seismic_monitor[var].transducer_name = ui->comboBox_transducer_name_1->currentText();
seismic_monitor[var].scale_factor = ui->lineEdit_scale_factor_1->text(); seismic_monitor[var].scale_factor = ui->doubleSpinBox_scale_factor_1->value();
seismic_monitor[var].active = ui->checkBox_enable_1->isChecked(); seismic_monitor[var].active = ui->checkBox_enable_1->isChecked();
// if (ui->comboBox_sample_rate_1->currentText() == "32 k") { // if (ui->comboBox_sample_rate_1->currentText() == "32 k") {
// seismic_monitor[var].sample_rate = "32000"; // seismic_monitor[var].sample_rate = "32000";
@ -203,7 +203,7 @@ void Seismic_monitor::on_pushButton_confirm_clicked() {
seismic_monitor[var].normal_voltage_high = ui->doubleSpinBox_high_1->value(); seismic_monitor[var].normal_voltage_high = ui->doubleSpinBox_high_1->value();
} else if (seismic_monitor[var].id == 2) { } else if (seismic_monitor[var].id == 2) {
seismic_monitor[var].transducer_name = ui->comboBox_transducer_name_2->currentText(); seismic_monitor[var].transducer_name = ui->comboBox_transducer_name_2->currentText();
seismic_monitor[var].scale_factor = ui->lineEdit_scale_factor_2->text(); seismic_monitor[var].scale_factor = ui->doubleSpinBox_scale_factor_2->value();
seismic_monitor[var].active = ui->checkBox_enable_2->isChecked(); seismic_monitor[var].active = ui->checkBox_enable_2->isChecked();
// if (ui->comboBox_sample_rate_2->currentText() == "32 k") { // if (ui->comboBox_sample_rate_2->currentText() == "32 k") {
// seismic_monitor[var].sample_rate = "32000"; // seismic_monitor[var].sample_rate = "32000";
@ -213,7 +213,7 @@ void Seismic_monitor::on_pushButton_confirm_clicked() {
seismic_monitor[var].normal_voltage_high = ui->doubleSpinBox_high_2->value(); seismic_monitor[var].normal_voltage_high = ui->doubleSpinBox_high_2->value();
} else if (seismic_monitor[var].id == 3) { } else if (seismic_monitor[var].id == 3) {
seismic_monitor[var].transducer_name = ui->comboBox_transducer_name_3->currentText(); seismic_monitor[var].transducer_name = ui->comboBox_transducer_name_3->currentText();
seismic_monitor[var].scale_factor = ui->lineEdit_scale_factor_3->text(); seismic_monitor[var].scale_factor = ui->doubleSpinBox_scale_factor_3->value();
seismic_monitor[var].active = ui->checkBox_enable_3->isChecked(); seismic_monitor[var].active = ui->checkBox_enable_3->isChecked();
// if (ui->comboBox_sample_rate_3->currentText() == "32 k") { // if (ui->comboBox_sample_rate_3->currentText() == "32 k") {
// seismic_monitor[var].sample_rate = "32000"; // seismic_monitor[var].sample_rate = "32000";
@ -223,7 +223,7 @@ void Seismic_monitor::on_pushButton_confirm_clicked() {
seismic_monitor[var].normal_voltage_high = ui->doubleSpinBox_high_3->value(); seismic_monitor[var].normal_voltage_high = ui->doubleSpinBox_high_3->value();
} else if (seismic_monitor[var].id == 4) { } else if (seismic_monitor[var].id == 4) {
seismic_monitor[var].transducer_name = ui->comboBox_transducer_name_4->currentText(); seismic_monitor[var].transducer_name = ui->comboBox_transducer_name_4->currentText();
seismic_monitor[var].scale_factor = ui->lineEdit_scale_factor_3->text(); seismic_monitor[var].scale_factor = ui->doubleSpinBox_scale_factor_4->value();
seismic_monitor[var].active = ui->checkBox_enable_4->isChecked(); seismic_monitor[var].active = ui->checkBox_enable_4->isChecked();
// if (ui->comboBox_sample_rate_4->currentText() == "32 k") { // if (ui->comboBox_sample_rate_4->currentText() == "32 k") {
// seismic_monitor[var].sample_rate = "32000"; // seismic_monitor[var].sample_rate = "32000";
@ -400,7 +400,7 @@ void Seismic_monitor::on_pushButton_cancel_clicked() {
void Seismic_monitor::on_comboBox_transducer_name_1_currentTextChanged(const QString &arg1) { void Seismic_monitor::on_comboBox_transducer_name_1_currentTextChanged(const QString &arg1) {
for (int var = 0; var < vec_transducer.size(); ++var) { for (int var = 0; var < vec_transducer.size(); ++var) {
if (ui->comboBox_transducer_name_1->currentText() == vec_transducer[var].transducer_name) { if (ui->comboBox_transducer_name_1->currentText() == vec_transducer[var].transducer_name) {
ui->lineEdit_scale_factor_1->setText(QString::number(vec_transducer[var].scale_factor)); ui->doubleSpinBox_scale_factor_1->setValue(vec_transducer[var].scale_factor);
} }
} }
} }
@ -408,7 +408,7 @@ void Seismic_monitor::on_comboBox_transducer_name_1_currentTextChanged(const QSt
void Seismic_monitor::on_comboBox_transducer_name_2_currentTextChanged(const QString &arg1) { void Seismic_monitor::on_comboBox_transducer_name_2_currentTextChanged(const QString &arg1) {
for (int var = 0; var < vec_transducer.size(); ++var) { for (int var = 0; var < vec_transducer.size(); ++var) {
if (ui->comboBox_transducer_name_2->currentText() == vec_transducer[var].transducer_name) { if (ui->comboBox_transducer_name_2->currentText() == vec_transducer[var].transducer_name) {
ui->lineEdit_scale_factor_2->setText(QString::number(vec_transducer[var].scale_factor)); ui->doubleSpinBox_scale_factor_2->setValue(vec_transducer[var].scale_factor);
} }
} }
} }
@ -416,7 +416,7 @@ void Seismic_monitor::on_comboBox_transducer_name_2_currentTextChanged(const QSt
void Seismic_monitor::on_comboBox_transducer_name_3_currentTextChanged(const QString &arg1) { void Seismic_monitor::on_comboBox_transducer_name_3_currentTextChanged(const QString &arg1) {
for (int var = 0; var < vec_transducer.size(); ++var) { for (int var = 0; var < vec_transducer.size(); ++var) {
if (ui->comboBox_transducer_name_3->currentText() == vec_transducer[var].transducer_name) { if (ui->comboBox_transducer_name_3->currentText() == vec_transducer[var].transducer_name) {
ui->lineEdit_scale_factor_3->setText(QString::number(vec_transducer[var].scale_factor)); ui->doubleSpinBox_scale_factor_3->setValue(vec_transducer[var].scale_factor);
} }
} }
} }
@ -424,7 +424,7 @@ void Seismic_monitor::on_comboBox_transducer_name_3_currentTextChanged(const QSt
void Seismic_monitor::on_comboBox_transducer_name_4_currentTextChanged(const QString &arg1) { void Seismic_monitor::on_comboBox_transducer_name_4_currentTextChanged(const QString &arg1) {
for (int var = 0; var < vec_transducer.size(); ++var) { for (int var = 0; var < vec_transducer.size(); ++var) {
if (ui->comboBox_transducer_name_4->currentText() == vec_transducer[var].transducer_name) { if (ui->comboBox_transducer_name_4->currentText() == vec_transducer[var].transducer_name) {
ui->lineEdit_scale_factor_4->setText(QString::number(vec_transducer[var].scale_factor)); ui->doubleSpinBox_scale_factor_4->setValue(vec_transducer[var].scale_factor);
} }
} }
} }

File diff suppressed because it is too large Load Diff