From ef0c6569320c56a028289c629b5a22e680ca119e Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 29 Sep 2026 17:52:13 +0800 Subject: [PATCH 1/4] Tune pressure advance separately for each extruder variant Pressure advance, adaptive pressure advance and its model can now take a different value for each extruder variant of a filament, such as Standard and High Flow nozzles, like the other per-variant filament settings. Projects saved with one value per filament apply it to every variant of that filament, and the addnorth BBL filaments in the Orca Filament Library are updated to the per-variant layout. --- .../references/extruder-variants.md | 7 +- .../references/filament-profiles.md | 6 +- resources/profiles/OrcaFilamentLibrary.json | 2 +- .../addnorth/BBL/addnorth ABS rABS.json | 2 + .../addnorth/BBL/addnorth PA Adura FDA.json | 2 + .../addnorth/BBL/addnorth PA Adura.json | 2 + .../addnorth/BBL/addnorth PA-CF Adura X.json | 2 + .../addnorth/BBL/addnorth PA6 Addlantis.json | 2 + .../BBL/addnorth PC BLend HT LCF.json | 2 + .../addnorth/BBL/addnorth PETG Base.json | 2 + .../addnorth/BBL/addnorth PETG ESD.json | 2 + .../addnorth/BBL/addnorth PETG Economy.json | 2 + .../addnorth/BBL/addnorth PETG Flame v0.json | 2 + .../addnorth/BBL/addnorth PETG PRO Matte.json | 2 + .../BBL/addnorth PETG rPETG Matte.json | 2 + .../BBL/addnorth PETG-CF Rigid X.json | 2 + .../addnorth/BBL/addnorth PLA E-PLA.json | 2 + .../addnorth/BBL/addnorth PLA Economy.json | 2 + .../BBL/addnorth PLA HT-PLA PRO Matte.json | 2 + .../BBL/addnorth PLA Premium Silk.json | 2 + .../addnorth/BBL/addnorth PLA Textura.json | 2 + .../addnorth/BBL/addnorth PLA Wood.json | 2 + .../BBL/addnorth PLA X-PLA High Speed.json | 2 + .../addnorth/BBL/addnorth PLA X-PLA.json | 2 + .../BBL/addnorth PLA rPLA RE-ADD.json | 2 + .../BBL/addnorth PVDF Adamant S1.json | 2 + .../addnorth/BBL/addnorth TPU EasyFlex.json | 2 + .../BBL/addnorth TPU Pro Matte 85A.json | 2 + .../BBL/addnorth TPU Pro Matte 95A.json | 2 + src/libslic3r/GCode.cpp | 118 +++++++---------- src/libslic3r/GCode.hpp | 2 + src/libslic3r/GCode/AdaptivePAProcessor.cpp | 59 ++++----- src/libslic3r/GCode/AdaptivePAProcessor.hpp | 18 +-- src/libslic3r/Print.cpp | 18 ++- src/libslic3r/PrintConfig.cpp | 23 ++++ src/slic3r/GUI/ConfigManipulation.cpp | 14 +- src/slic3r/GUI/Plater.cpp | 42 +++--- src/slic3r/GUI/Tab.cpp | 35 ++--- tests/fff_print/test_multifilament.cpp | 125 ++++++++++++++++++ .../libslic3r/test_preset_bundle_loading.cpp | 36 +++++ 40 files changed, 392 insertions(+), 165 deletions(-) diff --git a/.claude/skills/orca-profiles/references/extruder-variants.md b/.claude/skills/orca-profiles/references/extruder-variants.md index 322d79d56f..5059fd5c6b 100644 --- a/.claude/skills/orca-profiles/references/extruder-variants.md +++ b/.claude/skills/orca-profiles/references/extruder-variants.md @@ -189,8 +189,7 @@ the presets to a base is in [shared-bases.md](shared-bases.md#variant-arrays-on- 2. Every key in `filament_options_with_variant` ([the full list](#the-four-key-sets)) that reaches the preset, whether written, included or inherited, is resized to its variant count: write it at exactly that width, or leave it out. Keys outside the set - (`filament_type`, plate temperatures, `fan_max_speed`, `slow_down_min_speed`, `pressure_advance`, - …) are never addressed by variant index; the preset contributes their first value however wide a + (`filament_type`, plate temperatures, `fan_max_speed`, `slow_down_min_speed`, …) are never addressed by variant index; the preset contributes their first value however wide a file writes them. 3. Cover every variant the material is meant to print on across its `compatible_printers`. Leave out a variant deliberately when the material should not be tuned for it (e.g. a TPU High Flow variant @@ -455,7 +454,7 @@ no set: the variant-length resize leaves it alone, and only the pair rebuild of last for contrast; it is not a variant set. `check` and `fix-variant` read the four sets from `PrintConfig.cpp` on every run, so they follow the -engine. The lists below are from the 2026-09-25 checkout; regenerate them from the repository root +engine. The lists below are from the 2026-09-29 checkout; regenerate them from the repository root before relying on them (the recipe strips comments, since an initializer can carry a commented-out entry): ```bash @@ -478,7 +477,7 @@ EOF **`print_options_with_variant`**, process, stride 1 (45): `bridge_acceleration`, `bridge_speed`, `default_acceleration`, `default_jerk`, `default_junction_deviation`, `enable_overhang_speed`, `gap_infill_speed`, `infill_jerk`, `initial_layer_acceleration`, `initial_layer_infill_speed`, `initial_layer_jerk`, `initial_layer_speed`, `initial_layer_travel_acceleration`, `initial_layer_travel_jerk`, `initial_layer_travel_speed`, `inner_wall_acceleration`, `inner_wall_jerk`, `inner_wall_speed`, `internal_bridge_speed`, `internal_solid_infill_acceleration`, `internal_solid_infill_speed`, `outer_wall_acceleration`, `outer_wall_jerk`, `outer_wall_speed`, `overhang_1_4_speed`, `overhang_2_4_speed`, `overhang_3_4_speed`, `overhang_4_4_speed`, `print_extruder_id`, `print_extruder_variant`, `slowdown_for_curled_perimeters`, `small_perimeter_speed`, `small_perimeter_threshold`, `sparse_infill_acceleration`, `sparse_infill_speed`, `support_interface_speed`, `support_speed`, `top_solid_infill_flow_ratio`, `top_surface_acceleration`, `top_surface_jerk`, `top_surface_speed`, `travel_acceleration`, `travel_jerk`, `travel_speed`, `travel_speed_z` -**`filament_options_with_variant`**, filament, stride 1 (48): `activate_air_filtration`, `activate_air_filtration_during_print`, `activate_air_filtration_on_completion`, `complete_print_exhaust_fan_speed`, `during_print_exhaust_fan_speed`, `filament_adaptive_volumetric_speed`, `filament_cooling_before_tower`, `filament_deretraction_speed`, `filament_extruder_variant`, `filament_flow_ratio`, `filament_flush_temp`, `filament_flush_volumetric_speed`, `filament_ironing_flow`, `filament_ironing_inset`, `filament_ironing_spacing`, `filament_ironing_speed`, `filament_long_retractions_when_cut`, `filament_max_volumetric_speed`, `filament_pre_cooling_temperature`, `filament_pre_cooling_temperature_nc`, `filament_preheat_temperature_delta`, `filament_ramming_travel_time`, `filament_ramming_travel_time_nc`, `filament_ramming_volumetric_speed`, `filament_ramming_volumetric_speed_nc`, `filament_retract_after_wipe`, `filament_retract_before_wipe`, `filament_retract_length_nc`, `filament_retract_length_toolchange`, `filament_retract_lift_above`, `filament_retract_lift_below`, `filament_retract_lift_enforce`, `filament_retract_restart_extra`, `filament_retract_restart_extra_toolchange`, `filament_retract_when_changing_layer`, `filament_retraction_distances_when_cut`, `filament_retraction_length`, `filament_retraction_minimum_travel`, `filament_retraction_speed`, `filament_wipe`, `filament_wipe_distance`, `filament_z_hop`, `filament_z_hop_types`, `long_retractions_when_ec`, `nozzle_temperature`, `nozzle_temperature_initial_layer`, `retraction_distances_when_ec`, `volumetric_speed_coefficients` +**`filament_options_with_variant`**, filament, stride 1 (54): `activate_air_filtration`, `activate_air_filtration_during_print`, `activate_air_filtration_on_completion`, `adaptive_pressure_advance`, `adaptive_pressure_advance_bridges`, `adaptive_pressure_advance_model`, `adaptive_pressure_advance_overhangs`, `complete_print_exhaust_fan_speed`, `during_print_exhaust_fan_speed`, `enable_pressure_advance`, `filament_adaptive_volumetric_speed`, `filament_cooling_before_tower`, `filament_deretraction_speed`, `filament_extruder_variant`, `filament_flow_ratio`, `filament_flush_temp`, `filament_flush_volumetric_speed`, `filament_ironing_flow`, `filament_ironing_inset`, `filament_ironing_spacing`, `filament_ironing_speed`, `filament_long_retractions_when_cut`, `filament_max_volumetric_speed`, `filament_pre_cooling_temperature`, `filament_pre_cooling_temperature_nc`, `filament_preheat_temperature_delta`, `filament_ramming_travel_time`, `filament_ramming_travel_time_nc`, `filament_ramming_volumetric_speed`, `filament_ramming_volumetric_speed_nc`, `filament_retract_after_wipe`, `filament_retract_before_wipe`, `filament_retract_length_nc`, `filament_retract_length_toolchange`, `filament_retract_lift_above`, `filament_retract_lift_below`, `filament_retract_lift_enforce`, `filament_retract_restart_extra`, `filament_retract_restart_extra_toolchange`, `filament_retract_when_changing_layer`, `filament_retraction_distances_when_cut`, `filament_retraction_length`, `filament_retraction_minimum_travel`, `filament_retraction_speed`, `filament_wipe`, `filament_wipe_distance`, `filament_z_hop`, `filament_z_hop_types`, `long_retractions_when_ec`, `nozzle_temperature`, `nozzle_temperature_initial_layer`, `pressure_advance`, `retraction_distances_when_ec`, `volumetric_speed_coefficients` **`printer_extruder_options`**, machine, one value per extruder, not a variant set (8): `default_nozzle_volume_type`, `extruder_max_nozzle_count`, `extruder_printable_area`, diff --git a/.claude/skills/orca-profiles/references/filament-profiles.md b/.claude/skills/orca-profiles/references/filament-profiles.md index bc80176eaa..0ec5eca24e 100644 --- a/.claude/skills/orca-profiles/references/filament-profiles.md +++ b/.claude/skills/orca-profiles/references/filament-profiles.md @@ -244,10 +244,10 @@ preset for a 0.2 nozzle, explicitly revisit flow limits; do not infer a pressure required direction of change, from diameter alone. On a printer with extruder variants, a filament tunes these per variant too: -`filament_max_volumetric_speed`, `filament_flow_ratio`, `nozzle_temperature` and the retraction -overrides carry one value per variant of `filament_extruder_variant` (Standard, High Flow, …). The +`filament_max_volumetric_speed`, `filament_flow_ratio`, `nozzle_temperature`, pressure advance and the +retraction overrides carry one value per variant of `filament_extruder_variant` (Standard, High Flow, …). The exact key set is [`filament_options_with_variant`](extruder-variants.md#the-four-key-sets); -`slow_down_min_speed` and `pressure_advance` are not in it. Keep every such array at exactly that width, even where the +`slow_down_min_speed` and `fan_max_speed` are not in it. Keep every such array at exactly that width, even where the setting does not differ per variant, and measure the High Flow variant rather than copying Standard ([extruder-variants.md](extruder-variants.md#filament)). diff --git a/resources/profiles/OrcaFilamentLibrary.json b/resources/profiles/OrcaFilamentLibrary.json index 084a12993f..ebf4b7b928 100644 --- a/resources/profiles/OrcaFilamentLibrary.json +++ b/resources/profiles/OrcaFilamentLibrary.json @@ -1,6 +1,6 @@ { "name": "OrcaFilamentLibrary", - "version": "02.04.00.15", + "version": "02.04.00.16", "force_update": "0", "description": "Orca Filament Library", "filament_list": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json index 4d06956b11..b9ee6494c5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth ABS rABS.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json index 7bc7435c74..8532e514a3 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura FDA.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json index b33951c7ba..c7690e1178 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA Adura.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json index 9f938e51e9..7dab608a6f 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA-CF Adura X.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json index 352bd80ac6..6e068507f1 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PA6 Addlantis.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json index 839c055ebf..de13a67d83 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PC BLend HT LCF.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json index f2e5824c14..b1120899d7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Base.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json index 1074484973..cc7012c75d 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG ESD.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json index 3747f7a86f..48119c7b04 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Economy.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json index 7dea674787..0650202cea 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG Flame v0.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json index 8dc175d8e1..978db741a7 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG PRO Matte.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "1" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json index 0454a13f5c..8514e62315 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG rPETG Matte.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json index 024faed63d..d2789e2d15 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PETG-CF Rigid X.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "0" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json index 1f6892b815..b92f8c27b5 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA E-PLA.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json index ccacef16f4..de0cdb9f05 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Economy.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json index aa466f3c3e..e8e2fca28a 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA HT-PLA PRO Matte.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json index f794753c4a..f3cb324a87 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Premium Silk.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json index 73cfea81a4..9b49ebac26 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Textura.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json index 5d64f416b7..e29534a5ad 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA Wood.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "0" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json index d752b3adaf..98a98c4536 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA High Speed.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json index 2deaf8d323..def3487467 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA X-PLA.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json index 5ef8ccc6b6..ef614b39ae 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PLA rPLA RE-ADD.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json index 608d67a5bd..e0a99b8b05 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth PVDF Adamant S1.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json index 25f2c310db..a1d9deab44 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU EasyFlex.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json index a922a91ba1..e944d203a9 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 85A.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json index 80c80328e8..d0e272d902 100644 --- a/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json +++ b/resources/profiles/OrcaFilamentLibrary/filament/addnorth/BBL/addnorth TPU Pro Matte 95A.json @@ -111,6 +111,7 @@ "1" ], "enable_pressure_advance": [ + "0", "0" ], "eng_plate_temp": [ @@ -316,6 +317,7 @@ "2" ], "pressure_advance": [ + "0.02", "0.02" ], "reduce_fan_stop_start_freq": [ diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp index 8bbeb05514..9f06ce9d3d 100644 --- a/src/libslic3r/GCode.cpp +++ b/src/libslic3r/GCode.cpp @@ -1497,12 +1497,7 @@ static std::vector get_path_of_change_filament(const Print& print) check_add_eol(toolchange_gcode_str); // SoftFever: set new PA for new filament - if (gcodegen.config().enable_pressure_advance.get_at(new_filament_id)) { - gcode += gcodegen.writer().set_pressure_advance(gcodegen.config().pressure_advance.get_at(new_filament_id)); - // Orca: Adaptive PA - // Reset Adaptive PA processor last PA value - gcodegen.m_pa_processor->resetPreviousPA(gcodegen.config().pressure_advance.get_at(new_filament_id)); - } + gcode += gcodegen.set_filament_pressure_advance(new_filament_id); // A phony move to the end position at the wipe tower. gcodegen.writer().travel_to_xy((end_pos + plate_origin_2d).cast()); @@ -1826,12 +1821,8 @@ static std::vector get_path_of_change_filament(const Print& print) check_add_eol(toolchange_gcode_str); // SoftFever: set new PA for new filament - if (new_extruder_id != -1 && gcodegen.config().enable_pressure_advance.get_at(new_extruder_id)) { - gcode += gcodegen.writer().set_pressure_advance(gcodegen.config().pressure_advance.get_at(new_extruder_id)); - // Orca: Adaptive PA - // Reset Adaptive PA processor last PA value - gcodegen.m_pa_processor->resetPreviousPA(gcodegen.config().pressure_advance.get_at(new_extruder_id)); - } + if (new_extruder_id != -1) + gcode += gcodegen.set_filament_pressure_advance(new_extruder_id); // A phony move to the end position at the wipe tower. gcodegen.writer().travel_to_xy((end_pos + plate_origin_2d).cast()); @@ -3232,7 +3223,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato m_cooling_buffer->set_current_extruder(initial_extruder_id, extruder_id); // Orca: Initialise AdaptivePA processor filter - m_pa_processor = std::make_unique(*this, tool_ordering.all_extruders()); + m_pa_processor = std::make_unique(*this); // Update output variables after the extruders were initialized. m_placeholder_parser_integration.init(m_writer); @@ -3797,12 +3788,7 @@ void GCode::_do_export(Print& print, GCodeOutputStream &file, ThumbnailsGenerato } } // Orca: add missing PA settings for initial filament - if (m_config.enable_pressure_advance.get_at(initial_non_support_extruder_id)) { - file.write(m_writer.set_pressure_advance(m_config.pressure_advance.get_at(initial_non_support_extruder_id))); - // Orca: Adaptive PA - // Reset Adaptive PA processor last PA value - m_pa_processor->resetPreviousPA(m_config.pressure_advance.get_at(initial_non_support_extruder_id)); - } + file.write(set_filament_pressure_advance(initial_non_support_extruder_id)); } //flush FanMover buffer to avoid modifying the start gcode if it's manual. @@ -8390,12 +8376,16 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, // Orca: Dynamic PA // If adaptive PA is enabled, by default evaluate PA on all extrusion moves + // The PA settings and the PA_CHANGE tags use the filament config index of the filament's extruder variant + const unsigned int pa_config_index = (unsigned int) get_filament_config_index(m_writer.filament()->id()); + const bool adaptive_pa = m_config.adaptive_pressure_advance.get_at(pa_config_index) && m_config.enable_pressure_advance.get_at(pa_config_index); + const bool adaptive_pa_overhangs = adaptive_pa && m_config.adaptive_pressure_advance_overhangs.get_at(pa_config_index); bool is_pa_calib = m_curr_print->calib_mode() == CalibMode::Calib_PA_Line || m_curr_print->calib_mode() == CalibMode::Calib_PA_Pattern || m_curr_print->calib_mode() == CalibMode::Calib_PA_Tower; bool evaluate_adaptive_pa = false; bool role_change = (m_last_extrusion_role != path.role()); - if (!is_pa_calib && FILAMENT_CONFIG(adaptive_pressure_advance) && FILAMENT_CONFIG(enable_pressure_advance)) { + if (!is_pa_calib && adaptive_pa) { evaluate_adaptive_pa = true; // If we have already emmited a PA change because the m_multi_flow_segment_path_pa_set is set // skip re-issuing the PA change tag. @@ -8478,7 +8468,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, // Post processor flag generation code segment when option to emit only at role changes is enabled // Variables published to the post processor: // 1) Tag to trigger a PA evaluation (because a role change was identified and the user has requested dynamic PA adjustments) - // 2) Current extruder ID (to identify the PA model for the currently used extruder) + // 2) Current filament config index (to identify the PA model for the currently used filament and its extruder variant) // 3) mm3_per_mm value (to then multiply by the final model print speed after slowdown for cooling is applied) // 4) the current acceleration (to pass to the model for evaluation) // 5) whether this is an external perimeter (for future use) @@ -8489,7 +8479,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, if (m_multi_flow_segment_path_average_mm3_per_mm > 0) { sprintf(buf, ";%sT%u MM3MM:%g ACCEL:%u BR:%d RC:%d OV:%d\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::PA_Change).c_str(), - m_writer.filament()->id(), + pa_config_index, m_multi_flow_segment_path_average_mm3_per_mm, acceleration_i, ((path.role() == erBridgeInfill) ||(path.role() == erOverhangPerimeter)), @@ -8502,7 +8492,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, // to issue a zero flow PA change command for this sprintf(buf, ";%sT%u MM3MM:%g ACCEL:%u BR:%d RC:%d OV:%d\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::PA_Change).c_str(), - m_writer.filament()->id(), + pa_config_index, _mm3_per_mm, acceleration_i, ((path.role() == erBridgeInfill) ||(path.role() == erOverhangPerimeter)), @@ -8610,11 +8600,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, // or a flow change, so emit the flag to evaluate PA for the upcomming extrusion // Emit tag before new speed is set so the post processor reads the next speed immediately and uses it. // Dont emit tag if it has just already been emitted from a role change above - if(_mm3_per_mm >0 && - FILAMENT_CONFIG(adaptive_pressure_advance) && - FILAMENT_CONFIG(enable_pressure_advance) && - FILAMENT_CONFIG(adaptive_pressure_advance_overhangs) && - !evaluate_adaptive_pa){ + if(_mm3_per_mm >0 && adaptive_pa_overhangs && !evaluate_adaptive_pa){ if(writer().get_current_speed() > F){ // Ramping down speed - use overhang logic where the minimum speed is used between current and upcoming extrusion if(m_config.gcode_comments){ sprintf(buf, "; Ramp down-non-variable\n"); @@ -8622,7 +8608,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, } sprintf(buf, ";%sT%u MM3MM:%g ACCEL:%u BR:%d RC:%d OV:%d\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::PA_Change).c_str(), - m_writer.filament()->id(), + pa_config_index, _mm3_per_mm, acceleration_i, ((path.role() == erBridgeInfill) ||(path.role() == erOverhangPerimeter)), @@ -8637,7 +8623,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, } sprintf(buf, ";%sT%u MM3MM:%g ACCEL:%u BR:%d RC:%d OV:%d\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::PA_Change).c_str(), - m_writer.filament()->id(), + pa_config_index, _mm3_per_mm, acceleration_i, ((path.role() == erBridgeInfill) ||(path.role() == erOverhangPerimeter)), @@ -8843,10 +8829,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, // ORCA: Adaptive PA code segment when adjusting PA within the same feature // There is a speed change or flow change so emit the flag to evaluate PA for the upcomming extrusion // Emit tag before new speed is set so the post processor reads the next speed immediately and uses it. - if(_mm3_per_mm >0 && - EXTRUDER_CONFIG(adaptive_pressure_advance) && - EXTRUDER_CONFIG(enable_pressure_advance) && - EXTRUDER_CONFIG(adaptive_pressure_advance_overhangs) ){ + if(_mm3_per_mm >0 && adaptive_pa_overhangs){ if(last_set_speed > new_speed){ // Ramping down speed - use overhang logic where the minimum speed is used between current and upcoming extrusion if(m_config.gcode_comments) { sprintf(buf, "; Ramp up-variable\n"); @@ -8854,7 +8837,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, } sprintf(buf, ";%sT%u MM3MM:%g ACCEL:%u BR:%d RC:%d OV:%d\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::PA_Change).c_str(), - m_writer.filament()->id(), + pa_config_index, _mm3_per_mm, acceleration_i, ((path.role() == erBridgeInfill) ||(path.role() == erOverhangPerimeter)), @@ -8869,7 +8852,7 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description, } sprintf(buf, ";%sT%u MM3MM:%g ACCEL:%u BR:%d RC:%d OV:%d\n", GCodeProcessor::reserved_tag(GCodeProcessor::ETags::PA_Change).c_str(), - m_writer.filament()->id(), + pa_config_index, _mm3_per_mm, acceleration_i, ((path.role() == erBridgeInfill) ||(path.role() == erOverhangPerimeter)), @@ -9422,33 +9405,29 @@ void GCode::update_placeholder_parser_with_variant_params() if (num_filaments == 0) return; - // Helpers: remap config arrays from variant index space to filament_id index space. + // Helper: remap config arrays from variant index space to filament_id index space. // After remapping, gcode templates can use param[filament_id] directly. - auto remap_floats_by_filament = [&](const auto &src) { - std::vector dst(num_filaments); - for (size_t i = 0; i < num_filaments; ++i) - dst[i] = src.get_at(get_filament_config_index(i)); - return dst; - }; - auto remap_ints_by_filament = [&](const auto &src) { - std::vector dst(num_filaments); + auto remap_by_filament = [&](const auto &src) { + std::decay_t dst(num_filaments); for (size_t i = 0; i < num_filaments; ++i) dst[i] = src.get_at(get_filament_config_index(i)); return dst; }; // --- filament_options_with_variant: gcode indexes by filament_id --- - this->placeholder_parser().set("filament_max_volumetric_speed", new ConfigOptionFloats(remap_floats_by_filament(m_config.filament_max_volumetric_speed))); - this->placeholder_parser().set("filament_pre_cooling_temperature", new ConfigOptionInts(remap_ints_by_filament(m_config.filament_pre_cooling_temperature))); - this->placeholder_parser().set("filament_pre_cooling_temperature_nc", new ConfigOptionInts(remap_ints_by_filament(m_config.filament_pre_cooling_temperature_nc))); - this->placeholder_parser().set("filament_cooling_before_tower", new ConfigOptionFloats(remap_floats_by_filament(m_config.filament_cooling_before_tower))); - this->placeholder_parser().set("nozzle_temperature_initial_layer", new ConfigOptionInts(remap_ints_by_filament(m_config.nozzle_temperature_initial_layer))); - this->placeholder_parser().set("nozzle_temperature", new ConfigOptionInts(remap_ints_by_filament(m_config.nozzle_temperature))); + this->placeholder_parser().set("filament_max_volumetric_speed", new ConfigOptionFloats(remap_by_filament(m_config.filament_max_volumetric_speed))); + this->placeholder_parser().set("filament_pre_cooling_temperature", new ConfigOptionInts(remap_by_filament(m_config.filament_pre_cooling_temperature))); + this->placeholder_parser().set("filament_pre_cooling_temperature_nc", new ConfigOptionInts(remap_by_filament(m_config.filament_pre_cooling_temperature_nc))); + this->placeholder_parser().set("filament_cooling_before_tower", new ConfigOptionFloats(remap_by_filament(m_config.filament_cooling_before_tower))); + this->placeholder_parser().set("nozzle_temperature_initial_layer", new ConfigOptionInts(remap_by_filament(m_config.nozzle_temperature_initial_layer))); + this->placeholder_parser().set("nozzle_temperature", new ConfigOptionInts(remap_by_filament(m_config.nozzle_temperature))); // first_layer_temperature is a legacy alias of nozzle_temperature_initial_layer - this->placeholder_parser().set("first_layer_temperature", new ConfigOptionInts(remap_ints_by_filament(m_config.nozzle_temperature_initial_layer))); + this->placeholder_parser().set("first_layer_temperature", new ConfigOptionInts(remap_by_filament(m_config.nozzle_temperature_initial_layer))); + this->placeholder_parser().set("pressure_advance", new ConfigOptionFloats(remap_by_filament(m_config.pressure_advance))); + this->placeholder_parser().set("enable_pressure_advance", new ConfigOptionBools(remap_by_filament(m_config.enable_pressure_advance))); // --- printer_options_with_variant_1: in m_config these are already merged as filament-indexed --- - this->placeholder_parser().set("retraction_distances_when_cut", new ConfigOptionFloats(remap_floats_by_filament(m_config.retraction_distances_when_cut))); + this->placeholder_parser().set("retraction_distances_when_cut", new ConfigOptionFloats(remap_by_filament(m_config.retraction_distances_when_cut))); // hotend_cooling_rate / hotend_heating_rate: gcode uses [filament_map[x]-1] (extruder_id), no remap needed // --- filament_map: per-layer dynamic, sync from m_config to placeholder_parser --- @@ -9458,10 +9437,10 @@ void GCode::update_placeholder_parser_with_variant_params() { // Fast purge mode uses filament_flush_temp_fast; Default is inert. bool use_fast_flush = m_config.prime_volume_mode == PrimeVolumeMode::pvmFast; - auto flush_v_speed = remap_floats_by_filament(m_config.filament_flush_volumetric_speed); - auto filament_max_v = remap_floats_by_filament(m_config.filament_max_volumetric_speed); - auto flush_temps = remap_ints_by_filament(use_fast_flush ? m_config.filament_flush_temp_fast - : m_config.filament_flush_temp); + auto flush_v_speed = remap_by_filament(m_config.filament_flush_volumetric_speed); + auto filament_max_v = remap_by_filament(m_config.filament_max_volumetric_speed); + auto flush_temps = remap_by_filament(use_fast_flush ? m_config.filament_flush_temp_fast + : m_config.filament_flush_temp); for (size_t i = 0; i < num_filaments; ++i) { if (flush_v_speed[i] == 0) flush_v_speed[i] = filament_max_v[i]; @@ -9513,12 +9492,7 @@ std::string GCode::set_extruder(unsigned int new_filament_id, double print_z, bo gcode += this->placeholder_parser_process("filament_start_gcode", filament_start_gcode, new_filament_id, &config); check_add_eol(gcode); } - if (m_config.enable_pressure_advance.get_at(new_filament_id)) { - gcode += m_writer.set_pressure_advance(m_config.pressure_advance.get_at(new_filament_id)); - // Orca: Adaptive PA - // Reset Adaptive PA processor last PA value - m_pa_processor->resetPreviousPA(m_config.pressure_advance.get_at(new_filament_id)); - } + gcode += set_filament_pressure_advance(new_filament_id); gcode += m_writer.toolchange(new_filament_id, new_extruder_id); if (Extruder *fil = m_writer.filament()) @@ -9909,18 +9883,24 @@ std::string GCode::set_extruder(unsigned int new_filament_id, double print_z, bo if (m_ooze_prevention.enable && !defer_temp_wait) gcode += m_ooze_prevention.post_toolchange(*this); - if (m_config.enable_pressure_advance.get_at(new_filament_id)) { - gcode += m_writer.set_pressure_advance(m_config.pressure_advance.get_at(new_filament_id)); - // Orca: Adaptive PA - // Reset Adaptive PA processor last PA value - m_pa_processor->resetPreviousPA(m_config.pressure_advance.get_at(new_filament_id)); - } + gcode += set_filament_pressure_advance(new_filament_id); //Orca: tool changer or IDEX's firmware may change Z position, so we set it to unknown/undefined m_last_pos_defined = false; return gcode; } +std::string GCode::set_filament_pressure_advance(unsigned int filament_id) +{ + const size_t fi = get_filament_config_index(filament_id); + if (!m_config.enable_pressure_advance.get_at(fi)) + return {}; + // Orca: Adaptive PA + // Reset Adaptive PA processor last PA value + m_pa_processor->resetPreviousPA(m_config.pressure_advance.get_at(fi)); + return m_writer.set_pressure_advance(m_config.pressure_advance.get_at(fi)); +} + inline std::string polygon_to_string(const Polygon &polygon, Print *print, bool is_print_space = false) { std::ostringstream gcode; gcode << "["; diff --git a/src/libslic3r/GCode.hpp b/src/libslic3r/GCode.hpp index 41986cc1d6..bded77d9d1 100644 --- a/src/libslic3r/GCode.hpp +++ b/src/libslic3r/GCode.hpp @@ -281,6 +281,8 @@ public: // extra_retract forwards a PETG pre-extrusion over-extrusion; default 0 -> identical to the plain deretract. std::string unretract(float extra_retract = 0.f) { return m_writer.unlift() + m_writer.unretract(extra_retract); } std::string set_extruder(unsigned int extruder_id, double print_z, bool by_object=false, int toolchange_temp_override = -1, bool defer_temp_wait = false); + // Sets the pressure advance of the filament's extruder variant, if enabled for it. + std::string set_filament_pressure_advance(unsigned int filament_id); bool is_BBL_Printer(); WipeTowerType wipe_tower_type(); diff --git a/src/libslic3r/GCode/AdaptivePAProcessor.cpp b/src/libslic3r/GCode/AdaptivePAProcessor.cpp index 80d6b034ad..8145db3b9f 100644 --- a/src/libslic3r/GCode/AdaptivePAProcessor.cpp +++ b/src/libslic3r/GCode/AdaptivePAProcessor.cpp @@ -21,38 +21,30 @@ namespace Slic3r { * * @param gcodegen A reference to the GCode object that generates the G-code. */ -AdaptivePAProcessor::AdaptivePAProcessor(GCode &gcodegen, const std::vector &tools_used) +AdaptivePAProcessor::AdaptivePAProcessor(GCode &gcodegen) : m_gcodegen(gcodegen), m_config(gcodegen.config()), m_last_predicted_pa(0.0), m_max_next_feedrate(0.0), m_next_feedrate(0.0), m_current_feedrate(0.0), - m_last_extruder_id(-1), + m_last_config_index(-1), m_pa_change_pattern(R"(; PA_CHANGE:T(\d+) MM3MM:([0-9]*\.[0-9]+) ACCEL:(\d+) BR:(\d+) RC:(\d+) OV:(\d+))"), m_g1_f_pattern(R"(G1 F([0-9]+))") { - // Constructor body can be used for further initialization if necessary - for (unsigned int tool : tools_used) { - // Only enable model for the tool if both PA and adaptive PA options are enabled - if(m_config.adaptive_pressure_advance.get_at(tool) && m_config.enable_pressure_advance.get_at(tool)){ - auto interpolator = std::make_unique(); - // Get calibration values from extruder - std::string pa_calibration_values = m_config.adaptive_pressure_advance_model.get_at(tool); - // Setup the model and store it in the tool-interpolation model map - interpolator->parseAndSetData(pa_calibration_values); - m_AdaptivePAInterpolators[tool] = std::move(interpolator); - } - } } -// Method to get the interpolator for a specific tool ID -AdaptivePAInterpolator* AdaptivePAProcessor::getInterpolator(unsigned int tool_id) { - auto it = m_AdaptivePAInterpolators.find(tool_id); - if (it != m_AdaptivePAInterpolators.end()) { - return it->second.get(); +// Method to get the interpolator for a specific filament config index. +// The model is built the first time an index is requested, as the indices in use depend on +// the extruder variant each filament prints with. +AdaptivePAInterpolator* AdaptivePAProcessor::getInterpolator(unsigned int config_index) { + auto [it, inserted] = m_AdaptivePAInterpolators.try_emplace(config_index); + // Only enable model for the index if both PA and adaptive PA options are enabled + if (inserted && m_config.adaptive_pressure_advance.get_at(config_index) && m_config.enable_pressure_advance.get_at(config_index)) { + it->second = std::make_unique(); + it->second->parseAndSetData(m_config.adaptive_pressure_advance_model.get_at(config_index)); } - return nullptr; // Handle the case where the tool_id was not found + return it->second.get(); } /** @@ -108,16 +100,17 @@ std::string AdaptivePAProcessor::process_layer(std::string &&gcode) { // the PA for that material is set. As no tag below will be found for this extruder, the original PA is retained. if (line.find("; PA_CHANGE") == 0) { // prune lines quickly before running regex check as regex is more expensive to run if (std::regex_search(line, m_match, m_pa_change_pattern)) { - int extruder_id = std::stoi(m_match[1].str()); + // The tag carries the filament config index, which selects the PA settings of the filament's extruder variant + int config_index = std::stoi(m_match[1].str()); mm3mm_value = std::stod(m_match[2].str()); accel_value = std::stod(m_match[3].str()); int isBridge = std::stoi(m_match[4].str()); int roleChange = std::stoi(m_match[5].str()); int isOverhang = std::stoi(m_match[6].str()); - // Check if the extruder ID has changed - bool extruder_changed = (extruder_id != m_last_extruder_id); - m_last_extruder_id = extruder_id; + // Check if the filament config index has changed + bool config_index_changed = (config_index != m_last_config_index); + m_last_config_index = config_index; // Save the PA_CHANGE line to output later after finding feedrate pa_change_line = line; @@ -212,23 +205,23 @@ std::string AdaptivePAProcessor::process_layer(std::string &&gcode) { // Calculate the predicted PA using the upcomming feature maximum feedrate // Get the interpolator for the active tool - AdaptivePAInterpolator* interpolator = getInterpolator(m_last_extruder_id); + AdaptivePAInterpolator* interpolator = getInterpolator(m_last_config_index); double predicted_pa = 0; double adaptive_PA_speed = 0; if(!interpolator){ // Tool not found in the interpolator map // Tool not found in the PA interpolator to tool map - predicted_pa = m_config.enable_pressure_advance.get_at(m_last_extruder_id) ? m_config.pressure_advance.get_at(m_last_extruder_id) : 0; + predicted_pa = m_config.enable_pressure_advance.get_at(m_last_config_index) ? m_config.pressure_advance.get_at(m_last_config_index) : 0; if(m_config.gcode_comments) output << "; APA: Tool doesnt have APA enabled\n"; - } else if (!interpolator->isInitialised() || (!m_config.adaptive_pressure_advance.get_at(m_last_extruder_id)) ) + } else if (!interpolator->isInitialised() || (!m_config.adaptive_pressure_advance.get_at(m_last_config_index)) ) // Check if the model is not initialised by the constructor for the active extruder // Also check that adaptive PA is enabled for that extruder. This should not be needed // as the PA change flag should not be set upstream (in the GCode.cpp file) if adaptive PA is disabled // however check for robustness sake. { // Model failed or adaptive pressure advance not enabled - use default value from m_config - predicted_pa = m_config.enable_pressure_advance.get_at(m_last_extruder_id) ? m_config.pressure_advance.get_at(m_last_extruder_id) : 0; + predicted_pa = m_config.enable_pressure_advance.get_at(m_last_config_index) ? m_config.pressure_advance.get_at(m_last_config_index) : 0; if(m_config.gcode_comments) output << "; APA: Interpolator setup failed, using default pressure advance\n"; } else { // Model setup succeeded // Proceed to identify the print speed to use to calculate the adaptive PA value @@ -249,18 +242,18 @@ std::string AdaptivePAProcessor::process_layer(std::string &&gcode) { predicted_pa = (*interpolator)(mm3mm_value * adaptive_PA_speed, accel_value); // This is a bridge, use the dedicated PA setting. - if(isBridge && m_config.adaptive_pressure_advance_bridges.get_at(m_last_extruder_id) > EPSILON) - predicted_pa = m_config.adaptive_pressure_advance_bridges.get_at(m_last_extruder_id); + if(isBridge && m_config.adaptive_pressure_advance_bridges.get_at(m_last_config_index) > EPSILON) + predicted_pa = m_config.adaptive_pressure_advance_bridges.get_at(m_last_config_index); if (predicted_pa < 0) { // If extrapolation fails, fall back to the default PA for the extruder. - predicted_pa = m_config.enable_pressure_advance.get_at(m_last_extruder_id) ? m_config.pressure_advance.get_at(m_last_extruder_id) : 0; + predicted_pa = m_config.enable_pressure_advance.get_at(m_last_config_index) ? m_config.pressure_advance.get_at(m_last_config_index) : 0; if(m_config.gcode_comments) output << "; APA: Interpolation failed, using fallback pressure advance value\n"; } } if(m_config.gcode_comments) { // Output debug GCode comments output << pa_change_line << '\n'; // Output PA change command tag - if(isBridge && m_config.adaptive_pressure_advance_bridges.get_at(m_last_extruder_id) > EPSILON) + if(isBridge && m_config.adaptive_pressure_advance_bridges.get_at(m_last_config_index) > EPSILON) output << "; APA Model Override (bridge)\n"; output << "; APA Current Speed: " << std::to_string(m_current_feedrate) << "\n"; output << "; APA Next Speed: " << std::to_string(m_next_feedrate) << "\n"; @@ -269,7 +262,7 @@ std::string AdaptivePAProcessor::process_layer(std::string &&gcode) { output << "; APA Flow rate: " << std::to_string(mm3mm_value * m_max_next_feedrate) << "\n"; output << "; APA Prev PA: " << std::to_string(m_last_predicted_pa) << " New PA: " << std::to_string(predicted_pa) << "\n"; } - if (extruder_changed || std::fabs(predicted_pa - m_last_predicted_pa) > EPSILON) { + if (config_index_changed || std::fabs(predicted_pa - m_last_predicted_pa) > EPSILON) { output << m_gcodegen.writer().set_pressure_advance(predicted_pa); // Use m_writer to set pressure advance m_last_predicted_pa = predicted_pa; // Update the last predicted PA value } diff --git a/src/libslic3r/GCode/AdaptivePAProcessor.hpp b/src/libslic3r/GCode/AdaptivePAProcessor.hpp index 33d4c26d24..01aa2f1104 100644 --- a/src/libslic3r/GCode/AdaptivePAProcessor.hpp +++ b/src/libslic3r/GCode/AdaptivePAProcessor.hpp @@ -11,7 +11,6 @@ #include #include #include -#include #include "AdaptivePAInterpolator.hpp" namespace Slic3r { @@ -33,7 +32,7 @@ public: * * @param gcodegen A reference to the GCode object that generates the G-code. */ - AdaptivePAProcessor(GCode &gcodegen, const std::vector &tools_used); + AdaptivePAProcessor(GCode &gcodegen); /** * @brief Processes a layer of G-code and applies adaptive pressure advance. @@ -70,28 +69,25 @@ public: private: GCode &m_gcodegen; ///< Reference to the GCode object. - std::unordered_map> m_AdaptivePAInterpolators; ///< Map between Interpolator objects and tool ID's + std::unordered_map> m_AdaptivePAInterpolators; ///< Map between Interpolator objects and filament config indices (null when adaptive PA is off) const PrintConfig &m_config; ///< Reference to the print configuration. double m_last_predicted_pa; ///< Last predicted pressure advance value. double m_max_next_feedrate; ///< Maximum feed rate (speed) for the upcomming island. If no speed is found, the previous island speed is used. double m_next_feedrate; ///< First feed rate (speed) for the upcomming island. double m_current_feedrate; ///< Current, latest feedrate. - int m_last_extruder_id; ///< Last used extruder ID. + int m_last_config_index; ///< Filament config index of the last PA_CHANGE tag. std::regex m_pa_change_pattern; ///< Regular expression to detect PA_CHANGE pattern. std::regex m_g1_f_pattern; ///< Regular expression to detect G1 F pattern. std::smatch m_match; ///< Match results for regular expressions. /** - * @brief Get the PA interpolator attached to the specified tool ID. + * @brief Get the PA interpolator attached to the specified filament config index. * - * This method manually sets the adaptive PA internally held value. - * Call this when changing tools or in any other case where the internally assumed last PA value may be incorrect - * - * @param An integer with the tool ID for which the PA interpolation model is to be returned. - * @return The Adaptive PA Interpolator object corresponding to that tool. + * @param config_index The filament config index (one per filament and extruder variant) for which the PA interpolation model is to be returned. + * @return The Adaptive PA Interpolator object corresponding to that index, or nullptr when adaptive PA is off for it. */ - AdaptivePAInterpolator* getInterpolator(unsigned int tool_id); + AdaptivePAInterpolator* getInterpolator(unsigned int config_index); }; } // namespace Slic3r diff --git a/src/libslic3r/Print.cpp b/src/libslic3r/Print.cpp index b708b759b2..be4e217d5c 100644 --- a/src/libslic3r/Print.cpp +++ b/src/libslic3r/Print.cpp @@ -2439,12 +2439,18 @@ StringObjectException Print::validate(std::vector *warnin if (m_default_region_config.precise_outer_wall && m_default_region_config.wall_sequence != WallSequence::InnerOuter) warn(L("The precise wall option will be ignored for outer-inner or inner-outer-inner wall sequences."), "precise_outer_wall"); - // check adaptive pressure advance model - for (unsigned int extruder_id : extruders) { - if (m_config.adaptive_pressure_advance.get_at(extruder_id) && - m_config.enable_pressure_advance.get_at(extruder_id)) { - - const std::string pa_model = m_config.adaptive_pressure_advance_model.get_at(extruder_id); + // check adaptive pressure advance model of every extruder variant column of the used filaments + const std::vector &self_index = m_config.filament_self_index.values; + const size_t pa_columns = std::max(m_config.adaptive_pressure_advance_model.size(), size_t(extruders.back()) + 1); + for (size_t column = 0; column < pa_columns; ++column) { + // filament_self_index maps a column to its filament once the filament arrays hold one column per variant + const unsigned int filament_id = self_index.size() == pa_columns ? self_index[column] - 1 : column; + if (!std::binary_search(extruders.begin(), extruders.end(), filament_id)) + continue; + if (m_config.adaptive_pressure_advance.get_at(column) && + m_config.enable_pressure_advance.get_at(column)) { + + const std::string pa_model = m_config.adaptive_pressure_advance_model.get_at(column); if (!pa_model.empty()) { std::string validation_error = AdaptivePAProcessor::validate_adaptive_pa_model(pa_model); if (!validation_error.empty()) { diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 440f3e761a..1202477b6a 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -9403,6 +9403,22 @@ void PrintConfigDef::handle_legacy_composite(DynamicPrintConfig &config) } config.set_key_value("wiping_volumes_use_custom_matrix", new ConfigOptionBool(custom)); } + + // Orca: a config saved before a key joined filament_options_with_variant stores it once per filament + // rather than once per filament variant. Give every variant of a filament that filament's value. + if (auto *self_index = config.option("filament_self_index"); self_index && !self_index->empty()) { + const int filament_count = *std::max_element(self_index->values.begin(), self_index->values.end()); + if (filament_count > 0 && size_t(filament_count) < self_index->size()) { + for (const std::string &key : filament_options_with_variant) { + auto *opt = dynamic_cast(config.option(key)); + if (!opt || opt->size() != size_t(filament_count)) + continue; + std::unique_ptr per_filament(opt->clone()); + for (size_t variant = 0; variant < self_index->size(); ++variant) + opt->set_at(per_filament.get(), variant, self_index->values[variant] - 1); + } + } + } } const PrintConfigDef print_config_def; @@ -9505,6 +9521,13 @@ std::set filament_options_with_variant = { "filament_ironing_spacing", "filament_ironing_inset", "filament_ironing_speed", + // Orca: pressure advance + "enable_pressure_advance", + "pressure_advance", + "adaptive_pressure_advance", + "adaptive_pressure_advance_model", + "adaptive_pressure_advance_overhangs", + "adaptive_pressure_advance_bridges", "activate_air_filtration", "activate_air_filtration_during_print", "activate_air_filtration_on_completion", diff --git a/src/slic3r/GUI/ConfigManipulation.cpp b/src/slic3r/GUI/ConfigManipulation.cpp index 5a58ec7b6c..cc687ff84a 100644 --- a/src/slic3r/GUI/ConfigManipulation.cpp +++ b/src/slic3r/GUI/ConfigManipulation.cpp @@ -171,14 +171,16 @@ void ConfigManipulation::check_adaptive_pressure_advance_model(DynamicPrintConfi return; const auto* model = config->option("adaptive_pressure_advance_model"); - if (model == nullptr || model->values.empty()) + if (model == nullptr) return; - std::string raw_model; - for (const std::string& chunk : model->values) - raw_model += chunk; - - std::string error = AdaptivePAProcessor::validate_adaptive_pa_model(raw_model); + // Each extruder variant holds its own model. + std::string error; + for (const std::string& variant_model : model->values) { + error = AdaptivePAProcessor::validate_adaptive_pa_model(variant_model); + if (!error.empty()) + break; + } if (!error.empty()) { wxString msg_text = _L("Adaptive Pressure Advance model validation failed:\n"); msg_text += from_u8(error); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index c95d94aba6..1fd68fa233 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -286,6 +286,30 @@ static void set_config_values(DynamicPrintConfig *config, const std::string &key } } +// Orca: a calibration print sets pressure advance explicitly to 0 on each extruder variant that +// has it disabled, so the value stored in the printer does not skew the result. Variants with +// pressure advance enabled keep their own value. +static void zero_pressure_advance_where_disabled(DynamicPrintConfig *filament_config) +{ + auto enable_pa = filament_config->option("enable_pressure_advance"); + auto pa = filament_config->option("pressure_advance"); + auto adaptive_pa = filament_config->option("adaptive_pressure_advance"); + if (!enable_pa || !pa || !adaptive_pa || pa->empty() || adaptive_pa->empty()) + return; + // All variant keys share the variant count; widen a short one rather than index past it. + if (pa->size() < enable_pa->size()) + pa->resize(enable_pa->size()); + if (adaptive_pa->size() < enable_pa->size()) + adaptive_pa->resize(enable_pa->size()); + for (size_t variant = 0; variant < enable_pa->size(); ++variant) { + if (enable_pa->get_at(variant)) + continue; + enable_pa->values[variant] = true; + pa->values[variant] = 0.0; + adaptive_pa->values[variant] = false; + } +} + bool Plater::has_illegal_filename_characters(const wxString& wxs_name) { std::string name = into_u8(wxs_name); @@ -17064,11 +17088,7 @@ void Plater::calib_input_shaping_freq(const Calib_Params& params) set_config_values(print_config, "default_jerk", 0); } - if (!filament_config->option("enable_pressure_advance")->get_at(0)) { - set_config_values(filament_config, "enable_pressure_advance", true); - set_config_values(filament_config, "pressure_advance", 0.0); - set_config_values(filament_config, "adaptive_pressure_advance", false); - } + zero_pressure_advance_where_disabled(filament_config); printer_config->set_key_value("resonance_avoidance", new ConfigOptionBool{false}); printer_config->set_key_value("input_shaping_emit", new ConfigOptionBool{false}); @@ -17130,11 +17150,7 @@ void Plater::calib_input_shaping_damp(const Calib_Params& params) set_config_values(print_config, "default_jerk", 0); } - if (!filament_config->option("enable_pressure_advance")->get_at(0)) { - set_config_values(filament_config, "enable_pressure_advance", true); - set_config_values(filament_config, "pressure_advance", 0.0); - set_config_values(filament_config, "adaptive_pressure_advance", false); - } + zero_pressure_advance_where_disabled(filament_config); printer_config->set_key_value("resonance_avoidance", new ConfigOptionBool{false}); printer_config->set_key_value("input_shaping_emit", new ConfigOptionBool{false}); @@ -17196,11 +17212,7 @@ void Plater::Calib_Cornering(const Calib_Params& params) set_config_values(print_config, "default_jerk", 0); } - if (!filament_config->option("enable_pressure_advance")->get_at(0)) { - set_config_values(filament_config, "enable_pressure_advance", true); - set_config_values(filament_config, "pressure_advance", 0.0); - set_config_values(filament_config, "adaptive_pressure_advance", false); - } + zero_pressure_advance_where_disabled(filament_config); printer_config->set_key_value("resonance_avoidance", new ConfigOptionBool{false}); printer_config->set_key_value("input_shaping_emit", new ConfigOptionBool{true}); diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index b5b93fca17..17ac9555dd 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -4415,15 +4415,15 @@ void TabFilament::build() optgroup->append_single_option_line("pellet_flow_coefficient", "printer_basic_information_advanced#pellet-modded-printer"); optgroup->append_single_option_line("filament_flow_ratio", "material_flow_ratio_and_pressure_advance#flow-ratio", 0); - optgroup->append_single_option_line("enable_pressure_advance", "material_flow_ratio_and_pressure_advance#pressure-advance"); - optgroup->append_single_option_line("pressure_advance", "material_flow_ratio_and_pressure_advance#pressure-advance"); + optgroup->append_single_option_line("enable_pressure_advance", "material_flow_ratio_and_pressure_advance#pressure-advance", 0); + optgroup->append_single_option_line("pressure_advance", "material_flow_ratio_and_pressure_advance#pressure-advance", 0); // Orca: adaptive pressure advance and calibration model - optgroup->append_single_option_line("adaptive_pressure_advance", "material_flow_ratio_and_pressure_advance#enable-adaptive-pressure-advance-beta"); - optgroup->append_single_option_line("adaptive_pressure_advance_overhangs", "material_flow_ratio_and_pressure_advance#enable-adaptive-pressure-advance-for-overhangs-beta"); - optgroup->append_single_option_line("adaptive_pressure_advance_bridges", "material_flow_ratio_and_pressure_advance#pressure-advance-for-bridges"); + optgroup->append_single_option_line("adaptive_pressure_advance", "material_flow_ratio_and_pressure_advance#enable-adaptive-pressure-advance-beta", 0); + optgroup->append_single_option_line("adaptive_pressure_advance_overhangs", "material_flow_ratio_and_pressure_advance#enable-adaptive-pressure-advance-for-overhangs-beta", 0); + optgroup->append_single_option_line("adaptive_pressure_advance_bridges", "material_flow_ratio_and_pressure_advance#pressure-advance-for-bridges", 0); - Option option = optgroup->get_option("adaptive_pressure_advance_model"); + Option option = optgroup->get_option("adaptive_pressure_advance_model", 0); option.opt.full_width = true; option.opt.is_code = true; option.opt.height = 15; @@ -4432,7 +4432,7 @@ void TabFilament::build() DynamicPrintConfig& filament_config = m_preset_bundle->filaments.get_edited_preset().config; update_dirty(); - if (opt_key == "adaptive_pressure_advance_model") + if (opt_key.substr(0, opt_key.find('#')) == "adaptive_pressure_advance_model") m_config_manipulation.check_adaptive_pressure_advance_model(&filament_config); on_value_change(opt_key, value); @@ -4829,8 +4829,11 @@ void TabFilament::toggle_options() } if (m_active_page->title() == L("Filament")) { - bool pa = m_config->opt_bool("enable_pressure_advance", 0); - toggle_option("pressure_advance", pa); + const int selection = m_variant_combo ? m_variant_combo->GetSelection() : 0; + const unsigned int variant_idx = (unsigned int) std::max(selection, 0); + + bool pa = m_config->opt_bool("enable_pressure_advance", variant_idx); + toggle_option("pressure_advance", pa, 0); //Orca: Enable the plates that should be visible when multi bed support is enabled or a BBL printer is selected; otherwise, enable only the plate visible for the selected bed type. DynamicConfig& proj_cfg = m_preset_bundle->project_config; @@ -4858,12 +4861,12 @@ void TabFilament::toggle_options() // Orca: adaptive pressure advance and calibration model // If PA is not enabled, disable adaptive pressure advance and hide the model section // If adaptive PA is not enabled, hide the adaptive PA model section - toggle_option("adaptive_pressure_advance", pa); - toggle_option("adaptive_pressure_advance_overhangs", pa); - bool has_adaptive_pa = m_config->opt_bool("adaptive_pressure_advance", 0); - toggle_line("adaptive_pressure_advance_overhangs", has_adaptive_pa && pa); - toggle_line("adaptive_pressure_advance_model", has_adaptive_pa && pa); - toggle_line("adaptive_pressure_advance_bridges", has_adaptive_pa && pa); + toggle_option("adaptive_pressure_advance", pa, 0); + toggle_option("adaptive_pressure_advance_overhangs", pa, 0); + bool has_adaptive_pa = m_config->opt_bool("adaptive_pressure_advance", variant_idx); + toggle_line("adaptive_pressure_advance_overhangs", has_adaptive_pa && pa, 0); + toggle_line("adaptive_pressure_advance_model", has_adaptive_pa && pa, 0); + toggle_line("adaptive_pressure_advance_bridges", has_adaptive_pa && pa, 0); bool is_pellet_printer = printer_cfg.opt_bool("pellet_modded_printer"); toggle_line("pellet_flow_coefficient", is_pellet_printer); @@ -4871,8 +4874,6 @@ void TabFilament::toggle_options() toggle_line("activate_chamber_temp_control", printer_cfg.opt_bool("support_chamber_temp_control")); - const int selection = m_variant_combo ? m_variant_combo->GetSelection() : 0; - const unsigned int variant_idx = (unsigned int) std::max(selection, 0); std::string volumetric_speed_cos = m_config->opt_string("volumetric_speed_coefficients", variant_idx); bool enable_fit = volumetric_speed_cos != "0 0 0 0 0 0"; toggle_option("filament_adaptive_volumetric_speed", enable_fit, 256 + variant_idx); diff --git a/tests/fff_print/test_multifilament.cpp b/tests/fff_print/test_multifilament.cpp index 2a73dcac83..c39efaccf5 100644 --- a/tests/fff_print/test_multifilament.cpp +++ b/tests/fff_print/test_multifilament.cpp @@ -768,3 +768,128 @@ TEST_CASE("Each filament prints with its variant of the extruder's variant strin CHECK(gcode.find("; nozzle_temperature = " + resolved + "\n") != std::string::npos); } } + +// An adaptive pressure advance model predicting the same pressure advance at every flow and acceleration. +static std::string constant_pressure_advance_model(const std::string &pa) +{ + return pa + ",1,1000\n" + pa + ",500,1000\n" + pa + ",1,100000\n" + pa + ",500,100000"; +} + +// The pressure advance values a Klipper G-code sets. +static std::set pressure_advance_values(const std::string &gcode) +{ + const std::string token = "SET_PRESSURE_ADVANCE ADVANCE="; + std::set values; + std::istringstream stream(gcode); + for (std::string line; std::getline(stream, line);) + if (line.rfind(token, 0) == 0) + values.insert(line.substr(token.size(), line.find(';') - token.size())); + return values; +} + +// Pressure advance, and the adaptive pressure advance model, are tuned per extruder variant like the +// other filament variant settings. +TEST_CASE("Each filament sets the pressure advance of its extruder variant", "[MultiFilament]") +{ + auto [nozzle_volume_type, filament, pressure_advance, adaptive_pressure_advance] = GENERATE(table({ + { nvtStandard, 1, "0.021", "0.012" }, + { nvtHighFlow, 1, "0.037", "0.034" }, + { nvtHighFlow, 2, "0.043", "0.056" }, // filament 2 defines no High Flow variant + })); + const bool adaptive = GENERATE(false, true); + DYNAMIC_SECTION(get_nozzle_volume_type_string(nozzle_volume_type) << " nozzle, filament " << filament << (adaptive ? ", adaptive" : "")) { + DynamicPrintConfig config = multifilament_config(2, { + { "gcode_flavor", "klipper" }, + { "extruder_variant_list", "Direct Drive Standard,Direct Drive High Flow" }, + // filament 1 defines Standard (0.021) and High Flow (0.037), filament 2 Standard (0.043) + { "filament_extruder_variant", "Direct Drive Standard;Direct Drive High Flow;Direct Drive Standard" }, + { "filament_self_index", "1,1,2" }, + { "enable_pressure_advance", "1,1,1" }, + { "pressure_advance", "0.021,0.037,0.043" }, + { "adaptive_pressure_advance", adaptive ? "1,1,1" : "0,0,0" }, + { "sparse_infill_filament_id", filament }, + { "internal_solid_filament_id", filament }, + { "top_surface_filament_id", filament }, + { "bottom_surface_filament_id", filament }, + { "outer_wall_filament_id", filament }, + { "inner_wall_filament_id", filament }, + { "enable_prime_tower", 0 }, + { "skirt_loops", 0 }, + { "brim_type", "no_brim" }, + // custom G-code indexes the per-filament arrays by filament + { "machine_start_gcode", "; start pressure advance {pressure_advance[initial_extruder]}" }, + }); + config.option("adaptive_pressure_advance_model")->values = { + constant_pressure_advance_model("0.012"), constant_pressure_advance_model("0.034"), constant_pressure_advance_model("0.056") }; + config.option("nozzle_volume_type", true)->values = { nozzle_volume_type }; + const std::string gcode = slice({ cube(20) }, config); + + // The toolchange sets the variant's pressure advance; with adaptive pressure advance, the + // prediction of the variant's model then replaces it. + std::set expected{ pressure_advance }; + if (adaptive) + expected.insert(adaptive_pressure_advance); + CHECK(pressure_advance_values(gcode) == expected); + CHECK(gcode.find("; start pressure advance " + pressure_advance + "\n") != std::string::npos); + } +} + +// On a printer with two extruders, a filament takes the pressure advance of the variant of the extruder +// it is mapped to, whichever filament and extruder that is. +TEST_CASE("Each filament sets the pressure advance of its extruder variant on a two-extruder printer", "[MultiFilament]") +{ + auto [filament, extruder, pressure_advance, adaptive_pressure_advance] = GENERATE(table({ + { 1, 1, "0.021", "0.012" }, + { 1, 2, "0.037", "0.034" }, + { 2, 1, "0.043", "0.056" }, + { 2, 2, "0.049", "0.078" }, + })); + const bool adaptive = GENERATE(false, true); + DYNAMIC_SECTION("filament " << filament << " on extruder " << extruder << (adaptive ? ", adaptive" : "")) { + // the other filament goes on the other extruder + const std::string filament_map = filament == 1 ? std::to_string(extruder) + "," + std::to_string(3 - extruder) : + std::to_string(3 - extruder) + "," + std::to_string(extruder); + DynamicPrintConfig config = multifilament_config(2, { + { "gcode_flavor", "klipper" }, + { "single_extruder_multi_material", 0 }, + { "nozzle_diameter", "0.4,0.4" }, + { "extruder_printable_height", "0,0" }, + // extruder 1 has a Standard nozzle, extruder 2 a High Flow one + { "printer_extruder_id", "1,2" }, + { "printer_extruder_variant", "Direct Drive Standard;Direct Drive High Flow" }, + { "extruder_variant_list", "Direct Drive Standard;Direct Drive High Flow" }, + { "filament_map", filament_map }, + // both filaments define Standard and High Flow + { "filament_extruder_variant", "Direct Drive Standard;Direct Drive High Flow;Direct Drive Standard;Direct Drive High Flow" }, + { "filament_self_index", "1,1,2,2" }, + { "enable_pressure_advance", "1,1,1,1" }, + { "pressure_advance", "0.021,0.037,0.043,0.049" }, + { "adaptive_pressure_advance", adaptive ? "1,1,1,1" : "0,0,0,0" }, + { "sparse_infill_filament_id", filament }, + { "internal_solid_filament_id", filament }, + { "top_surface_filament_id", filament }, + { "bottom_surface_filament_id", filament }, + { "outer_wall_filament_id", filament }, + { "inner_wall_filament_id", filament }, + { "enable_prime_tower", 0 }, + { "skirt_loops", 0 }, + { "brim_type", "no_brim" }, + // custom G-code indexes the per-filament arrays by filament + { "machine_start_gcode", "; start pressure advance {pressure_advance[initial_extruder]}" }, + }); + config.option("adaptive_pressure_advance_model")->values = { + constant_pressure_advance_model("0.012"), constant_pressure_advance_model("0.034"), + constant_pressure_advance_model("0.056"), constant_pressure_advance_model("0.078") }; + config.option("extruder_type", true)->values = { etDirectDrive, etDirectDrive }; + config.option("nozzle_volume_type", true)->values = { nvtStandard, nvtHighFlow }; + // keep the mapping above rather than grouping the filaments automatically + config.option>("filament_map_mode", true)->value = fmmManual; + const std::string gcode = slice({ cube(20) }, config); + + std::set expected{ pressure_advance }; + if (adaptive) + expected.insert(adaptive_pressure_advance); + CHECK(pressure_advance_values(gcode) == expected); + CHECK(gcode.find("; start pressure advance " + pressure_advance + "\n") != std::string::npos); + } +} diff --git a/tests/libslic3r/test_preset_bundle_loading.cpp b/tests/libslic3r/test_preset_bundle_loading.cpp index 6ec6ba9b1e..e71c8c5451 100644 --- a/tests/libslic3r/test_preset_bundle_loading.cpp +++ b/tests/libslic3r/test_preset_bundle_loading.cpp @@ -5482,3 +5482,39 @@ TEST_CASE("Config import confines zip entries, preset names and bundle ids to th CHECK_FALSE(any_filename_contains(temp_dir.path(), "bundle-escape")); } } + +// A project saved before a key joined filament_options_with_variant stores it once per filament, +// while the keys that were already per variant store it once per filament variant. Loading such a +// project gives every variant of a filament that filament's value. +TEST_CASE("A project saved with pressure advance per filament applies it to every variant of the filament", "[Preset][Bundle]") +{ + DynamicPrintConfig config = DynamicPrintConfig::full_print_config(); + config.opt("filament_colour")->values = { "#FF0000", "#00FF00" }; + config.opt("filament_diameter")->values = { 1.75, 1.75 }; + config.option("filament_settings_id", true)->values = { "Project PLA", "Project PETG" }; + // A multi-variant printer: full_print_config() leaves the list out, and the loader splits the + // variant keys per filament only when the project carries it. + config.option("extruder_variant_list", true)->values = { "Direct Drive Standard,Direct Drive High Flow" }; + // filament 1 defines Standard and High Flow, filament 2 Standard + config.opt("filament_extruder_variant")->values = { "Direct Drive Standard", "Direct Drive High Flow", "Direct Drive Standard" }; + config.opt("filament_self_index")->values = { 1, 1, 2 }; + config.opt("filament_flow_ratio")->values = { 0.95, 0.96, 0.97 }; // one per filament variant + // One per filament, read through the loader that project files go through. + config.load_from_ini_string("pressure_advance = 0.021,0.043", ForwardCompatibilitySubstitutionRule::Disable); + // The CLI slices the config as loaded. + check_double_vector(config.opt("pressure_advance")->values, { 0.021, 0.021, 0.043 }); + check_double_vector(config.opt("filament_flow_ratio")->values, { 0.95, 0.96, 0.97 }); + // The GUI normalizes the config before load; mirror that so only the production path runs. + Preset::normalize(config); + + PresetBundle bundle; + bundle.load_config_model("test.3mf", std::move(config)); + + REQUIRE(bundle.filament_presets.size() == 2); + const DynamicPrintConfig &pla = bundle.filaments.find_preset(bundle.filament_presets[0], false, true)->config; + const DynamicPrintConfig &petg = bundle.filaments.find_preset(bundle.filament_presets[1], false, true)->config; + check_double_vector(pla.opt("pressure_advance")->values, { 0.021, 0.021 }); + check_double_vector(petg.opt("pressure_advance")->values, { 0.043 }); + check_double_vector(pla.opt("filament_flow_ratio")->values, { 0.95, 0.96 }); + check_double_vector(petg.opt("filament_flow_ratio")->values, { 0.97 }); +} From 50eea484088ac0bad7584c59c214053931dad0e7 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 29 Sep 2026 17:52:19 +0800 Subject: [PATCH 2/4] Move Nozzle type to each extruder's settings page Editing other settings on an Extruder page of a single-extruder multi-material printer no longer triggers the nozzle diameter prompt. --- src/slic3r/GUI/Tab.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 17ac9555dd..c824c16d5d 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -5206,7 +5206,6 @@ void TabPrinter::build_fff() optgroup->append_single_option_line("adaptive_bed_mesh_margin", "printer_basic_information_adaptive_bed_mesh#mesh-margin"); optgroup = page->new_optgroup(L("Accessory"), "param_accessory"); - optgroup->append_single_option_line("nozzle_type", "printer_basic_information_accessory#nozzle-type", 0); optgroup->append_single_option_line("nozzle_hrc", "printer_basic_information_accessory#nozzle-hrc"); optgroup->append_single_option_line("auxiliary_fan", "printer_basic_information_accessory#auxiliary-part-cooling-fan"); optgroup->append_single_option_line("fan_direction"); @@ -5721,6 +5720,7 @@ if (is_marlin_flavor) auto optgroup = page->new_optgroup(L("Basic information"), L"param_information", -1, true); optgroup->append_single_option_line("nozzle_diameter", "printer_extruder_basic_information#nozzle-diameter", extruder_idx); + optgroup->append_single_option_line("nozzle_type", "printer_basic_information_accessory#nozzle-type", extruder_idx); //optgroup->append_single_option_line("nozzle_volume_type", "", extruder_idx); optgroup->append_single_option_line("nozzle_volume", "printer_extruder_basic_information#nozzle-volume", extruder_idx); @@ -5732,7 +5732,7 @@ if (is_marlin_flavor) optgroup->m_on_change = [this, extruder_idx](const t_config_option_key& opt_key, boost::any value) { bool is_SEMM = m_config->opt_bool("single_extruder_multi_material"); - if (is_SEMM && m_extruders_count > 1 && opt_key.find_first_of("nozzle_diameter") != std::string::npos) + if (is_SEMM && m_extruders_count > 1 && boost::starts_with(opt_key, "nozzle_diameter")) { SuppressBackgroundProcessingUpdate sbpu; const double new_nd = boost::any_cast(value); From 1504bd7153697144e82bd679c68b15b1ac86f9d7 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 29 Sep 2026 21:09:20 +0800 Subject: [PATCH 3/4] Fix command-line slicing when a filament leaves out a per-variant setting --- src/OrcaSlicer.cpp | 30 ++++++++++++++++ src/libslic3r/PrintConfig.cpp | 35 +++++++++++-------- src/libslic3r/PrintConfig.hpp | 5 +++ .../test_config_variant_expansion.cpp | 12 +++++++ 4 files changed, 68 insertions(+), 14 deletions(-) diff --git a/src/OrcaSlicer.cpp b/src/OrcaSlicer.cpp index 33411e2f0d..1939988261 100644 --- a/src/OrcaSlicer.cpp +++ b/src/OrcaSlicer.cpp @@ -3476,6 +3476,14 @@ int CLI::run(int argc, char **argv) } new_variant_counts = old_variant_counts; //filament_variant_count = old_variant_counts; + //ORCA: lay the per-variant options out one value per variant of the current filaments before each + // loaded filament replaces its own variants, including an option only a loaded filament + // defines, which otherwise starts as a single default value and never reaches the others. + for (const DynamicPrintConfig &config : load_filaments_config) + for (const std::string &opt_key : filament_options_with_variant) + if (opt_key != "filament_extruder_variant" && config.has(opt_key)) + m_print_config.option(opt_key, true); + normalize_filament_values_to_variants(m_print_config); for (int index = 0; index < load_filaments_config.size(); index++) { DynamicPrintConfig& config = load_filaments_config[index]; int filament_index = load_filaments_index[index]; @@ -3647,6 +3655,25 @@ int CLI::run(int argc, char **argv) } } + //ORCA: a per-variant option the loaded filament does not define keeps the values of the + // variants the filament already had, and a variant new to it takes its first one's. + const int old_start = old_start_indice[filament_index - 1]; + std::vector kept_variant_indice = new_variant_indice; + for (int &i : kept_variant_indice) + if (i < 0) + i = old_start; + for (const std::string &opt_key : filament_options_with_variant) { + if (config.has(opt_key)) + continue; + auto *opt_vec_dst = dynamic_cast(m_print_config.option(opt_key)); + if (opt_vec_dst == nullptr || opt_vec_dst->size() < size_t(old_start + old_variant_count)) + continue; + // set_with_restore_2() pads its source in place + std::unique_ptr old_values(opt_vec_dst->clone()); + opt_vec_dst->set_with_restore_2(static_cast(old_values.get()), kept_variant_indice, old_start, + old_variant_count, true); + } + //update the old index if (old_variant_count != new_variant_count) { @@ -4081,6 +4108,9 @@ int CLI::run(int argc, char **argv) if (printer_technology == ptFFF) { fff_print_config.apply(m_print_config, true); m_print_config.apply(fff_print_config, true); + //ORCA: an option no preset or project defines has just come in as its single default value, and a + // command line override may hold one value per filament. + normalize_filament_values_to_variants(m_print_config); } else { boost::nowide::cerr << "invalid printer_technology " << std::endl; record_exit_reson(outfile_dir, CLI_INVALID_PRINTER_TECH, 0, cli_errors[CLI_INVALID_PRINTER_TECH], sliced_info); diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 1202477b6a..16a913a85f 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -9405,20 +9405,8 @@ void PrintConfigDef::handle_legacy_composite(DynamicPrintConfig &config) } // Orca: a config saved before a key joined filament_options_with_variant stores it once per filament - // rather than once per filament variant. Give every variant of a filament that filament's value. - if (auto *self_index = config.option("filament_self_index"); self_index && !self_index->empty()) { - const int filament_count = *std::max_element(self_index->values.begin(), self_index->values.end()); - if (filament_count > 0 && size_t(filament_count) < self_index->size()) { - for (const std::string &key : filament_options_with_variant) { - auto *opt = dynamic_cast(config.option(key)); - if (!opt || opt->size() != size_t(filament_count)) - continue; - std::unique_ptr per_filament(opt->clone()); - for (size_t variant = 0; variant < self_index->size(); ++variant) - opt->set_at(per_filament.get(), variant, self_index->values[variant] - 1); - } - } - } + // rather than once per filament variant, and one exported by an older CLI may store a single value. + normalize_filament_values_to_variants(config); } const PrintConfigDef print_config_def; @@ -10735,6 +10723,25 @@ void set_variant_override(ConfigOptionVectorBase &target, const ConfigOptionVect target.set_to_index(&source, indices, stride); } +void normalize_filament_values_to_variants(DynamicPrintConfig &config) +{ + const auto *self_index = config.option("filament_self_index"); + if (self_index == nullptr || self_index->empty()) + return; + const int filament_count = *std::max_element(self_index->values.begin(), self_index->values.end()); + if (filament_count <= 0 || size_t(filament_count) >= self_index->size()) + return; + for (const std::string &key : filament_options_with_variant) { + auto *opt = dynamic_cast(config.option(key)); + if (opt == nullptr || (opt->size() != size_t(filament_count) && opt->size() != 1)) + continue; + std::unique_ptr per_filament(opt->clone()); + // set_at() takes the first value for a filament past the end of a single-value vector + for (size_t variant = 0; variant < self_index->size(); ++variant) + opt->set_at(per_filament.get(), variant, self_index->values[variant] - 1); + } +} + //used for object/region config //use the smallest of multiple to single diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 8b61280979..1e91f2e451 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -884,6 +884,11 @@ extern std::set empty_options; void set_variant_override(ConfigOptionVectorBase &target, const ConfigOptionVectorBase &source, const std::vector &variant_index, int stride = 1); +// Orca: lays every filament_options_with_variant option out one value per filament variant, as +// filament_self_index maps the variants to filaments. An option holding one value per filament, or a +// single value, gives every variant of a filament that filament's value; other lengths are left alone. +void normalize_filament_values_to_variants(DynamicPrintConfig &config); + extern std::set filament_dev_options; extern void update_static_print_config_from_dynamic(ConfigBase& config, const DynamicPrintConfig& dest_config, std::vector variant_index, std::set& key_set1, int stride = 1); diff --git a/tests/libslic3r/test_config_variant_expansion.cpp b/tests/libslic3r/test_config_variant_expansion.cpp index e603808b54..de19e8219c 100644 --- a/tests/libslic3r/test_config_variant_expansion.cpp +++ b/tests/libslic3r/test_config_variant_expansion.cpp @@ -717,3 +717,15 @@ TEST_CASE("get_index_for_extruder scales the variant column by the requested str REQUIRE(col0_stride2 == 0); REQUIRE(col1_stride2 == 2); } + +// A per-variant filament option read with a single value gives it to every filament variant. A project +// exported by an older CLI holds a single value for an option no loaded preset defined, such as +// filament_ironing_flow. +TEST_CASE("A per-variant filament option read with a single value gives it to every filament variant", "[Config]") +{ + // filament 1 defines Standard and High Flow, filament 2 Standard + DynamicPrintConfig config; + config.option("filament_self_index", true)->values = {1, 1, 2}; + config.load_from_ini_string("pressure_advance = 0.021", ForwardCompatibilitySubstitutionRule::Disable); + REQUIRE(config.option("pressure_advance")->values == std::vector({0.021, 0.021, 0.021})); +} From e68694dbaf79ac3b8f534b923c95bd1b4d8f2d5f Mon Sep 17 00:00:00 2001 From: HanifKoh <76276251+HanifKoh@users.noreply.github.com> Date: Tue, 29 Sep 2026 22:30:56 +0800 Subject: [PATCH 4/4] Percent-Encode Local File URLs for Embedded Web Pages (#15961) * Percent-Encode Local File URLs for Embedded Web Pages The Home tab, setup wizard, Project tab and other embedded pages were loaded from file:// URLs built by pasting the resources path into a string. A '#', '%' or '?' in the install path was then read as a URL fragment, escape or query, so the pages failed to load, for example a portable install under D:\#OneDrive showed a directory listing instead of the setup wizard. Add file_url_from_path(), built on wxFileSystem::FileNameToURL, and use it wherever a local page or image URL is built from a path. Queries such as ?lang= are appended after the path is encoded. The wizard's printer cover images are passed to the page as file URLs too. * Encode the Login Error Page URL and Cover More Windows Path Forms The login dialog's error page was still loaded from a raw resources path; it now uses file_url_from_path like the other local pages. The Windows file URL tests now also cover a resources path joined with a forward-slash relative path, as the callers build them, and a UNC path. * Build the Flush Dialog Page URLs with the Shared Helper WipingDialog and NozzleListTable still called wxFileSystem::FileNameToURL directly. They now go through file_url_from_path like every other local page, so the URLs are built in one place. Adds a test for a resources directory with a '#' in its name, which the plugin page check did not recognise before. --- src/slic3r/GUI/GUI.cpp | 8 +++ src/slic3r/GUI/GUI.hpp | 3 + src/slic3r/GUI/MarkdownTip.cpp | 5 +- src/slic3r/GUI/Plater.cpp | 2 +- src/slic3r/GUI/PrivacyUpdateDialog.cpp | 4 +- src/slic3r/GUI/Project.cpp | 4 +- src/slic3r/GUI/ReleaseNote.cpp | 2 +- src/slic3r/GUI/WebDownPluginDlg.cpp | 4 +- src/slic3r/GUI/WebGuideDialog.cpp | 24 +++---- src/slic3r/GUI/WebUserLoginDialog.cpp | 2 +- src/slic3r/GUI/WebViewDialog.cpp | 4 +- src/slic3r/GUI/Widgets/MultiNozzleSync.cpp | 6 +- src/slic3r/GUI/Widgets/WebHosting.cpp | 11 ++- src/slic3r/GUI/Widgets/WebViewHostDialog.cpp | 4 +- src/slic3r/GUI/WipeTowerDialog.cpp | 2 +- src/slic3r/Utils/ElegooLink.cpp | 4 +- tests/slic3rutils/CMakeLists.txt | 1 + tests/slic3rutils/test_file_url.cpp | 74 ++++++++++++++++++++ tests/slic3rutils/test_plugin_host_api.cpp | 24 +++++-- 19 files changed, 137 insertions(+), 51 deletions(-) create mode 100644 tests/slic3rutils/test_file_url.cpp diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 78a511c90c..5301b91d86 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -14,6 +14,9 @@ #include #include +#include +#include + #if __APPLE__ #import #elif _WIN32 @@ -531,6 +534,11 @@ boost::filesystem::path into_path(const wxString &str) return boost::filesystem::path(str.wx_str()); } +wxString file_url_from_path(const boost::filesystem::path &path) +{ + return wxFileSystem::FileNameToURL(wxFileName(from_path(path))); +} + void about() { AboutDialog dlg; diff --git a/src/slic3r/GUI/GUI.hpp b/src/slic3r/GUI/GUI.hpp index db882b79cf..0b3ac6d7b5 100644 --- a/src/slic3r/GUI/GUI.hpp +++ b/src/slic3r/GUI/GUI.hpp @@ -76,6 +76,9 @@ std::string into_u8(const wxString &str); wxString from_path(const boost::filesystem::path &path); // boost path from wxString boost::filesystem::path into_path(const wxString &str); +// file:// URL of a local path, percent-encoded so characters such as '#', '%' and '?' stay part of the path. +// Append any query or fragment to the result. +wxString file_url_from_path(const boost::filesystem::path &path); // Display an About dialog extern void about(); diff --git a/src/slic3r/GUI/MarkdownTip.cpp b/src/slic3r/GUI/MarkdownTip.cpp index 7ffeae9e36..a22f4da87f 100644 --- a/src/slic3r/GUI/MarkdownTip.cpp +++ b/src/slic3r/GUI/MarkdownTip.cpp @@ -98,10 +98,7 @@ void MarkdownTip::LoadStyle() ph /= "tooltip/styled.html"; _data_dir = false; } - auto url = ph.string(); - std::replace(url.begin(), url.end(), '\\', '/'); - url = "file:///" + url; - _tipView->LoadURL(from_u8(url)); + _tipView->LoadURL(file_url_from_path(ph)); _lastTip.clear(); } diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index c95d94aba6..c479d1dba9 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3672,7 +3672,7 @@ void Sidebar::update_all_preset_comboboxes() wxString url = from_u8(PrintHost::get_print_host_webui(&cfg)); wxString apikey; if(url.empty()) - url = wxString::Format("file://%s/web/orca/missing_connection.html", from_u8(resources_dir())); + url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/orca/missing_connection.html"); else { const auto host_type = cfg.option>("host_type")->value; if (cfg.has("printhost_apikey") && (host_type != htSimplyPrint)) diff --git a/src/slic3r/GUI/PrivacyUpdateDialog.cpp b/src/slic3r/GUI/PrivacyUpdateDialog.cpp index c417767a42..c396e85bfe 100644 --- a/src/slic3r/GUI/PrivacyUpdateDialog.cpp +++ b/src/slic3r/GUI/PrivacyUpdateDialog.cpp @@ -57,9 +57,7 @@ PrivacyUpdateDialog::PrivacyUpdateDialog(wxWindow* parent, wxWindowID id, const fs::path ph(resources_dir()); ph /= "tooltip/privacyupdate.html"; - m_host_url = ph.string(); - std::replace(m_host_url.begin(), m_host_url.end(), '\\', '/'); - m_host_url = "file:///" + m_host_url; + m_host_url = into_u8(file_url_from_path(ph)); m_vebview_release_note->LoadURL(from_u8(m_host_url)); m_sizer_right->Add(m_vebview_release_note, 0, wxEXPAND | wxRIGHT | wxLEFT, FromDIP(15)); diff --git a/src/slic3r/GUI/Project.cpp b/src/slic3r/GUI/Project.cpp index 8d87939afc..7833cc7499 100644 --- a/src/slic3r/GUI/Project.cpp +++ b/src/slic3r/GUI/Project.cpp @@ -45,10 +45,10 @@ const std::vector license_list = { ProjectPanel::ProjectPanel(wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, long style) : wxPanel(parent, id, pos, size, style) { SetBackgroundColour(*wxWHITE); - m_project_home_url = wxString::Format("file://%s/web/model/index.html", from_u8(resources_dir())); + m_project_home_url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/model/index.html"); wxString strlang = wxGetApp().current_language_code_safe(); if (strlang != "") - m_project_home_url = wxString::Format("file://%s/web/model/index.html?lang=%s", from_u8(resources_dir()), strlang); + m_project_home_url += "?lang=" + strlang; wxBoxSizer* main_sizer = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index c8338dc79a..58b3a40ca9 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -510,7 +510,7 @@ void UpdateVersionDialog::update_version_info(wxString release_note, wxString ve out_buf->append(text, size); }, (void*) &html_source, MD_DIALECT_GITHUB | MD_FLAG_STRIKETHROUGH | MD_FLAG_WIKILINKS, 0); html_source.append(""); - m_vebview_release_note->LoadURL("file://" + (boost::filesystem::path (resources_dir()) / "web/guide/0/index.html").string()); + m_vebview_release_note->LoadURL(file_url_from_path(boost::filesystem::path(resources_dir()) / "web/guide/0/index.html")); SetMinSize(GetSize()); SetMaxSize(GetSize()); diff --git a/src/slic3r/GUI/WebDownPluginDlg.cpp b/src/slic3r/GUI/WebDownPluginDlg.cpp index dca17110f9..6358582831 100644 --- a/src/slic3r/GUI/WebDownPluginDlg.cpp +++ b/src/slic3r/GUI/WebDownPluginDlg.cpp @@ -38,9 +38,7 @@ DownPluginFrame::DownPluginFrame(GUI_App *pGUI) : wxDialog((wxWindow *) (pGUI->m // set the frame icon wxBoxSizer *topsizer = new wxBoxSizer(wxVERTICAL); - wxString TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/6/index.html").make_preferred().string()); - - TargetUrl = "file://" + TargetUrl; + wxString TargetUrl = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/guide/6/index.html"); // Create the webview m_browser = WebView::CreateWebView(this, TargetUrl); diff --git a/src/slic3r/GUI/WebGuideDialog.cpp b/src/slic3r/GUI/WebGuideDialog.cpp index 9cea8bec28..e9e74b798e 100644 --- a/src/slic3r/GUI/WebGuideDialog.cpp +++ b/src/slic3r/GUI/WebGuideDialog.cpp @@ -218,37 +218,38 @@ wxString GuideFrame::SetStartPage(GuidePage startpage, bool load) m_page = startpage; BOOST_LOG_TRIVIAL(info) << __FUNCTION__<< boost::format(" enter, load=%1%, start_page=%2%")%load%int(startpage); //wxLogMessage("GUIDE: webpage_1 %s", (boost::filesystem::path(resources_dir()) / "web\\guide\\1\\index.html").make_preferred().string().c_str() ); - wxString TargetUrl = from_u8( (boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=1").make_preferred().string() ); + const wxString guide_url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/guide/0/index.html"); + wxString TargetUrl = guide_url + "?target=1"; //wxLogMessage("GUIDE: webpage_2 %s", TargetUrl.mb_str()); if (startpage == BBL_WELCOME){ SetTitle(_L("Setup Wizard")); - TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=1").make_preferred().string()); + TargetUrl = guide_url + "?target=1"; } else if (startpage == BBL_REGION) { SetTitle(_L("Setup Wizard")); - TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=11").make_preferred().string()); + TargetUrl = guide_url + "?target=11"; } else if (startpage == BBL_MODELS) { SetTitle(_L("Setup Wizard")); - TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=21").make_preferred().string()); + TargetUrl = guide_url + "?target=21"; } else if (startpage == BBL_FILAMENTS) { SetTitle(_L("Setup Wizard")); int nSize = m_ProfileJson["model"].size(); if (nSize>0) - TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=22").make_preferred().string()); + TargetUrl = guide_url + "?target=22"; else - TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=21").make_preferred().string()); + TargetUrl = guide_url + "?target=21"; } else if (startpage == BBL_FILAMENT_ONLY) { SetTitle(""); - TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=23").make_preferred().string()); + TargetUrl = guide_url + "?target=23"; } else if (startpage == BBL_MODELS_ONLY) { SetTitle(""); - TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=24").make_preferred().string()); + TargetUrl = guide_url + "?target=24"; } else { SetTitle(_L("Setup Wizard")); - TargetUrl = from_u8((boost::filesystem::path(resources_dir()) / "web/guide/0/index.html?target=21").make_preferred().string()); + TargetUrl = guide_url + "?target=21"; } wxString strlang = wxGetApp().current_language_code_safe(); @@ -256,7 +257,6 @@ wxString GuideFrame::SetStartPage(GuidePage startpage, bool load) if (strlang != "") TargetUrl = wxString::Format("%s&lang=%s", w2s(TargetUrl), strlang); - TargetUrl = "file://" + TargetUrl; if (load) load_url(TargetUrl); @@ -1284,7 +1284,7 @@ bool GuideFrame::BuildProfileJson(const PresetBundle& bundle, bool require_all_r entry["vendor"] = vp.id; entry["nozzle_diameter"] = nozzle_str; entry["materials"] = materials_str; - entry["cover"] = cover_path.string(); + entry["cover"] = into_u8(file_url_from_path(cover_path)); entry["nozzle_selected"] = ""; entry["sub_path"] = ""; m_ProfileJson["model"].push_back(entry); @@ -1732,7 +1732,7 @@ int GuideFrame::LoadProfileFamily(std::string strVendor, std::string strFilePath cover_path = (boost::filesystem::absolute(boost::filesystem::path(resources_dir()) / "/web/image/printer/") / cover_file) .make_preferred(); } - OneModel["cover"] = cover_path.string(); + OneModel["cover"] = into_u8(file_url_from_path(cover_path)); OneModel["nozzle_selected"] = ""; diff --git a/src/slic3r/GUI/WebUserLoginDialog.cpp b/src/slic3r/GUI/WebUserLoginDialog.cpp index 829e7ef106..72860e3bdc 100644 --- a/src/slic3r/GUI/WebUserLoginDialog.cpp +++ b/src/slic3r/GUI/WebUserLoginDialog.cpp @@ -599,7 +599,7 @@ void ZUserLogin::OnScriptResponseMessage(wxCommandEvent &WXUNUSED(evt)) bool ZUserLogin::ShowErrorPage() { - wxString ErrortUrl = from_u8((boost::filesystem::path(resources_dir()) / "web\\login\\error.html").make_preferred().string()); + wxString ErrortUrl = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/login/error.html"); load_url(ErrortUrl); return true; diff --git a/src/slic3r/GUI/WebViewDialog.cpp b/src/slic3r/GUI/WebViewDialog.cpp index f20d24163c..a98b196eb1 100644 --- a/src/slic3r/GUI/WebViewDialog.cpp +++ b/src/slic3r/GUI/WebViewDialog.cpp @@ -36,10 +36,10 @@ namespace GUI { WebViewPanel::WebViewPanel(wxWindow *parent) : wxPanel(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize) { - wxString url = wxString::Format("file://%s/web/homepage/index.html", from_u8(resources_dir())); + wxString url = file_url_from_path(boost::filesystem::path(resources_dir()) / "web/homepage/index.html"); wxString strlang = wxGetApp().current_language_code_safe(); if (strlang != "") - url = wxString::Format("file://%s/web/homepage/index.html?lang=%s", from_u8(resources_dir()), strlang); + url += "?lang=" + strlang; wxBoxSizer* topsizer = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp index 42659431f0..616b8b8779 100644 --- a/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp +++ b/src/slic3r/GUI/Widgets/MultiNozzleSync.cpp @@ -1,5 +1,6 @@ #include "MultiNozzleSync.hpp" +#include "../GUI.hpp" #include "../GUI_App.hpp" #include "../I18N.hpp" #include "../Plater.hpp" @@ -21,8 +22,6 @@ #include #include -#include -#include #include #include @@ -641,8 +640,7 @@ NozzleListTable::NozzleListTable(wxWindow* parent) : wxPanel(parent,wxID_ANY,wxD m_web_view->AddScriptMessageHandler("nozzleListTable"); m_web_view->EnableContextMenu(false); fs::path filepath = fs::path(resources_dir()) / "web/flush/NozzleListTable.html"; - wxFileName fn(wxString::FromUTF8(filepath.string())); - wxString url = wxFileSystem::FileNameToURL(fn); + wxString url = file_url_from_path(filepath); m_web_view->LoadURL(url); auto sizer = new wxBoxSizer(wxVERTICAL); diff --git a/src/slic3r/GUI/Widgets/WebHosting.cpp b/src/slic3r/GUI/Widgets/WebHosting.cpp index a1b0df496a..b6af6d3a39 100644 --- a/src/slic3r/GUI/Widgets/WebHosting.cpp +++ b/src/slic3r/GUI/Widgets/WebHosting.cpp @@ -48,20 +48,19 @@ constexpr char ORCA_BRIDGE_JS[] = R"JS( wxString bootstrap_url() { - return wxString("file://") + from_u8((boost::filesystem::path(resources_dir()) / BOOTSTRAP_PAGE).make_preferred().string()); + return file_url_from_path(boost::filesystem::path(resources_dir()) / BOOTSTRAP_PAGE); } wxString content_base_url() { - const std::string dir = (boost::filesystem::path(resources_dir()) / "web").make_preferred().string(); - return wxString("file://") + from_u8(dir) + "/"; + return file_url_from_path(boost::filesystem::path(resources_dir()) / "web") + "/"; } bool is_content_url(const wxString& url) { - // The web view reports the URL it parsed, which escapes anything the resources path holds - // (a space, a non-ASCII character), while content_base_url() is the raw path. - return wxURI::Unescape(url.BeforeFirst('#')) == content_base_url(); + // The web view reports the URL it parsed, which may escape the resources path differently + // from content_base_url(). + return wxURI::Unescape(url.BeforeFirst('#')) == wxURI::Unescape(content_base_url()); } const char* orca_bridge_script() { return ORCA_BRIDGE_JS; } diff --git a/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp b/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp index e4e3d2878a..3c14ab37e1 100644 --- a/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp +++ b/src/slic3r/GUI/Widgets/WebViewHostDialog.cpp @@ -192,7 +192,7 @@ bool WebViewHostDialog::create_webview(const std::string& resource_path, wxString WebViewHostDialog::build_resource_url(const std::string& resource_path) const { - wxString target_url = from_u8((boost::filesystem::path(resources_dir()) / resource_path).make_preferred().string()); + wxString target_url = file_url_from_path(boost::filesystem::path(resources_dir()) / resource_path); if (append_language_to_url()) { const wxString lang = wxGetApp().current_language_code_safe(); @@ -202,7 +202,7 @@ wxString WebViewHostDialog::build_resource_url(const std::string& resource_path) } } - return wxString("file://") + target_url; + return target_url; } void WebViewHostDialog::load_url(const wxString& url) diff --git a/src/slic3r/GUI/WipeTowerDialog.cpp b/src/slic3r/GUI/WipeTowerDialog.cpp index 9a473c7c8a..126f090a0b 100644 --- a/src/slic3r/GUI/WipeTowerDialog.cpp +++ b/src/slic3r/GUI/WipeTowerDialog.cpp @@ -464,7 +464,7 @@ WipingDialog::WipingDialog(wxWindow* parent, const int max_flush_volume) : wxString filepath_str = from_path(filepath); wxFileName fn(filepath_str); if(fn.FileExists()) { - wxString url = wxFileSystem::FileNameToURL(fn); + wxString url = file_url_from_path(filepath); BOOST_LOG_TRIVIAL(debug) << __FUNCTION__<< "File exists and load url " << url.ToStdString(); m_webview->LoadURL(url); BOOST_LOG_TRIVIAL(debug) << __FUNCTION__<< "Successfully loaded url: " << url.ToStdString(); diff --git a/src/slic3r/Utils/ElegooLink.cpp b/src/slic3r/Utils/ElegooLink.cpp index 03b7bdc6c7..64ff4a9455 100644 --- a/src/slic3r/Utils/ElegooLink.cpp +++ b/src/slic3r/Utils/ElegooLink.cpp @@ -340,9 +340,7 @@ namespace Slic3r { if (classify_printer_model(config->opt_string("printer_model")) != ElegooPrinterType::CC2) return fallback_webui; - std::string web_path = resources_dir() + "/web/elegoolink/lan_service_web/index.html"; - std::replace(web_path.begin(), web_path.end(), '\\', '/'); - web_path = "file://" + web_path; + std::string web_path = GUI::into_u8(GUI::file_url_from_path(boost::filesystem::path(resources_dir()) / "web/elegoolink/lan_service_web/index.html")); const std::string token = get_cc2_token(config->opt_string("printhost_apikey")); const std::string host_ip = Http::get_host_header_value(host); diff --git a/tests/slic3rutils/CMakeLists.txt b/tests/slic3rutils/CMakeLists.txt index be796e814b..94ebaed35e 100644 --- a/tests/slic3rutils/CMakeLists.txt +++ b/tests/slic3rutils/CMakeLists.txt @@ -27,6 +27,7 @@ add_executable(${_TEST_NAME}_tests test_plugin_cloud_metadata.cpp test_plugin_audit.cpp test_shortcuts.cpp + test_file_url.cpp ../fff_print/test_helpers.cpp ) diff --git a/tests/slic3rutils/test_file_url.cpp b/tests/slic3rutils/test_file_url.cpp new file mode 100644 index 0000000000..484067b57e --- /dev/null +++ b/tests/slic3rutils/test_file_url.cpp @@ -0,0 +1,74 @@ +#include +#include + +#include "slic3r/GUI/GUI.hpp" + +#include + +#include + +using namespace Slic3r::GUI; + +#ifndef _WIN32 +TEST_CASE("A file URL keeps characters special to URLs in its path", "[FileUrl]") +{ + const std::string path = GENERATE(as{}, + "/opt/test#dir/resources/web/homepage/index.html", + "/opt/test%20x/resources/web/homepage/index.html", + "/opt/Orca Slicer/resources/web/homepage/index.html", + "/opt/what?/resources/web/homepage/index.html", + "/home/Jos\xC3\xA9/\xE8\xB5\x84\xE6\xBA\x90/resources/web/homepage/index.html"); + + const wxString url = file_url_from_path(boost::filesystem::path(path)); + CAPTURE(path, url.utf8_string()); + + // WebView::CreateWebView() and WebView::LoadUrl() re-parse the URL before loading it. + const wxURI uri(wxURI(url).BuildURI()); + CHECK(uri.GetScheme() == "file"); + CHECK(!uri.HasQuery()); + CHECK(!uri.HasFragment()); + CHECK(wxURI::Unescape(uri.GetPath()).utf8_string() == path); +} + +TEST_CASE("A file URL of a plain path is the path behind file://", "[FileUrl]") +{ + const std::string path = "/opt/OrcaSlicer/resources/web/homepage/index.html"; + CHECK(file_url_from_path(boost::filesystem::path(path)) == "file://" + path); +} + +TEST_CASE("A query appended to a file URL stays separate from its path", "[FileUrl]") +{ + const std::string path = "/opt/test#dir%20x/resources/web/guide/0/index.html"; + const wxURI uri(file_url_from_path(boost::filesystem::path(path)) + "?target=21&lang=de"); + CHECK(wxURI::Unescape(uri.GetPath()).utf8_string() == path); + CHECK(uri.GetQuery() == "target=21&lang=de"); + CHECK(!uri.HasFragment()); +} +#else +TEST_CASE("A file URL of a Windows path has a drive letter and forward slashes", "[FileUrl]") +{ + const auto [path, url] = GENERATE(table({ + { L"C:\\Program Files\\OrcaSlicer\\resources\\web\\homepage\\index.html", + "file:///C:/Program%20Files/OrcaSlicer/resources/web/homepage/index.html" }, + { L"D:\\#OneDrive\\OrcaSlicer\\resources\\web\\guide\\0\\index.html", + "file:///D:/%23OneDrive/OrcaSlicer/resources/web/guide/0/index.html" }, + { L"D:\\100%\\OrcaSlicer\\resources\\web\\homepage\\index.html", + "file:///D:/100%25/OrcaSlicer/resources/web/homepage/index.html" }, + // Callers join the resources directory with a forward-slash relative path. + { L"D:\\#OneDrive\\OrcaSlicer\\resources/web/homepage/index.html", + "file:///D:/%23OneDrive/OrcaSlicer/resources/web/homepage/index.html" }, + { L"\\\\server\\share\\OrcaSlicer\\resources\\web\\homepage\\index.html", + "file://server/share/OrcaSlicer/resources/web/homepage/index.html" }, + })); + CHECK(file_url_from_path(boost::filesystem::path(path)).utf8_string() == url); +} + +TEST_CASE("A query appended to a Windows file URL stays separate from its path", "[FileUrl]") +{ + const wxURI uri(file_url_from_path(boost::filesystem::path(L"D:\\#OneDrive\\OrcaSlicer\\resources\\web\\guide\\0\\index.html")) + + "?target=21&lang=de"); + CHECK(wxURI::Unescape(uri.GetPath()) == "/D:/#OneDrive/OrcaSlicer/resources/web/guide/0/index.html"); + CHECK(uri.GetQuery() == "target=21&lang=de"); + CHECK(!uri.HasFragment()); +} +#endif diff --git a/tests/slic3rutils/test_plugin_host_api.cpp b/tests/slic3rutils/test_plugin_host_api.cpp index e02864f703..0283bb5744 100644 --- a/tests/slic3rutils/test_plugin_host_api.cpp +++ b/tests/slic3rutils/test_plugin_host_api.cpp @@ -16,6 +16,8 @@ #include +#include + namespace py = pybind11; namespace { @@ -210,23 +212,33 @@ TEST_CASE("A reloaded plugin page is recognised by its base URL, fragment aside" { using namespace Slic3r::GUI::web_hosting; - // A resources path holding a space, which the web view reports escaped. + // A resources path holding a space, which the web view may report escaped differently. const Slic3r::ScopedResourcesDir resources("web content check"); // The swapped-in page, then after an in-page anchor and a reload. CHECK(is_content_url(content_base_url())); CHECK(is_content_url(content_base_url() + "#tab2")); - wxString escaped = content_base_url(); - escaped.Replace(" ", "%20"); - REQUIRE(escaped != content_base_url()); - CHECK(is_content_url(escaped)); - CHECK(is_content_url(escaped + "#tab2")); + const wxString unescaped = wxURI::Unescape(content_base_url()); + REQUIRE(unescaped != content_base_url()); + CHECK(is_content_url(unescaped)); + CHECK(is_content_url(unescaped + "#tab2")); // A page the plugin linked to keeps its own URL and must be left alone. CHECK_FALSE(is_content_url(content_base_url() + "guide.html")); CHECK_FALSE(is_content_url("https://example.com/")); CHECK_FALSE(is_content_url("")); } +TEST_CASE("A reloaded plugin page is recognised when the resources path holds a '#'", "[PluginHost]") +{ + using namespace Slic3r::GUI::web_hosting; + + const Slic3r::ScopedResourcesDir resources("web#content check"); + + CHECK(is_content_url(content_base_url())); + CHECK(is_content_url(content_base_url() + "#tab2")); + CHECK_FALSE(is_content_url(content_base_url() + "guide.html")); +} + TEST_CASE("Plugin host API exposes model geometry and structure to Python", "[PluginHost][Python]") { using Catch::Matchers::WithinAbs;