mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: crash when third flow and PA calibration 

jira: 8484
Change-Id: Ib4f1d4e38bd0d4af5a43777e2f077381b3887581
This commit is contained in:
zhimin.zeng 2024-10-21 10:39:17 +08:00 committed by lane.wei
parent e956106c15
commit 2a028aa010
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/Calib.hpp
View File

@ -256,7 +256,9 @@ private:
struct SuggestedConfigCalibPAPattern struct SuggestedConfigCalibPAPattern
{ {
const std::vector<std::pair<std::string, double>> float_pairs{{"initial_layer_print_height", 0.25}, {"layer_height", 0.2}, {"initial_layer_speed", 30}}; const std::vector<std::pair<std::string, double>> float_pairs{{"initial_layer_print_height", 0.25}, {"layer_height", 0.2}};
const std::vector<std::pair<std::string, std::vector<double>>> floats_pairs{{"initial_layer_speed", {30}}};
const std::vector<std::pair<std::string, double>> nozzle_ratio_pairs{{"line_width", 112.5}, {"initial_layer_line_width", 140}}; const std::vector<std::pair<std::string, double>> nozzle_ratio_pairs{{"line_width", 112.5}, {"initial_layer_line_width", 140}};

13
src/slic3r/GUI/Plater.cpp
View File

@ -10052,10 +10052,11 @@ void Plater::_calib_pa_pattern(const Calib_Params &params)
for (const auto opt : SuggestedConfigCalibPAPattern().float_pairs) { for (const auto opt : SuggestedConfigCalibPAPattern().float_pairs) {
print_config.set_key_value(opt.first, new ConfigOptionFloat(opt.second)); print_config.set_key_value(opt.first, new ConfigOptionFloat(opt.second));
} }
print_config.set_key_value("outer_wall_speed", for (const auto opt : SuggestedConfigCalibPAPattern().floats_pairs) {
new ConfigOptionFloat(CalibPressureAdvance::find_optimal_PA_speed( print_config.set_key_value(opt.first, new ConfigOptionFloatsNullable(opt.second));
wxGetApp().preset_bundle->full_config(), print_config.get_abs_value("line_width"), }
print_config.get_abs_value("layer_height"), 0, 0))); float wall_speed = CalibPressureAdvance::find_optimal_PA_speed(wxGetApp().preset_bundle->full_config(), print_config.get_abs_value("line_width"), print_config.get_abs_value("layer_height"), 0, 0);
print_config.set_key_value("outer_wall_speed", new ConfigOptionFloatsNullable({wall_speed}));
for (const auto opt : SuggestedConfigCalibPAPattern().nozzle_ratio_pairs) { for (const auto opt : SuggestedConfigCalibPAPattern().nozzle_ratio_pairs) {
print_config.set_key_value(opt.first, new ConfigOptionFloat(nozzle_diameter * opt.second / 100)); print_config.set_key_value(opt.first, new ConfigOptionFloat(nozzle_diameter * opt.second / 100));
@ -10216,8 +10217,8 @@ void Plater::calib_flowrate(int pass)
_obj->config.set_key_value("top_solid_infill_flow_ratio", new ConfigOptionFloat(1.0f)); _obj->config.set_key_value("top_solid_infill_flow_ratio", new ConfigOptionFloat(1.0f));
_obj->config.set_key_value("infill_direction", new ConfigOptionFloat(45)); _obj->config.set_key_value("infill_direction", new ConfigOptionFloat(45));
_obj->config.set_key_value("ironing_type", new ConfigOptionEnum<IroningType>(IroningType::NoIroning)); _obj->config.set_key_value("ironing_type", new ConfigOptionEnum<IroningType>(IroningType::NoIroning));
_obj->config.set_key_value("internal_solid_infill_speed", new ConfigOptionFloat(internal_solid_speed)); _obj->config.set_key_value("internal_solid_infill_speed", new ConfigOptionFloatsNullable({internal_solid_speed}));
_obj->config.set_key_value("top_surface_speed", new ConfigOptionFloat(top_surface_speed)); _obj->config.set_key_value("top_surface_speed", new ConfigOptionFloatsNullable({top_surface_speed}));
// extract flowrate from name, filename format: flowrate_xxx // extract flowrate from name, filename format: flowrate_xxx
std::string obj_name = _obj->name; std::string obj_name = _obj->name;

3
src/slic3r/Utils/CalibUtils.cpp
View File

@ -679,6 +679,9 @@ void CalibUtils::calib_pa_pattern(const CalibInfo &calib_info, Model& model)
for (const auto opt : SuggestedConfigCalibPAPattern().float_pairs) { for (const auto opt : SuggestedConfigCalibPAPattern().float_pairs) {
print_config.set_key_value(opt.first, new ConfigOptionFloat(opt.second)); print_config.set_key_value(opt.first, new ConfigOptionFloat(opt.second));
} }
for (const auto opt : SuggestedConfigCalibPAPattern().floats_pairs) {
print_config.set_key_value(opt.first, new ConfigOptionFloatsNullable(opt.second));
}
print_config.set_key_value("outer_wall_speed", print_config.set_key_value("outer_wall_speed",
new ConfigOptionFloat(CalibPressureAdvance::find_optimal_PA_speed( new ConfigOptionFloat(CalibPressureAdvance::find_optimal_PA_speed(