3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-20 21:27:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add a new placehoder is_extruder_used for IDEX printers (#951)

Browse source 
* add placeholder 'is_extruder_used' for IDEX

* fix code_font using fixed-width font

* fix cmd+shift+g
This commit is contained in:
Dylan 2023-05-04 22:18:44 +08:00 • committed by GitHub
parent d192a8cc61
commit 4481fe62b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libslic3r/GCode.cpp
View file

@ -1725,6 +1725,12 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato
m_placeholder_parser.set("has_wipe_tower", has_wipe_tower); m_placeholder_parser.set("has_wipe_tower", has_wipe_tower);
//m_placeholder_parser.set("has_single_extruder_multi_material_priming", has_wipe_tower && print.config().single_extruder_multi_material_priming); //m_placeholder_parser.set("has_single_extruder_multi_material_priming", has_wipe_tower && print.config().single_extruder_multi_material_priming);
m_placeholder_parser.set("total_toolchanges", std::max(0, print.wipe_tower_data().number_of_toolchanges)); // Check for negative toolchanges (single extruder mode) and set to 0 (no tool change). m_placeholder_parser.set("total_toolchanges", std::max(0, print.wipe_tower_data().number_of_toolchanges)); // Check for negative toolchanges (single extruder mode) and set to 0 (no tool change).
std::vector<unsigned char> is_extruder_used(print.config().filament_diameter.size(), 0);
for (unsigned int extruder : tool_ordering.all_extruders())
is_extruder_used[extruder] = true;
m_placeholder_parser.set("is_extruder_used", new ConfigOptionBools(is_extruder_used));
Vec2f plate_offset = m_writer.get_xy_offset(); Vec2f plate_offset = m_writer.get_xy_offset();
{ {
BoundingBoxf bbox(print.config().printable_area.values); BoundingBoxf bbox(print.config().printable_area.values);

5
src/slic3r/GUI/Field.cpp
View file

@ -511,8 +511,9 @@ void TextCtrl::BUILD() {
m_combine_side_text = !m_opt.multiline; m_combine_side_text = !m_opt.multiline;
if (parent_is_custom_ctrl && m_opt.height < 0) if (parent_is_custom_ctrl && m_opt.height < 0)
opt_height = (double) text_ctrl->GetSize().GetHeight() / m_em_unit; opt_height = (double) text_ctrl->GetSize().GetHeight() / m_em_unit;
if (m_opt.is_code) // BBS temp->SetFont(m_opt.is_code ?
temp->SetFont(Slic3r::GUI::wxGetApp().normal_font()); Slic3r::GUI::wxGetApp().code_font() :
Slic3r::GUI::wxGetApp().normal_font());
wxGetApp().UpdateDarkUI(temp); wxGetApp().UpdateDarkUI(temp);

6
src/slic3r/GUI/MainFrame.cpp
View file

@ -542,7 +542,11 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
m_print_enable = get_enable_print_status(); m_print_enable = get_enable_print_status();
m_print_btn->Enable(m_print_enable); m_print_btn->Enable(m_print_enable);
if (m_print_enable) { if (m_print_enable) {
wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_PRINT_PLATE)); PresetBundle &preset_bundle = *wxGetApp().preset_bundle;
if (preset_bundle.printers.get_edited_preset().is_bbl_vendor_preset(&preset_bundle))
wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_PRINT_PLATE));
else
wxPostEvent(m_plater, SimpleEvent(EVT_GLTOOLBAR_SEND_GCODE));
} }
evt.Skip(); evt.Skip();
return; return;