modify code
This commit is contained in:
parent
8e2df6d291
commit
a1d2b53084
@ -246,12 +246,10 @@ void ConfigMgr::Save(QString & file_path) {
|
|||||||
sampling["sample_rate"] = pressure_ptr->sample_rate;
|
sampling["sample_rate"] = pressure_ptr->sample_rate;
|
||||||
sampling["band_width"] = pressure_ptr->bandwidth;
|
sampling["band_width"] = pressure_ptr->bandwidth;
|
||||||
sampling["fft_points"] = pressure_ptr->fft_points;
|
sampling["fft_points"] = pressure_ptr->fft_points;
|
||||||
sampling["spectral_synchron"] = pressure_ptr->spectral_synchron;
|
|
||||||
scaling["measuring_min"] = pressure_ptr->measuring_min;
|
scaling["measuring_min"] = pressure_ptr->measuring_min;
|
||||||
scaling["measuring_max"] = pressure_ptr->measuring_max;
|
scaling["measuring_max"] = pressure_ptr->measuring_max;
|
||||||
scaling["scale_min"] = pressure_ptr->scale_min;
|
scaling["scale_min"] = pressure_ptr->scale_min;
|
||||||
scaling["scale_max"] = pressure_ptr->scale_max;
|
scaling["scale_max"] = pressure_ptr->scale_max;
|
||||||
scaling["inherited"] = pressure_ptr->inherited;
|
|
||||||
variables["sampling"] = sampling;
|
variables["sampling"] = sampling;
|
||||||
variables["scaling"] = scaling;
|
variables["scaling"] = scaling;
|
||||||
|
|
||||||
@ -619,12 +617,10 @@ void ConfigMgr::Load(QString filename) {
|
|||||||
variable->sample_rate = sampling["sample_rate"].toInt();
|
variable->sample_rate = sampling["sample_rate"].toInt();
|
||||||
variable->bandwidth = sampling["band_width"].toInt();
|
variable->bandwidth = sampling["band_width"].toInt();
|
||||||
variable->fft_points = sampling["fft_points"].toInt();
|
variable->fft_points = sampling["fft_points"].toInt();
|
||||||
variable->spectral_synchron = sampling["spectral_synchron"].toBool();
|
|
||||||
variable->measuring_min = scaling["measuring_min"].toInt();
|
variable->measuring_min = scaling["measuring_min"].toInt();
|
||||||
variable->measuring_max = scaling["measuring_max"].toInt();
|
variable->measuring_max = scaling["measuring_max"].toInt();
|
||||||
variable->scale_min = scaling["scale_min"].toInt();
|
variable->scale_min = scaling["scale_min"].toInt();
|
||||||
variable->scale_max = scaling["scale_max"].toInt();
|
variable->scale_max = scaling["scale_max"].toInt();
|
||||||
variable->inherited = scaling["inherited"].toBool();
|
|
||||||
vib_data->variables_.push_back(variable);
|
vib_data->variables_.push_back(variable);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -62,12 +62,10 @@ void PressurePulsation::Init() {
|
|||||||
ui->lineEdit_sample_rate->setText(QString::number(variable_ptr->sample_rate));
|
ui->lineEdit_sample_rate->setText(QString::number(variable_ptr->sample_rate));
|
||||||
ui->lineEdit_bandwidth->setText(QString::number(variable_ptr->bandwidth));
|
ui->lineEdit_bandwidth->setText(QString::number(variable_ptr->bandwidth));
|
||||||
ui->comboBox_fft_points->setCurrentText(QString::number(variable_ptr->fft_points));
|
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_min->setText(QString::number(variable_ptr->measuring_min));
|
||||||
ui->lineEdit_measuring_value_max->setText(QString::number(variable_ptr->measuring_max));
|
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_min->setText(QString::number(variable_ptr->scale_min));
|
||||||
ui->lineEdit_scale_value_max->setText(QString::number(variable_ptr->scale_max));
|
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()
|
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->sample_rate = ui->lineEdit_sample_rate->text().toUInt();
|
||||||
variable->bandwidth = ui->lineEdit_bandwidth->text().toInt();
|
variable->bandwidth = ui->lineEdit_bandwidth->text().toInt();
|
||||||
variable->fft_points = ui->comboBox_fft_points->currentText().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_min = ui->lineEdit_measuring_value_min->text().toInt();
|
||||||
variable->measuring_max = ui->lineEdit_measuring_value_max->text().toInt();
|
variable->measuring_max = ui->lineEdit_measuring_value_max->text().toInt();
|
||||||
variable->scale_min = ui->lineEdit_scale_value_min->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->sample_rate = ui->lineEdit_sample_rate->text().toUInt();
|
||||||
variable->bandwidth = ui->lineEdit_bandwidth->text().toInt();
|
variable->bandwidth = ui->lineEdit_bandwidth->text().toInt();
|
||||||
variable->fft_points = ui->comboBox_fft_points->currentText().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_min = ui->lineEdit_measuring_value_min->text().toInt();
|
||||||
variable->measuring_max = ui->lineEdit_measuring_value_max->text().toInt();
|
variable->measuring_max = ui->lineEdit_measuring_value_max->text().toInt();
|
||||||
variable->scale_min = ui->lineEdit_scale_value_min->text().toInt();
|
variable->scale_min = ui->lineEdit_scale_value_min->text().toInt();
|
||||||
|
@ -615,19 +615,6 @@
|
|||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QCheckBox" name="checkBox_spectral">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>170</x>
|
|
||||||
<y>70</y>
|
|
||||||
<width>141</width>
|
|
||||||
<height>16</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>光谱同步时间值</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QGroupBox" name="groupBox_3">
|
<widget class="QGroupBox" name="groupBox_3">
|
||||||
<property name="geometry">
|
<property name="geometry">
|
||||||
@ -785,19 +772,6 @@
|
|||||||
<string>mV</string>
|
<string>mV</string>
|
||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QCheckBox" name="checkBox_inherited">
|
|
||||||
<property name="geometry">
|
|
||||||
<rect>
|
|
||||||
<x>360</x>
|
|
||||||
<y>50</y>
|
|
||||||
<width>71</width>
|
|
||||||
<height>16</height>
|
|
||||||
</rect>
|
|
||||||
</property>
|
|
||||||
<property name="text">
|
|
||||||
<string>继承</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
</widget>
|
</widget>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user