juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-27 10:51:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass model into generate_gcodes to improve consistency

Browse Source
This commit is contained in:
thewildmage
2023-07-10 18:14:55 -06:00
parent ecc3002ffd
commit b8728e7921
5 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/slic3r/GUI/Plater.cpp
+2 -5
View File
@@ -8135,7 +8135,6 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
PresetBundle* preset_bundle = wxGetApp().preset_bundle;
CalibPressureAdvancePattern pa_pattern(
params,
model(),
full_config,
preset_bundle->printers.get_edited_preset().is_bbl_vendor_preset(preset_bundle),
fff_print().get_plate_origin()
@@ -8162,7 +8161,7 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
bbox.merge(obj->instance_bounding_box(i, false));
}
}
pa_pattern.starting_point(Vec3d(bbox.min.x(), bbox.max.y(), 0));
pa_pattern.starting_point(Vec3d(bbox.min.x(), bbox.max.y(), 0), model());
DynamicPrintConfig* print_config = &wxGetApp().preset_bundle->prints.get_edited_preset().config;
DynamicPrintConfig* printerConfig = &wxGetApp().preset_bundle->printers.get_edited_preset().config;
@@ -8185,9 +8184,7 @@ void Plater::_calib_pa_pattern(const Calib_Params& params)
wxGetApp().get_tab(Preset::TYPE_PRINT)->reload_config();
wxGetApp().get_tab(Preset::TYPE_FILAMENT)->reload_config();
model().plates_custom_gcodes[model().curr_plate_index] =
pa_pattern.generate_gcodes()
;
pa_pattern.generate_gcodes(model());
model().calib_pa_pattern = std::make_unique<CalibPressureAdvancePattern>(pa_pattern);
}
src/slic3r/GUI/Selection.cpp
-4
View File
@@ -918,10 +918,6 @@ void Selection::translate(const Vec3d& displacement, bool local)
if (m_model->calib_pa_pattern) {
m_model->calib_pa_pattern->translate_starting_point(displacement);
m_model->plates_custom_gcodes[m_model->curr_plate_index] =
m_model->calib_pa_pattern->generate_gcodes()
;
}
ensure_not_below_bed();