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

FIX: add filament id to filament_ids when send cali job

Browse Source 
jira: none
Change-Id: I6e3e8c38b67fe62442fa369f072fd1743f35f38f
(cherry picked from commit ec9193ffb06e12411b4e521c12d9e16f121f54d1)
This commit is contained in:
zhimin.zeng
2025-03-27 20:53:46 +08:00
committed by Noisyfox
parent ed5111add8
commit 5dd1bc9a81
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/slic3r/GUI/CalibrationWizard.cpp
View File

@@ -760,6 +760,8 @@ void PressureAdvanceWizard::on_cali_start()
Preset *preset = selected_filaments.begin()->second; Preset *preset = selected_filaments.begin()->second;
Preset * temp_filament_preset = new Preset(preset->type, preset->name + "_temp"); Preset * temp_filament_preset = new Preset(preset->type, preset->name + "_temp");
temp_filament_preset->config = preset->config; temp_filament_preset->config = preset->config;
if (preset->type == Preset::TYPE_FILAMENT)
temp_filament_preset->filament_id = preset->filament_id;
calib_info.bed_type = plate_type; calib_info.bed_type = plate_type;
calib_info.process_bar = preset_page->get_sending_progress_bar(); calib_info.process_bar = preset_page->get_sending_progress_bar();
@@ -1233,6 +1235,8 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, Flow
Preset* preset = selected_filaments.begin()->second; Preset* preset = selected_filaments.begin()->second;
temp_filament_preset = new Preset(preset->type, preset->name + "_temp"); temp_filament_preset = new Preset(preset->type, preset->name + "_temp");
temp_filament_preset->config = preset->config; temp_filament_preset->config = preset->config;
if (preset->type == Preset::TYPE_FILAMENT)
temp_filament_preset->filament_id = preset->filament_id;
calib_info.bed_type = plate_type; calib_info.bed_type = plate_type;
calib_info.printer_prest = preset_page->get_printer_preset(curr_obj, preset_page->get_nozzle_diameter(calib_info.extruder_id)); calib_info.printer_prest = preset_page->get_printer_preset(curr_obj, preset_page->get_nozzle_diameter(calib_info.extruder_id));

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

@@ -697,6 +697,8 @@ bool CalibUtils::calib_flowrate(int pass, const CalibInfo &calib_info, wxString
full_config.apply(filament_config); full_config.apply(filament_config);
full_config.apply(printer_config); full_config.apply(printer_config);
full_config.set_key_value("filament_ids", new ConfigOptionStrings({calib_info.filament_prest->filament_id}));
init_multi_extruder_params_for_cali(full_config, calib_info); init_multi_extruder_params_for_cali(full_config, calib_info);
Calib_Params params; Calib_Params params;
@@ -808,6 +810,8 @@ bool CalibUtils::calib_generic_PA(const CalibInfo &calib_info, wxString &error_m
full_config.apply(filament_config); full_config.apply(filament_config);
full_config.apply(printer_config); full_config.apply(printer_config);
full_config.set_key_value("filament_ids", new ConfigOptionStrings({calib_info.filament_prest->filament_id}));
init_multi_extruder_params_for_cali(full_config, calib_info); init_multi_extruder_params_for_cali(full_config, calib_info);
if (!process_and_store_3mf(&model, full_config, params, error_message)) if (!process_and_store_3mf(&model, full_config, params, error_message))