modify config json
This commit is contained in:
parent
b62d3a4773
commit
ef1dfff301
@ -314,9 +314,8 @@ void ConfigMgr::Save(QString & file_path) {
|
|||||||
}
|
}
|
||||||
item["fre_domain_resolution"] = pressure_ptr->freband_output_item.fre_domain_resolution;
|
item["fre_domain_resolution"] = pressure_ptr->freband_output_item.fre_domain_resolution;
|
||||||
item["lines_number"] = pressure_ptr->freband_output_item.lines_number;
|
item["lines_number"] = pressure_ptr->freband_output_item.lines_number;
|
||||||
number["config_params"] = item;
|
|
||||||
variables["freband_output"] = number;
|
|
||||||
variables["processed_output"] = processed_output;
|
variables["processed_output"] = processed_output;
|
||||||
|
variables["config_params"] = item;
|
||||||
|
|
||||||
} else if(ptr->base_config_[cid].channel_type == kVibAcc){
|
} else if(ptr->base_config_[cid].channel_type == kVibAcc){
|
||||||
std::shared_ptr<AccVelVariable> av_ptr = std::dynamic_pointer_cast<AccVelVariable>(base_channel_ptr);
|
std::shared_ptr<AccVelVariable> av_ptr = std::dynamic_pointer_cast<AccVelVariable>(base_channel_ptr);
|
||||||
@ -381,8 +380,8 @@ void ConfigMgr::Save(QString & file_path) {
|
|||||||
}
|
}
|
||||||
item["fre_domain_resolution"] = av_ptr->freband_output_item.fre_domain_resolution;
|
item["fre_domain_resolution"] = av_ptr->freband_output_item.fre_domain_resolution;
|
||||||
item["lines_number"] = av_ptr->freband_output_item.lines_number;
|
item["lines_number"] = av_ptr->freband_output_item.lines_number;
|
||||||
number["config_params"] = item;
|
|
||||||
variables["freband_output"] = number;
|
variables["freband_output"] = number;
|
||||||
|
variables["config_params"] = item;
|
||||||
|
|
||||||
}else if(ptr->base_config_[cid].channel_type == kVibVelocity){
|
}else if(ptr->base_config_[cid].channel_type == kVibVelocity){
|
||||||
std::shared_ptr<AccVelVariable> vel_ptr = std::dynamic_pointer_cast<AccVelVariable>(base_channel_ptr);
|
std::shared_ptr<AccVelVariable> vel_ptr = std::dynamic_pointer_cast<AccVelVariable>(base_channel_ptr);
|
||||||
@ -942,7 +941,7 @@ void ConfigMgr::Load(QString filename) {
|
|||||||
output.end = number_obj["end"].toInt();
|
output.end = number_obj["end"].toInt();
|
||||||
variable->freband_output[k] = output;
|
variable->freband_output[k] = output;
|
||||||
}
|
}
|
||||||
config_params = freband_output_obj["config_params"].toObject();
|
config_params = tmp_variable["config_params"].toObject();
|
||||||
if(!config_params.isEmpty()){
|
if(!config_params.isEmpty()){
|
||||||
variable->freband_output_item.fre_domain_resolution = config_params["fre_domain_resolution"].toDouble();
|
variable->freband_output_item.fre_domain_resolution = config_params["fre_domain_resolution"].toDouble();
|
||||||
variable->freband_output_item.lines_number = config_params["lines_number"].toInt();
|
variable->freband_output_item.lines_number = config_params["lines_number"].toInt();
|
||||||
@ -1041,7 +1040,7 @@ void ConfigMgr::Load(QString filename) {
|
|||||||
output.end = number_obj["end"].toInt();
|
output.end = number_obj["end"].toInt();
|
||||||
variable->freband_output[k] = output;
|
variable->freband_output[k] = output;
|
||||||
}
|
}
|
||||||
config_params = freband_output_obj["config_params"].toObject();
|
config_params = tmp_variable["config_params"].toObject();
|
||||||
if(!config_params.isEmpty()){
|
if(!config_params.isEmpty()){
|
||||||
variable->freband_output_item.fre_domain_resolution = config_params["fre_domain_resolution"].toDouble();
|
variable->freband_output_item.fre_domain_resolution = config_params["fre_domain_resolution"].toDouble();
|
||||||
variable->freband_output_item.lines_number = config_params["lines_number"].toInt();
|
variable->freband_output_item.lines_number = config_params["lines_number"].toInt();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user