diff --git a/radial_vibration.cpp b/radial_vibration.cpp index 4d4caab..30d3a3c 100644 --- a/radial_vibration.cpp +++ b/radial_vibration.cpp @@ -228,7 +228,7 @@ void Radial_vibration::on_pushButton_confirm_clicked() { ptr->RemoveChannel(channel); qDebug() << "channel type change"; } - std::shared_ptr variable = std::make_shared(); + std::shared_ptr variable = std::make_shared(); variable->id_ = channel; variable->type_ = kVibRadial; variable->filter_[0].checked = ui->checkBox_low_pass->isChecked(); @@ -258,6 +258,14 @@ void Radial_vibration::on_pushButton_confirm_clicked() { variable->recorder_out_.trip_multiply = ui->doubleSpinBox_trip_multiply->value(); variable->recorder_out_.comparision = ui->comboBox_comparision->currentIndex(); variable->recorder_out_.percentage = ui->spinBox_comparision_percentage->value(); + variable->not1x_.checked = ui->checkBox_not_1x_ampl->isChecked(); + variable->not1x_.full_scale_range = ui->comboBox_not_1x_ampl->currentIndex(); + variable->not1x_.clamp_value = ui->doubleSpinBox_1x_ampl_clamp->value(); + variable->not1x_.custom = 0; // TODO: + variable->smax_.checked = ui->checkBox_smax_ampl->isChecked(); + variable->smax_.full_scale_range = ui->comboBox_smax_range->currentIndex(); + variable->smax_.clamp_value = ui->doubleSpinBox_smax_clamp->value(); + variable->smax_.custom = 0; // TODO: variable->delay_.alert = ui->spinBox_alert->value(); variable->delay_.danger = ui->doubleSpinBox_danger->value(); variable->delay_.active_100ms = ui->checkBox_100ms->isChecked(); @@ -266,7 +274,7 @@ void Radial_vibration::on_pushButton_confirm_clicked() { ptr->variables_.push_back(variable); return; } - std::shared_ptr variable = std::dynamic_pointer_cast(variable_base); + std::shared_ptr variable = std::dynamic_pointer_cast(variable_base); variable->filter_[0].checked = ui->checkBox_low_pass->isChecked(); variable->filter_[0].low = ui->spinBox_low_pass_low->value(); variable->filter_[0].high = ui->spinBox_low_pass_high->value(); @@ -294,6 +302,14 @@ void Radial_vibration::on_pushButton_confirm_clicked() { variable->recorder_out_.trip_multiply = ui->doubleSpinBox_trip_multiply->value(); variable->recorder_out_.comparision = ui->comboBox_comparision->currentIndex(); variable->recorder_out_.percentage = ui->spinBox_comparision_percentage->value(); + variable->not1x_.checked = ui->checkBox_not_1x_ampl->isChecked(); + variable->not1x_.full_scale_range = ui->comboBox_not_1x_ampl->currentIndex(); + variable->not1x_.clamp_value = ui->doubleSpinBox_1x_ampl_clamp->value(); + variable->not1x_.custom = 0; // TODO: + variable->smax_.checked = ui->checkBox_smax_ampl->isChecked(); + variable->smax_.full_scale_range = ui->comboBox_smax_range->currentIndex(); + variable->smax_.clamp_value = ui->doubleSpinBox_smax_clamp->value(); + variable->smax_.custom = 0; // TODO: variable->delay_.alert = ui->spinBox_alert->value(); variable->delay_.danger = ui->doubleSpinBox_danger->value(); variable->delay_.active_100ms = ui->checkBox_100ms->isChecked();