juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix auto calib crash

Browse Source
This commit is contained in:
Noisyfox
2025-11-01 13:21:27 +08:00
parent 320d8e435e
commit f6a4ebe87c
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -818,19 +818,15 @@ void CalibUtils::set_for_auto_pa_model_and_config(const std::vector<CalibInfo> &
}); });
for (const CalibInfo &calib_info : calib_infos) { for (const CalibInfo &calib_info : calib_infos) {
int index = get_index_for_extruder_parameter(print_config, "outer_wall_speed", calib_info.extruder_id, calib_info.extruder_type, calib_info.nozzle_volume_type);
float wall_speed = CalibPressureAdvance::find_optimal_PA_speed(full_config, print_config.get_abs_value("line_width"), print_config.get_abs_value("layer_height"),
calib_info.extruder_id, 0);
ConfigOptionFloats *wall_speed_speed_opt = print_config.option<ConfigOptionFloats>("outer_wall_speed");
std::vector<double> new_speeds = wall_speed_speed_opt->values;
new_speeds[index] = wall_speed;
ModelObject* object = model.objects[calib_info.index]; ModelObject* object = model.objects[calib_info.index];
object->config.set_key_value("outer_wall_speed", new ConfigOptionFloats(new_speeds)); object->config.set_key_value("outer_wall_speed",
new ConfigOptionFloat(CalibPressureAdvance::find_optimal_PA_speed(
full_config, print_config.get_abs_value("line_width"),
print_config.get_abs_value("layer_height"), calib_info.extruder_id, 0)));
} }
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 ConfigOptionFloatOrPercent(nozzle_diameter * opt.second / 100, false));
} }
for (const auto opt : SuggestedConfigCalibPAPattern().int_pairs) { print_config.set_key_value(opt.first, new ConfigOptionInt(opt.second)); } for (const auto opt : SuggestedConfigCalibPAPattern().int_pairs) { print_config.set_key_value(opt.first, new ConfigOptionInt(opt.second)); }
@@ -1603,6 +1599,7 @@ bool CalibUtils::process_and_store_3mf(Model *model, const DynamicPrintConfig &f
Print *fff_print = dynamic_cast<Print *>(print); Print *fff_print = dynamic_cast<Print *>(print);
fff_print->set_calib_params(params); fff_print->set_calib_params(params);
fff_print->is_BBL_printer() = true;
//StringObjectException warning; //StringObjectException warning;
//auto err = print->validate(&warning); //auto err = print->validate(&warning);
@@ -1887,6 +1884,8 @@ void CalibUtils::send_to_print(const std::vector<CalibInfo> &calib_infos, wxStri
} }
} }
print_worker = std::make_unique<PlaterWorker<BoostThreadWorker>>(wxGetApp().plater(), std::move(process_bar), "calib_worker");
auto print_job = std::make_shared<PrintJob>(dev_id); auto print_job = std::make_shared<PrintJob>(dev_id);
print_job->m_dev_ip = obj_->get_dev_ip(); print_job->m_dev_ip = obj_->get_dev_ip();
print_job->m_ftp_folder = obj_->get_ftp_folder(); print_job->m_ftp_folder = obj_->get_ftp_folder();