diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-08-24 17:33:57 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2018-08-24 17:33:57 +0300 |
| commit | de0f8ec2673f9394ea2fb6581746ae0353f487b0 (patch) | |
| tree | ce670163892a044bbb2dcfc55bd56af20777723b /xs/src/slic3r | |
| parent | 60a0375ff99ae2d7608006ebda19d41bcf517b86 (diff) | |
| parent | be3b8e98daab21fda63bf126a1bcd6d80869706b (diff) | |
Merge remote-tracking branch 'remotes/origin/lm_retraction_fix'
Diffstat (limited to 'xs/src/slic3r')
| -rw-r--r-- | xs/src/slic3r/GUI/Preset.cpp | 13 | ||||
| -rw-r--r-- | xs/src/slic3r/GUI/Tab.cpp | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/xs/src/slic3r/GUI/Preset.cpp b/xs/src/slic3r/GUI/Preset.cpp index 8335e48b5..af2cd8ff6 100644 --- a/xs/src/slic3r/GUI/Preset.cpp +++ b/xs/src/slic3r/GUI/Preset.cpp @@ -313,13 +313,12 @@ const std::vector<std::string>& Preset::filament_options() { static std::vector<std::string> s_opts { "filament_colour", "filament_diameter", "filament_type", "filament_soluble", "filament_notes", "filament_max_volumetric_speed", - "extrusion_multiplier", "filament_density", "filament_cost", - "filament_loading_speed", "filament_load_time", "filament_unloading_speed", "filament_unload_time", "filament_toolchange_delay", - "filament_cooling_moves", "filament_cooling_initial_speed", "filament_cooling_final_speed", "filament_ramming_parameters", - "filament_minimal_purge_on_wipe_tower", "temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", - "fan_always_on", "cooling", "min_fan_speed", "max_fan_speed", "bridge_fan_speed", "disable_fan_first_layers", "fan_below_layer_time", - "slowdown_below_layer_time", "min_print_speed", "start_filament_gcode", "end_filament_gcode","compatible_printers", "compatible_printers_condition", - "inherits" + "extrusion_multiplier", "filament_density", "filament_cost", "filament_loading_speed", "filament_loading_speed_start", "filament_load_time", + "filament_unloading_speed", "filament_unloading_speed_start", "filament_unload_time", "filament_toolchange_delay", "filament_cooling_moves", + "filament_cooling_initial_speed", "filament_cooling_final_speed", "filament_ramming_parameters", "filament_minimal_purge_on_wipe_tower", + "temperature", "first_layer_temperature", "bed_temperature", "first_layer_bed_temperature", "fan_always_on", "cooling", "min_fan_speed", + "max_fan_speed", "bridge_fan_speed", "disable_fan_first_layers", "fan_below_layer_time", "slowdown_below_layer_time", "min_print_speed", + "start_filament_gcode", "end_filament_gcode","compatible_printers", "compatible_printers_condition", "inherits" }; return s_opts; } diff --git a/xs/src/slic3r/GUI/Tab.cpp b/xs/src/slic3r/GUI/Tab.cpp index bde4fdc34..6505e1092 100644 --- a/xs/src/slic3r/GUI/Tab.cpp +++ b/xs/src/slic3r/GUI/Tab.cpp @@ -1290,7 +1290,9 @@ void TabFilament::build() optgroup->append_line(line); optgroup = page->new_optgroup(_(L("Toolchange parameters with single extruder MM printers"))); - optgroup->append_single_option_line("filament_loading_speed"); + optgroup->append_single_option_line("filament_loading_speed_start"); + optgroup->append_single_option_line("filament_loading_speed"); + optgroup->append_single_option_line("filament_unloading_speed_start"); optgroup->append_single_option_line("filament_unloading_speed"); optgroup->append_single_option_line("filament_load_time"); optgroup->append_single_option_line("filament_unload_time"); |