GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-14 06:26:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#226 extra wipe: filament override

Browse Source
This commit is contained in:
supermerill 2020-05-14 00:22:31 +02:00
parent a27258a8be
commit 2b5689e4e6
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/PrintConfig.cpp
View File

@ -3355,6 +3355,7 @@ void PrintConfigDef::init_fff_params()
for (const char *opt_key : {
// floats
"retract_length", "retract_lift", "retract_lift_above", "retract_lift_below", "retract_speed", "deretract_speed", "retract_restart_extra", "retract_before_travel",
"wipe_extra_perimeter",
// bools
"retract_layer_change", "wipe",
// percents
@ -3414,7 +3415,8 @@ void PrintConfigDef::init_extruder_option_keys()
"retract_lift_below",
"retract_restart_extra",
"retract_speed",
"wipe"
"wipe",
"wipe_extra_perimeter"
};
assert(std::is_sorted(m_extruder_retract_keys.begin(), m_extruder_retract_keys.end()));
}

2
src/slic3r/GUI/Preset.cpp
View File

@ -551,7 +551,7 @@ const std::vector<std::string>& Preset::filament_options()
"start_filament_gcode", "end_filament_gcode",
// Retract overrides
"filament_retract_length", "filament_retract_lift", "filament_retract_lift_above", "filament_retract_lift_below", "filament_retract_speed", "filament_deretract_speed", "filament_retract_restart_extra", "filament_retract_before_travel",
"filament_retract_layer_change", "filament_wipe", "filament_retract_before_wipe",
"filament_retract_layer_change", "filament_wipe", "filament_wipe_extra_perimeter", "filament_retract_before_wipe",
// Profile compatibility
"filament_vendor", "compatible_prints", "compatible_prints_condition", "compatible_printers", "compatible_printers_condition", "inherits"
//merill adds

2
src/slic3r/GUI/Tab.cpp
View File

@ -1986,6 +1986,7 @@ void TabFilament::add_filament_overrides_page()
"filament_retract_before_travel",
"filament_retract_layer_change",
"filament_wipe",
"filament_wipe_extra_perimeter",
"filament_retract_before_wipe"
})
append_single_option_line(opt_key, extruder_idx);
@ -2013,6 +2014,7 @@ void TabFilament::update_filament_overrides_page()
"filament_retract_before_travel",
"filament_retract_layer_change",
"filament_wipe",
"filament_wipe_extra_perimeter",
"filament_retract_before_wipe"
};