3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-13 09:47:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix some issues that some option changes won't tirgger slice status

Browse source
This commit is contained in:
SoftFever 2023-10-22 20:54:48 +08:00
parent e641903b16
commit da47d0f79e
20 changed files with 47 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/profiles/BBL/machine/fdm_machine_common.json
View file

@ -106,7 +106,7 @@
"retraction_speed": [ "retraction_speed": [
"60" "60"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"support_air_filtration": "0", "support_air_filtration": "0",
"wipe": [ "wipe": [
"1" "1"

2
resources/profiles/Creality/machine/Creality K1 (0.4 nozzle).json
View file

@ -38,7 +38,7 @@
"retract_length_toolchange": ["1"], "retract_length_toolchange": ["1"],
"deretraction_speed": ["40"], "deretraction_speed": ["40"],
"z_hop": ["0.4"], "z_hop": ["0.4"],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"], "default_filament_profile": ["Creality Generic PLA"],

2
resources/profiles/Creality/machine/Creality K1 (0.6 nozzle).json
View file

@ -39,7 +39,7 @@
"retraction_speed": ["40"], "retraction_speed": ["40"],
"deretraction_speed": ["40"], "deretraction_speed": ["40"],
"z_hop": ["0.4"], "z_hop": ["0.4"],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"], "default_filament_profile": ["Creality Generic PLA"],

2
resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json
View file

@ -38,7 +38,7 @@
"retract_length_toolchange": ["1"], "retract_length_toolchange": ["1"],
"deretraction_speed": ["40"], "deretraction_speed": ["40"],
"z_hop": ["0.4"], "z_hop": ["0.4"],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"], "default_filament_profile": ["Creality Generic PLA"],

2
resources/profiles/Creality/machine/Creality K1 Max (0.4 nozzle).json
View file

@ -38,7 +38,7 @@
"retract_length_toolchange": ["1"], "retract_length_toolchange": ["1"],
"deretraction_speed": ["40"], "deretraction_speed": ["40"],
"z_hop": ["0.4"], "z_hop": ["0.4"],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"], "default_filament_profile": ["Creality Generic PLA"],

2
resources/profiles/Creality/machine/Creality K1 Max (0.6 nozzle).json
View file

@ -38,7 +38,7 @@
"retract_length_toolchange": ["1"], "retract_length_toolchange": ["1"],
"deretraction_speed": ["40"], "deretraction_speed": ["40"],
"z_hop": ["0.4"], "z_hop": ["0.4"],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"], "default_filament_profile": ["Creality Generic PLA"],

2
resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json
View file

@ -38,7 +38,7 @@
"retract_length_toolchange": ["1"], "retract_length_toolchange": ["1"],
"deretraction_speed": ["40"], "deretraction_speed": ["40"],
"z_hop": ["0.4"], "z_hop": ["0.4"],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "PAUSE", "machine_pause_gcode": "PAUSE",
"default_filament_profile": ["Creality Generic PLA"], "default_filament_profile": ["Creality Generic PLA"],

5
resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.2 nozzle).json
View file

@ -7,6 +7,7 @@
"inherits": "fdm_elegoo_common", "inherits": "fdm_elegoo_common",
"printer_model": "Elegoo Neptune 4", "printer_model": "Elegoo Neptune 4",
"default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.2 nozzle)", "default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.2 nozzle)",
"gcode_flavor": "klipper",
"nozzle_diameter": [ "nozzle_diameter": [
"0.2" "0.2"
], ],
@ -36,7 +37,7 @@
"machine_max_jerk_y": ["12", "12"], "machine_max_jerk_y": ["12", "12"],
"machine_max_jerk_z": ["0.2", "0.4"], "machine_max_jerk_z": ["0.2", "0.4"],
"max_layer_height": [ "max_layer_height": [
"0.28" "0.16"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.08"
@ -57,7 +58,7 @@
"deretraction_speed": [ "deretraction_speed": [
"0" "0"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "M0", "machine_pause_gcode": "M0",
"default_filament_profile": [ "default_filament_profile": [

5
resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.4 nozzle).json
View file

@ -7,6 +7,7 @@
"inherits": "fdm_elegoo_common", "inherits": "fdm_elegoo_common",
"printer_model": "Elegoo Neptune 4", "printer_model": "Elegoo Neptune 4",
"default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.4 nozzle)", "default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.4 nozzle)",
"gcode_flavor": "klipper",
"nozzle_diameter": [ "nozzle_diameter": [
"0.4" "0.4"
], ],
@ -36,7 +37,7 @@
"machine_max_jerk_y": ["12", "12"], "machine_max_jerk_y": ["12", "12"],
"machine_max_jerk_z": ["0.2", "0.4"], "machine_max_jerk_z": ["0.2", "0.4"],
"max_layer_height": [ "max_layer_height": [
"0.28" "0.32"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.08"
@ -57,7 +58,7 @@
"deretraction_speed": [ "deretraction_speed": [
"0" "0"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "M0", "machine_pause_gcode": "M0",
"default_filament_profile": [ "default_filament_profile": [

5
resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.6 nozzle).json
View file

@ -7,6 +7,7 @@
"inherits": "fdm_elegoo_common", "inherits": "fdm_elegoo_common",
"printer_model": "Elegoo Neptune 4", "printer_model": "Elegoo Neptune 4",
"default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.6 nozzle)", "default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.6 nozzle)",
"gcode_flavor": "klipper",
"nozzle_diameter": [ "nozzle_diameter": [
"0.6" "0.6"
], ],
@ -36,7 +37,7 @@
"machine_max_jerk_y": ["12", "12"], "machine_max_jerk_y": ["12", "12"],
"machine_max_jerk_z": ["0.2", "0.4"], "machine_max_jerk_z": ["0.2", "0.4"],
"max_layer_height": [ "max_layer_height": [
"0.28" "0.4"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.08"
@ -57,7 +58,7 @@
"deretraction_speed": [ "deretraction_speed": [
"0" "0"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "M0", "machine_pause_gcode": "M0",
"default_filament_profile": [ "default_filament_profile": [

5
resources/profiles/Elegoo/machine/Elegoo Neptune 4 (0.8 nozzle).json
View file

@ -7,6 +7,7 @@
"inherits": "fdm_elegoo_common", "inherits": "fdm_elegoo_common",
"printer_model": "Elegoo Neptune 4", "printer_model": "Elegoo Neptune 4",
"default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.8 nozzle)", "default_print_profile": "0.20mm Standard @Elegoo Neptune4 (0.8 nozzle)",
"gcode_flavor": "klipper",
"nozzle_diameter": [ "nozzle_diameter": [
"0.8" "0.8"
], ],
@ -36,7 +37,7 @@
"machine_max_jerk_y": ["12", "12"], "machine_max_jerk_y": ["12", "12"],
"machine_max_jerk_z": ["0.2", "0.4"], "machine_max_jerk_z": ["0.2", "0.4"],
"max_layer_height": [ "max_layer_height": [
"0.28" "0.6"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.08"
@ -57,7 +58,7 @@
"deretraction_speed": [ "deretraction_speed": [
"0" "0"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "M0", "machine_pause_gcode": "M0",
"default_filament_profile": [ "default_filament_profile": [

5
resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.2 nozzle).json
View file

@ -7,6 +7,7 @@
"inherits": "fdm_elegoo_common", "inherits": "fdm_elegoo_common",
"printer_model": "Elegoo Neptune 4 Pro", "printer_model": "Elegoo Neptune 4 Pro",
"default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.2 nozzle)", "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.2 nozzle)",
"gcode_flavor": "klipper",
"nozzle_diameter": [ "nozzle_diameter": [
"0.2" "0.2"
], ],
@ -36,7 +37,7 @@
"machine_max_jerk_y": ["12", "12"], "machine_max_jerk_y": ["12", "12"],
"machine_max_jerk_z": ["0.2", "0.4"], "machine_max_jerk_z": ["0.2", "0.4"],
"max_layer_height": [ "max_layer_height": [
"0.28" "0.16"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.08"
@ -60,7 +61,7 @@
"deretraction_speed": [ "deretraction_speed": [
"0" "0"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "M0", "machine_pause_gcode": "M0",
"default_filament_profile": [ "default_filament_profile": [

5
resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.4 nozzle).json
View file

@ -7,6 +7,7 @@
"inherits": "fdm_elegoo_common", "inherits": "fdm_elegoo_common",
"printer_model": "Elegoo Neptune 4 Pro", "printer_model": "Elegoo Neptune 4 Pro",
"default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.4 nozzle)", "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.4 nozzle)",
"gcode_flavor": "klipper",
"nozzle_diameter": [ "nozzle_diameter": [
"0.4" "0.4"
], ],
@ -36,7 +37,7 @@
"machine_max_jerk_y": ["12", "12"], "machine_max_jerk_y": ["12", "12"],
"machine_max_jerk_z": ["0.2", "0.4"], "machine_max_jerk_z": ["0.2", "0.4"],
"max_layer_height": [ "max_layer_height": [
"0.28" "0.32"
], ],
"min_layer_height": [ "min_layer_height": [
"0.08" "0.08"
@ -60,7 +61,7 @@
"deretraction_speed": [ "deretraction_speed": [
"0" "0"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "M0", "machine_pause_gcode": "M0",
"default_filament_profile": [ "default_filament_profile": [

5
resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.6 nozzle).json
View file

@ -7,6 +7,7 @@
"inherits": "fdm_elegoo_common", "inherits": "fdm_elegoo_common",
"printer_model": "Elegoo Neptune 4 Pro", "printer_model": "Elegoo Neptune 4 Pro",
"default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.6 nozzle)", "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.6 nozzle)",
"gcode_flavor": "klipper",
"nozzle_diameter": ["0.6"], "nozzle_diameter": ["0.6"],
"printer_variant": "0.6", "printer_variant": "0.6",
"printable_area": ["0x0", "225x0", "225x225", "0x225"], "printable_area": ["0x0", "225x0", "225x225", "0x225"],
@ -28,7 +29,7 @@
"machine_max_jerk_x": ["12", "12"], "machine_max_jerk_x": ["12", "12"],
"machine_max_jerk_y": ["12", "12"], "machine_max_jerk_y": ["12", "12"],
"machine_max_jerk_z": ["0.2", "0.4"], "machine_max_jerk_z": ["0.2", "0.4"],
"max_layer_height": ["0.28"], "max_layer_height": ["0.4"],
"min_layer_height": ["0.08"], "min_layer_height": ["0.08"],
"printer_settings_id": "Elegoo", "printer_settings_id": "Elegoo",
"retraction_minimum_travel": ["1"], "retraction_minimum_travel": ["1"],
@ -37,7 +38,7 @@
"retraction_speed": ["25"], "retraction_speed": ["25"],
"retract_length_toolchange": ["2"], "retract_length_toolchange": ["2"],
"deretraction_speed": ["0"], "deretraction_speed": ["0"],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "M0", "machine_pause_gcode": "M0",
"default_filament_profile": ["Elegoo Generic PLA @0.6 nozzle"], "default_filament_profile": ["Elegoo Generic PLA @0.6 nozzle"],

5
resources/profiles/Elegoo/machine/Elegoo Neptune 4 Pro (0.8 nozzle).json
View file

@ -6,6 +6,7 @@
"instantiation": "true", "instantiation": "true",
"inherits": "fdm_elegoo_common", "inherits": "fdm_elegoo_common",
"printer_model": "Elegoo Neptune 4 Pro", "printer_model": "Elegoo Neptune 4 Pro",
"gcode_flavor": "klipper",
"default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.8 nozzle)", "default_print_profile": "0.20mm Standard @Elegoo Neptune4Pro (0.8 nozzle)",
"nozzle_diameter": ["0.8"], "nozzle_diameter": ["0.8"],
"printer_variant": "0.8", "printer_variant": "0.8",
@ -28,7 +29,7 @@
"machine_max_jerk_x": ["12", "12"], "machine_max_jerk_x": ["12", "12"],
"machine_max_jerk_y": ["12", "12"], "machine_max_jerk_y": ["12", "12"],
"machine_max_jerk_z": ["0.2", "0.4"], "machine_max_jerk_z": ["0.2", "0.4"],
"max_layer_height": ["0.28"], "max_layer_height": ["0.6"],
"min_layer_height": ["0.08"], "min_layer_height": ["0.08"],
"printer_settings_id": "Elegoo", "printer_settings_id": "Elegoo",
"retraction_minimum_travel": ["1"], "retraction_minimum_travel": ["1"],
@ -37,7 +38,7 @@
"retraction_speed": ["25"], "retraction_speed": ["25"],
"retract_length_toolchange": ["2"], "retract_length_toolchange": ["2"],
"deretraction_speed": ["0"], "deretraction_speed": ["0"],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"machine_pause_gcode": "M0", "machine_pause_gcode": "M0",
"default_filament_profile": ["Elegoo Generic PLA @0.8 nozzle"], "default_filament_profile": ["Elegoo Generic PLA @0.8 nozzle"],

2
resources/profiles/Sovol/machine/Sovol SV07 0.4 nozzle.json
View file

@ -114,7 +114,7 @@
"deretraction_speed": [ "deretraction_speed": [
"140" "140"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "M600\nG1 E0.4 F1500 ; prime after color change", "change_filament_gcode": "M600\nG1 E0.4 F1500 ; prime after color change",
"machine_pause_gcode": "M601", "machine_pause_gcode": "M601",
"default_filament_profile": [ "default_filament_profile": [

2
resources/profiles/Sovol/machine/Sovol SV07 Plus 0.4 nozzle.json
View file

@ -114,7 +114,7 @@
"deretraction_speed": [ "deretraction_speed": [
"140" "140"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "M600\nG1 E0.4 F1500 ; prime after color change", "change_filament_gcode": "M600\nG1 E0.4 F1500 ; prime after color change",
"machine_pause_gcode": "M601", "machine_pause_gcode": "M601",
"default_filament_profile": [ "default_filament_profile": [

2
resources/profiles/Wanhao/machine/fdm_machine_common.json
View file

@ -105,7 +105,7 @@
"retraction_speed": [ "retraction_speed": [
"60" "60"
], ],
"single_extruder_multi_material": "0", "single_extruder_multi_material": "1",
"change_filament_gcode": "", "change_filament_gcode": "",
"wipe": [ "wipe": [
"1" "1"

7
src/libslic3r/Print.cpp
View file

@ -182,7 +182,7 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
"nozzle_hrc", "nozzle_hrc",
"required_nozzle_HRC", "required_nozzle_HRC",
"upward_compatible_machine", "upward_compatible_machine",
// SoftFever // Orca
"chamber_temperature", "chamber_temperature",
"thumbnails", "thumbnails",
"thumbnails_format", "thumbnails_format",
@ -200,7 +200,10 @@ bool Print::invalidate_state_by_config_options(const ConfigOptionResolver & /* n
"single_extruder_multi_material_priming", "single_extruder_multi_material_priming",
"activate_air_filtration", "activate_air_filtration",
"during_print_exhaust_fan_speed", "during_print_exhaust_fan_speed",
"complete_print_exhaust_fan_speed" "complete_print_exhaust_fan_speed",
"activate_chamber_temp_control",
"manual_filament_change"
}; };
static std::unordered_set<std::string> steps_ignore; static std::unordered_set<std::string> steps_ignore;

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

@ -3473,13 +3473,14 @@ void TabPrinter::build_unregular_pages(bool from_initial_build/* = false*/)
auto page = add_options_page(L("Multimaterial"), "printer", true); auto page = add_options_page(L("Multimaterial"), "printer", true);
auto optgroup = page->new_optgroup(L("Single extruder multimaterial setup")); auto optgroup = page->new_optgroup(L("Single extruder multimaterial setup"));
optgroup->append_single_option_line("single_extruder_multi_material"); optgroup->append_single_option_line("single_extruder_multi_material");
optgroup->m_on_change = [this, optgroup](const t_config_option_key &opt_key, const boost::any &value) { // Orca: we only support Single Extruder Multi Material, so it's always enabled
wxTheApp->CallAfter([this, opt_key, value]() { // optgroup->m_on_change = [this, optgroup](const t_config_option_key &opt_key, const boost::any &value) {
if (opt_key == "single_extruder_multi_material") { // wxTheApp->CallAfter([this, opt_key, value]() {
build_unregular_pages(); // if (opt_key == "single_extruder_multi_material") {
} // build_unregular_pages();
}); // }
}; // });
// };
optgroup->append_single_option_line("manual_filament_change"); optgroup->append_single_option_line("manual_filament_change");
optgroup = page->new_optgroup(L("Wipe tower")); optgroup = page->new_optgroup(L("Wipe tower"));