3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-29 19:53:44 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

ENH: move extruder clearance settings to machine setting

Browse source 
Change-Id: Id6d550548f8fb8639349450a4b12c6eef4f441cd
(cherry picked from commit bd4420e4af9626772c90d553bf1f3bb7fd2e20c4)
This commit is contained in:
Arthur 2022-10-10 12:19:44 +08:00 • committed by Lane.Wei
parent 143c0f3750
commit efec8fef2f
3 changed files with 17 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libslic3r/PrintConfig.cpp
View file

@ -868,29 +868,29 @@ void PrintConfigDef::init_fff_params()
def = this->add("extruder_clearance_height_to_rod", coFloat);
def->label = L("Height to rod");
def->tooltip = L("Height of the clearance cylinder around extruder. "
"Used as input of auto-arrange to avoid collision when print object by object");
def->tooltip = L("Distance of the nozzle tip to the lower rod. "
"Used as input of auto-arranging to avoid collision when printing by object");
def->sidetext = L("mm");
def->min = 0;
def->mode = comDevelop;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(40));
// BBS
def = this->add("extruder_clearance_height_to_lid", coFloat);
def->label = L("Height to lid");
def->tooltip = L("Height of the clearance cylinder around extruder. "
"Used as input of auto-arrange to avoid collision when print object by object");
def->tooltip = L("Distance of the nozzle tip to the lid. "
"Used as input of auto-arranging to avoid collision when printing by object");
def->sidetext = L("mm");
def->min = 0;
def->mode = comDevelop;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(120));
def = this->add("extruder_clearance_radius", coFloat);
def->label = L("Radius");
def->tooltip = L("Clearance radius around extruder. Used as input of auto-arrange to avoid collision when print object by object");
def->tooltip = L("Clearance radius around extruder. Used as input of auto-arranging to avoid collision when printing by object");
def->sidetext = L("mm");
def->min = 0;
def->mode = comDevelop;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionFloat(40));
def = this->add("extruder_colour", coStrings);

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

@ -555,9 +555,9 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
for (auto el : { "ironing_flow", "ironing_spacing", "ironing_speed" })
toggle_field(el, has_ironing);
bool have_sequential_printing = (config->opt_enum<PrintSequence>("print_sequence") == PrintSequence::ByObject);
for (auto el : { "extruder_clearance_radius", "extruder_clearance_height_to_rod", "extruder_clearance_height_to_lid" })
toggle_field(el, have_sequential_printing);
// bool have_sequential_printing = (config->opt_enum<PrintSequence>("print_sequence") == PrintSequence::ByObject);
// for (auto el : { "extruder_clearance_radius", "extruder_clearance_height_to_rod", "extruder_clearance_height_to_lid" })
// toggle_field(el, have_sequential_printing);
bool have_ooze_prevention = config->opt_bool("ooze_prevention");
toggle_field("standby_temperature_delta", have_ooze_prevention);

19
src/slic3r/GUI/Tab.cpp
View file

@ -1915,19 +1915,7 @@ void TabPrint::build()
optgroup->append_single_option_line("print_sequence");
optgroup->append_single_option_line("spiral_mode", "spiral-vase");
optgroup->append_single_option_line("timelapse_type", "Timelapse");
//BBS: todo remove clearance to machine
#if 0
//line = { L("Extruder radius"), "" };
//line.append_option(optgroup->get_option("extruder_clearance_radius"));
//optgroup->append_line(line);
////BBS: new line for extruder_clearance_height_to_lid as there is not enough space for a single line
//line = { L("Height to rod"), "" };
//line.append_option(optgroup->get_option("extruder_clearance_height_to_rod"));
//optgroup->append_line(line);
//line = { L("Height to lid"), "" };
//line.append_option(optgroup->get_option("extruder_clearance_height_to_lid"));
//optgroup->append_line(line);
#endif
optgroup->append_single_option_line("fuzzy_skin");
optgroup->append_single_option_line("fuzzy_skin_point_distance");
optgroup->append_single_option_line("fuzzy_skin_thickness");
@ -2855,6 +2843,11 @@ void TabPrinter::build_fff()
optgroup->append_single_option_line("machine_load_filament_time");
optgroup->append_single_option_line("machine_unload_filament_time");
optgroup = page->new_optgroup(L("Extruder Clearance"));
optgroup->append_single_option_line("extruder_clearance_radius");
optgroup->append_single_option_line("extruder_clearance_height_to_rod");
optgroup->append_single_option_line("extruder_clearance_height_to_lid");
optgroup = page->new_optgroup(L("Accessory") /*, L"param_accessory"*/);
optgroup->append_single_option_line("nozzle_type");
optgroup->append_single_option_line("auxiliary_fan");