diff --git a/config_mgr.cpp b/config_mgr.cpp
index a8b6ba1..32f0025 100644
--- a/config_mgr.cpp
+++ b/config_mgr.cpp
@@ -246,12 +246,10 @@ void ConfigMgr::Save(QString & file_path) {
sampling["sample_rate"] = pressure_ptr->sample_rate;
sampling["band_width"] = pressure_ptr->bandwidth;
sampling["fft_points"] = pressure_ptr->fft_points;
- sampling["spectral_synchron"] = pressure_ptr->spectral_synchron;
scaling["measuring_min"] = pressure_ptr->measuring_min;
scaling["measuring_max"] = pressure_ptr->measuring_max;
scaling["scale_min"] = pressure_ptr->scale_min;
scaling["scale_max"] = pressure_ptr->scale_max;
- scaling["inherited"] = pressure_ptr->inherited;
variables["sampling"] = sampling;
variables["scaling"] = scaling;
@@ -619,12 +617,10 @@ void ConfigMgr::Load(QString filename) {
variable->sample_rate = sampling["sample_rate"].toInt();
variable->bandwidth = sampling["band_width"].toInt();
variable->fft_points = sampling["fft_points"].toInt();
- variable->spectral_synchron = sampling["spectral_synchron"].toBool();
variable->measuring_min = scaling["measuring_min"].toInt();
variable->measuring_max = scaling["measuring_max"].toInt();
variable->scale_min = scaling["scale_min"].toInt();
variable->scale_max = scaling["scale_max"].toInt();
- variable->inherited = scaling["inherited"].toBool();
vib_data->variables_.push_back(variable);
break;
}
diff --git a/pressure_pulsation.cpp b/pressure_pulsation.cpp
index b675df3..7f685a1 100644
--- a/pressure_pulsation.cpp
+++ b/pressure_pulsation.cpp
@@ -62,12 +62,10 @@ void PressurePulsation::Init() {
ui->lineEdit_sample_rate->setText(QString::number(variable_ptr->sample_rate));
ui->lineEdit_bandwidth->setText(QString::number(variable_ptr->bandwidth));
ui->comboBox_fft_points->setCurrentText(QString::number(variable_ptr->fft_points));
- ui->checkBox_spectral->setCheckable(variable_ptr->spectral_synchron);
ui->lineEdit_measuring_value_min->setText(QString::number(variable_ptr->measuring_min));
ui->lineEdit_measuring_value_max->setText(QString::number(variable_ptr->measuring_max));
ui->lineEdit_scale_value_min->setText(QString::number(variable_ptr->scale_min));
ui->lineEdit_scale_value_max->setText(QString::number(variable_ptr->scale_max));
- ui->checkBox_inherited->setCheckable(variable_ptr->inherited);
}
void PressurePulsation::on_pushButton_confirm_clicked()
{
@@ -101,7 +99,6 @@ void PressurePulsation::on_pushButton_confirm_clicked()
variable->sample_rate = ui->lineEdit_sample_rate->text().toUInt();
variable->bandwidth = ui->lineEdit_bandwidth->text().toInt();
variable->fft_points = ui->comboBox_fft_points->currentText().toInt();
- variable->spectral_synchron = ui->checkBox_inherited->checkState();
variable->measuring_min = ui->lineEdit_measuring_value_min->text().toInt();
variable->measuring_max = ui->lineEdit_measuring_value_max->text().toInt();
variable->scale_min = ui->lineEdit_scale_value_min->text().toInt();
@@ -125,7 +122,6 @@ void PressurePulsation::on_pushButton_confirm_clicked()
variable->sample_rate = ui->lineEdit_sample_rate->text().toUInt();
variable->bandwidth = ui->lineEdit_bandwidth->text().toInt();
variable->fft_points = ui->comboBox_fft_points->currentText().toInt();
- variable->spectral_synchron = ui->checkBox_inherited->checkState();
variable->measuring_min = ui->lineEdit_measuring_value_min->text().toInt();
variable->measuring_max = ui->lineEdit_measuring_value_max->text().toInt();
variable->scale_min = ui->lineEdit_scale_value_min->text().toInt();
diff --git a/pressure_pulsation.ui b/pressure_pulsation.ui
index 3508192..c196bd0 100644
--- a/pressure_pulsation.ui
+++ b/pressure_pulsation.ui
@@ -615,19 +615,6 @@
-
-
-
- 170
- 70
- 141
- 16
-
-
-
- 光谱同步时间值
-
-
@@ -785,19 +772,6 @@
mV
-
-
-
- 360
- 50
- 71
- 16
-
-
-
- 继承
-
-