Fix + Support 'Default' filament option (index 0) (#13887)
* Support 'Default' filament option (index 0) Treat filament index 0 as the new "Default" (use active object/part filament) instead of using 1. Update config defaults and tooltips for wall/sparse/solid infill filament options (min/default -> 0, tooltip explains "Default"). Adjust normalization and propagation logic to respect explicit feature overrides and only apply base extruder when feature values are zero; only copy sparse->solid infill when sparse > 0. Introduce FeatureFilamentOverrideMask and clamp_feature_filament_to_valid to resolve and clamp feature filaments. Update UI lists and selection behavior to expose a "Default" entry and handle zero-based indices in PartPlate and Plater. * enable_filament_for_features option Co-Authored-By: LixNix <105106115+lixnix@users.noreply.github.com> * \n * Allow wipe_tower_filament to equal nozzle count Relax the assertion in Print::extruders to permit wipe_tower_filament == config().nozzle_diameter.size(). The configuration value is 1-based and the code subtracts 1 when pushing the extruder index, so equality should be valid and selecting the last nozzle should not trigger an assertion. * Revert "Allow wipe_tower_filament to equal nozzle count" This reverts commit 2c976574327a8bcdc74a1b296bf1aaff7752a94e. * Revert "enable_filament_for_features option" This reverts commit 01c13baeddb8e26793f752deab788ee4d086975b. * Migrate legacy feature filament defaults Add migration logic to convert legacy feature filament selections from 1 to 0 for older 3mf files. Introduces a local migrate_legacy_feature_filament_defaults lambda in src/OrcaSlicer.cpp and src/slic3r/GUI/Plater.cpp that scans keys (wall_filament, sparse_infill_filament, solid_infill_filament, support_filament, support_interface_filament) on configs/objects/volumes, updates values, counts conversions and logs the result. Also adds a Semver check for "2.4.0-dev" in OrcaSlicer to trigger the migration for files older than that version. This preserves expected default filament selections when loading older project files. * Update OrcaSlicer.cpp * Extract migration helper to ConfigMigrations Centralize legacy feature-filament default migration by moving the duplicated lambda into ConfigMigrations::migrate_legacy_feature_filament_defaults (src/libslic3r/Config.cpp) and declaring it in Config.hpp. Update OrcaSlicer.cpp and slic3r/GUI/Plater.cpp to call the new function instead of inline lambdas. The helper converts specific feature filament keys (wall_filament, sparse_infill_filament, solid_infill_filament, support_filament, support_interface_filament) from int 1 to 0 and returns the count of conversions to avoid duplicated migration logic. * Remove DynamicFilamentList1Based and consolidate lists Delete the specialized DynamicFilamentList1Based struct and its global instance. Update Choice registrations to use the single dynamic_filament_list for wall, sparse_infill and solid_infill filaments, and remove the extra update call for the removed instance. This consolidates filament choice handling and removes duplicated logic in Plater.cpp. * move it * fix objects * Update Config.hpp * Update profiles
This commit is contained in:
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "10000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "450",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -201,10 +201,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -271,7 +271,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.22",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "4",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "30%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "10000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "430",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "80",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "3dhoneycomb",
|
||||
"sparse_infill_speed": "180",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -201,10 +201,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -271,7 +271,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "180",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "300",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "30%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "300",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -201,10 +201,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "300",
|
||||
@@ -271,7 +271,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "350",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "80",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.62",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "30%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "300",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -201,10 +201,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "300",
|
||||
@@ -271,7 +271,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.82",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "270",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "outer wall/inner wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "300",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "30%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -201,10 +201,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -271,7 +271,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "80",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.62",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.82",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "230",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "120",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "120",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -201,10 +201,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -271,7 +271,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "120",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "30%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "10000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.62",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "80",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.62",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.82",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "80",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.62",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.82",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.82",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "80",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.62",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -212,10 +212,10 @@
|
||||
"smooth_coefficient": "40",
|
||||
"smooth_speed_discontinuity_area": "1",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "5000",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.82",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -285,7 +285,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -190,10 +190,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "450",
|
||||
@@ -251,7 +251,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
"wall_transition_angle": "10",
|
||||
|
||||
@@ -195,10 +195,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.22",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -265,7 +265,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "4",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"spiral_mode": "0",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -188,10 +188,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"spiral_mode": "0",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -187,10 +187,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"spiral_mode": "0",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -188,10 +188,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"spiral_mode": "0",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -191,10 +191,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"spiral_mode": "0",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -192,10 +192,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "270",
|
||||
@@ -251,7 +251,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
"wall_transition_angle": "10",
|
||||
|
||||
@@ -181,10 +181,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "3",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -181,10 +181,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "150",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "3",
|
||||
"wall_sequence": "outer wall/inner wall",
|
||||
|
||||
@@ -181,10 +181,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -181,10 +181,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -189,10 +189,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "25%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "270",
|
||||
@@ -251,7 +251,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
"wall_transition_angle": "10",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "230",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -195,10 +195,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.62",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -265,7 +265,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -195,10 +195,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.82",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -265,7 +265,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -188,10 +188,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -250,7 +250,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -185,10 +185,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.4",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "270",
|
||||
@@ -255,7 +255,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -196,10 +196,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.4",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "90",
|
||||
@@ -266,7 +266,7 @@
|
||||
"tree_support_wall_count": "2",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -137,10 +137,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "10%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.4",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -199,7 +199,7 @@
|
||||
"tree_support_top_rate": "30%",
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "3",
|
||||
|
||||
@@ -170,10 +170,10 @@
|
||||
"small_area_infill_flow_compensation_model": "0,0;\"\\n0.2,0.4444\";\"\\n0.4,0.6145\";\"\\n0.6,0.7059\";\"\\n0.8,0.7619\";\"\\n1.5,0.8571\";\"\\n2,0.8889\";\"\\n3,0.9231\";\"\\n5,0.9520\";\"\\n10,1\"",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "10",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.55",
|
||||
"sparse_infill_pattern": "zig-zag",
|
||||
"sparse_infill_speed": "500",
|
||||
@@ -240,7 +240,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -175,10 +175,10 @@
|
||||
"small_area_infill_flow_compensation_model": "0,0;\"\\n0.2,0.4444\";\"\\n0.4,0.6145\";\"\\n0.6,0.7059\";\"\\n0.8,0.7619\";\"\\n1.5,0.8571\";\"\\n2,0.8889\";\"\\n3,0.9231\";\"\\n5,0.9520\";\"\\n10,1\"",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "270",
|
||||
@@ -247,7 +247,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -172,10 +172,10 @@
|
||||
"small_area_infill_flow_compensation_model": "0,0;\"\\n0.2,0.4444\";\"\\n0.4,0.6145\";\"\\n0.6,0.7059\";\"\\n0.8,0.7619\";\"\\n1.5,0.8571\";\"\\n2,0.8889\";\"\\n3,0.9231\";\"\\n5,0.9520\";\"\\n10,1\"",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "10",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.55",
|
||||
"sparse_infill_pattern": "zig-zag",
|
||||
"sparse_infill_speed": "500",
|
||||
@@ -242,7 +242,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -152,10 +152,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.62",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "120",
|
||||
@@ -222,7 +222,7 @@
|
||||
"tree_support_top_rate": "30%",
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -152,10 +152,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.82",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "120",
|
||||
@@ -222,7 +222,7 @@
|
||||
"tree_support_top_rate": "30%",
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -211,10 +211,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "10%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"sparse_infill_speed": "270",
|
||||
@@ -284,7 +284,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "outer wall/inner wall",
|
||||
|
||||
@@ -144,10 +144,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.54",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "250",
|
||||
@@ -208,7 +208,7 @@
|
||||
"tree_support_top_rate": "30%",
|
||||
"tree_support_wall_count": "2",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -136,10 +136,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "20%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "gyroid",
|
||||
"sparse_infill_speed": "80",
|
||||
|
||||
@@ -147,10 +147,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "270",
|
||||
@@ -212,7 +212,7 @@
|
||||
"tree_support_top_rate": "30%",
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -121,10 +121,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"spiral_mode": "0",
|
||||
@@ -181,7 +181,7 @@
|
||||
"tree_support_tip_diameter": "0.8",
|
||||
"tree_support_top_rate": "30%",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -121,10 +121,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"spiral_mode": "0",
|
||||
@@ -181,7 +181,7 @@
|
||||
"tree_support_tip_diameter": "0.8",
|
||||
"tree_support_top_rate": "30%",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -121,10 +121,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"spiral_mode": "0",
|
||||
@@ -181,7 +181,7 @@
|
||||
"tree_support_tip_diameter": "0.8",
|
||||
"tree_support_top_rate": "30%",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -178,10 +178,10 @@
|
||||
],
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "20%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "3",
|
||||
"sparse_infill_pattern": "cubic",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -247,7 +247,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "inner wall/outer wall",
|
||||
|
||||
@@ -121,10 +121,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"spiral_mode": "0",
|
||||
@@ -181,7 +181,7 @@
|
||||
"tree_support_tip_diameter": "0.8",
|
||||
"tree_support_top_rate": "30%",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -121,10 +121,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "grid",
|
||||
"spiral_mode": "0",
|
||||
@@ -181,7 +181,7 @@
|
||||
"tree_support_tip_diameter": "0.8",
|
||||
"tree_support_top_rate": "30%",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -121,10 +121,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"spiral_mode": "0",
|
||||
@@ -181,7 +181,7 @@
|
||||
"tree_support_tip_diameter": "0.8",
|
||||
"tree_support_top_rate": "30%",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -121,10 +121,10 @@
|
||||
"slowdown_for_curled_perimeters": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"spiral_mode": "0",
|
||||
@@ -181,7 +181,7 @@
|
||||
"tree_support_tip_diameter": "0.8",
|
||||
"tree_support_top_rate": "30%",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "2",
|
||||
|
||||
@@ -117,10 +117,10 @@
|
||||
"slow_down_layers": "0",
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "100",
|
||||
@@ -171,7 +171,7 @@
|
||||
"tree_support_brim_width": "3",
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_infill_order": "inner wall/outer wall/infill",
|
||||
"wall_loops": "3",
|
||||
|
||||
@@ -186,10 +186,10 @@
|
||||
"small_perimeter_speed": "50%",
|
||||
"small_perimeter_threshold": "0",
|
||||
"solid_infill_direction": "45",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "100%",
|
||||
"sparse_infill_density": "15%",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "270",
|
||||
@@ -256,7 +256,7 @@
|
||||
"tree_support_wall_count": "0",
|
||||
"wall_direction": "auto",
|
||||
"wall_distribution_count": "1",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "classic",
|
||||
"wall_loops": "2",
|
||||
"wall_sequence": "outer wall/inner wall",
|
||||
|
||||
@@ -50,9 +50,9 @@
|
||||
"resolution": "0",
|
||||
"slice_closing_radius": "0.049",
|
||||
"small_perimeter_speed": "170",
|
||||
"solid_infill_filament": "1",
|
||||
"solid_infill_filament": "0",
|
||||
"sparse_infill_acceleration": "4000",
|
||||
"sparse_infill_filament": "1",
|
||||
"sparse_infill_filament": "0",
|
||||
"sparse_infill_line_width": "0.45",
|
||||
"sparse_infill_pattern": "crosshatch",
|
||||
"sparse_infill_speed": "200",
|
||||
@@ -85,7 +85,7 @@
|
||||
"tree_support_branch_diameter_double_wall": "3",
|
||||
"tree_support_tip_diameter": "0.8",
|
||||
"tree_support_top_rate": "30%",
|
||||
"wall_filament": "1",
|
||||
"wall_filament": "0",
|
||||
"wall_generator": "arachne",
|
||||
"wall_loops": "2"
|
||||
}
|
||||
|
||||
@@ -1591,7 +1591,7 @@ int CLI::run(int argc, char **argv)
|
||||
record_exit_reson(outfile_dir, CLI_FILE_VERSION_NOT_SUPPORTED, 0, cli_errors[CLI_FILE_VERSION_NOT_SUPPORTED], sliced_info);
|
||||
flush_and_exit(CLI_FILE_VERSION_NOT_SUPPORTED);
|
||||
}
|
||||
Semver old_version(1, 5, 9), old_version2(1, 5, 9), old_version3(2, 0, 0), old_version4(2, 2, 0);
|
||||
Semver old_version(1, 5, 9), old_version2(1, 5, 9), old_version3(2, 0, 0), old_version4(2, 2, 0), old_version5("2.4.0");
|
||||
if ((file_version < old_version) && !config.empty()) {
|
||||
translate_old = true;
|
||||
BOOST_LOG_TRIVIAL(info) << boost::format("old 3mf version %1%, need to translate")%file_version.to_string();
|
||||
@@ -1606,6 +1606,19 @@ int CLI::run(int argc, char **argv)
|
||||
BOOST_LOG_TRIVIAL(info) << boost::format("old 3mf version %1%, need to set enable_wrapping_detection to false")%file_version.to_string();
|
||||
}
|
||||
|
||||
if ((file_version < old_version5) && !config.empty()) {
|
||||
int converted_count = ConfigMigrations::migrate_legacy_feature_filament_defaults(config);
|
||||
for (ModelObject *model_object : model.objects) {
|
||||
converted_count += ConfigMigrations::migrate_legacy_feature_filament_defaults(model_object->config);
|
||||
for (ModelVolume *model_volume : model_object->volumes)
|
||||
converted_count += ConfigMigrations::migrate_legacy_feature_filament_defaults(model_volume->config);
|
||||
}
|
||||
|
||||
if (converted_count > 0) {
|
||||
BOOST_LOG_TRIVIAL(info) << boost::format("old 3mf version %1%, migrated %2% feature filament selections from 1 to 0 (Default)") % file_version.to_string() % converted_count;
|
||||
}
|
||||
}
|
||||
|
||||
if (normative_check) {
|
||||
ConfigOptionStrings* postprocess_scripts = config.option<ConfigOptionStrings>("post_process");
|
||||
if (postprocess_scripts) {
|
||||
|
||||
@@ -2968,6 +2968,34 @@ private:
|
||||
|
||||
std::ostream& operator<<(std::ostream& os, const DynamicConfig::DynamicConfigDifference& diff);
|
||||
|
||||
namespace ConfigMigrations {
|
||||
|
||||
template <typename ConfigLike>
|
||||
inline int migrate_legacy_feature_filament_defaults(ConfigLike &cfg)
|
||||
{
|
||||
static const char *feature_filament_keys[] = {
|
||||
"wall_filament",
|
||||
"sparse_infill_filament",
|
||||
"solid_infill_filament"
|
||||
};
|
||||
|
||||
int converted_count = 0;
|
||||
for (const char *key : feature_filament_keys) {
|
||||
if (!cfg.has(key))
|
||||
continue;
|
||||
|
||||
const ConfigOption *opt = cfg.option(key);
|
||||
if (opt != nullptr && opt->getInt() == 1) {
|
||||
cfg.set_key_value(key, new ConfigOptionInt(0));
|
||||
++converted_count;
|
||||
}
|
||||
}
|
||||
|
||||
return converted_count;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Configuration store with a static definition of configuration values.
|
||||
// In Slic3r, the static configuration stores are during the slicing / g-code generation for efficiency reasons,
|
||||
// because the configuration values could be accessed directly.
|
||||
|
||||
@@ -4103,13 +4103,13 @@ DynamicPrintConfig PresetBundle::full_fff_config(bool apply_extruder, std::optio
|
||||
opt->value = boost::algorithm::clamp<int>(opt->value, 0, int(num_filaments));
|
||||
}
|
||||
|
||||
static const char* keys_1based[] = {"wall_filament", "sparse_infill_filament", "solid_infill_filament"};
|
||||
for (size_t i = 0; i < sizeof(keys_1based) / sizeof(keys_1based[0]); ++ i) {
|
||||
std::string key = std::string(keys_1based[i]);
|
||||
static const char* keys_with_default[] = {"wall_filament", "sparse_infill_filament", "solid_infill_filament"};
|
||||
for (size_t i = 0; i < sizeof(keys_with_default) / sizeof(keys_with_default[0]); ++ i) {
|
||||
std::string key = std::string(keys_with_default[i]);
|
||||
auto *opt = dynamic_cast<ConfigOptionInt*>(out.option(key, false));
|
||||
assert(opt != nullptr);
|
||||
if(opt->value < 1 || opt->value > int(num_filaments))
|
||||
opt->value = 1;
|
||||
if(opt->value < 0 || opt->value > int(num_filaments))
|
||||
opt->value = 0;
|
||||
}
|
||||
out.option<ConfigOptionString >("print_settings_id", true)->value = this->prints.get_selected_preset_name();
|
||||
out.option<ConfigOptionStrings>("filament_settings_id", true)->values = this->filament_presets;
|
||||
|
||||
@@ -4021,10 +4021,10 @@ void PrintConfigDef::init_fff_params()
|
||||
def->gui_type = ConfigOptionDef::GUIType::i_enum_open;
|
||||
def->label = L("Infill");
|
||||
def->category = L("Extruders");
|
||||
def->tooltip = L("Filament to print internal sparse infill.");
|
||||
def->min = 1;
|
||||
def->tooltip = L("Filament to print internal sparse infill.\n\"Default\" uses the active object/part filament.");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionInt(1));
|
||||
def->set_default_value(new ConfigOptionInt(0));
|
||||
|
||||
def = this->add("sparse_infill_line_width", coFloatOrPercent);
|
||||
def->label = L("Sparse infill");
|
||||
@@ -4901,10 +4901,10 @@ void PrintConfigDef::init_fff_params()
|
||||
def->gui_type = ConfigOptionDef::GUIType::i_enum_open;
|
||||
def->label = L("Walls");
|
||||
def->category = L("Extruders");
|
||||
def->tooltip = L("Filament to print walls.");
|
||||
def->min = 1;
|
||||
def->tooltip = L("Filament to print walls.\n\"Default\" uses the active object/part filament.");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionInt(1));
|
||||
def->set_default_value(new ConfigOptionInt(0));
|
||||
|
||||
def = this->add("inner_wall_line_width", coFloatOrPercent);
|
||||
def->label = L("Inner wall");
|
||||
@@ -5662,10 +5662,10 @@ void PrintConfigDef::init_fff_params()
|
||||
def->gui_type = ConfigOptionDef::GUIType::i_enum_open;
|
||||
def->label = L("Solid infill");
|
||||
def->category = L("Extruders");
|
||||
def->tooltip = L("Filament to print solid infill.");
|
||||
def->min = 1;
|
||||
def->tooltip = L("Filament to print solid infill.\n\"Default\" uses the active object/part filament.");
|
||||
def->min = 0;
|
||||
def->mode = comAdvanced;
|
||||
def->set_default_value(new ConfigOptionInt(1));
|
||||
def->set_default_value(new ConfigOptionInt(0));
|
||||
|
||||
def = this->add("internal_solid_infill_line_width", coFloatOrPercent);
|
||||
def->label = L("Internal solid infill");
|
||||
@@ -6041,7 +6041,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->gui_type = ConfigOptionDef::GUIType::i_enum_open;
|
||||
def->label = L("Support/raft base");
|
||||
def->category = L("Support");
|
||||
def->tooltip = L("Filament to print support base and raft. \"Default\" means no specific filament for support and current filament is used.");
|
||||
def->tooltip = L("Filament to print support base and raft.\n\"Default\" means no specific filament for support and current filament is used.");
|
||||
def->min = 0;
|
||||
def->mode = comSimple;
|
||||
def->set_default_value(new ConfigOptionInt(0));
|
||||
@@ -6076,7 +6076,7 @@ void PrintConfigDef::init_fff_params()
|
||||
def->gui_type = ConfigOptionDef::GUIType::i_enum_open;
|
||||
def->label = L("Support/raft interface");
|
||||
def->category = L("Support");
|
||||
def->tooltip = L("Filament to print support interface. \"Default\" means no specific filament for support interface and current filament is used.");
|
||||
def->tooltip = L("Filament to print support interface.\n\"Default\" means no specific filament for support interface and current filament is used.");
|
||||
def->min = 0;
|
||||
// BBS
|
||||
def->mode = comSimple;
|
||||
@@ -8348,9 +8348,9 @@ void DynamicPrintConfig::normalize_fdm(int used_filaments)
|
||||
int extruder = this->option("extruder")->getInt();
|
||||
this->erase("extruder");
|
||||
if (extruder != 0) {
|
||||
if (!this->has("sparse_infill_filament"))
|
||||
if (!this->has("sparse_infill_filament") || this->option("sparse_infill_filament")->getInt() == 0)
|
||||
this->option("sparse_infill_filament", true)->setInt(extruder);
|
||||
if (!this->has("wall_filament"))
|
||||
if (!this->has("wall_filament") || this->option("wall_filament")->getInt() == 0)
|
||||
this->option("wall_filament", true)->setInt(extruder);
|
||||
// Don't propagate the current extruder to support.
|
||||
// For non-soluble supports, the default "0" extruder means to use the active extruder,
|
||||
@@ -8362,8 +8362,11 @@ void DynamicPrintConfig::normalize_fdm(int used_filaments)
|
||||
}
|
||||
}
|
||||
|
||||
if (!this->has("solid_infill_filament") && this->has("sparse_infill_filament"))
|
||||
this->option("solid_infill_filament", true)->setInt(this->option("sparse_infill_filament")->getInt());
|
||||
if (this->has("sparse_infill_filament")) {
|
||||
int sparse_infill_filament = this->option("sparse_infill_filament")->getInt();
|
||||
if (sparse_infill_filament > 0 && (!this->has("solid_infill_filament") || this->option("solid_infill_filament")->getInt() == 0))
|
||||
this->option("solid_infill_filament", true)->setInt(sparse_infill_filament);
|
||||
}
|
||||
|
||||
if (this->has("spiral_mode") && this->opt<ConfigOptionBool>("spiral_mode", true)->value) {
|
||||
{
|
||||
@@ -8421,9 +8424,9 @@ void DynamicPrintConfig::normalize_fdm_1()
|
||||
int extruder = this->option("extruder")->getInt();
|
||||
this->erase("extruder");
|
||||
if (extruder != 0) {
|
||||
if (!this->has("sparse_infill_filament"))
|
||||
if (!this->has("sparse_infill_filament") || this->option("sparse_infill_filament")->getInt() == 0)
|
||||
this->option("sparse_infill_filament", true)->setInt(extruder);
|
||||
if (!this->has("wall_filament"))
|
||||
if (!this->has("wall_filament") || this->option("wall_filament")->getInt() == 0)
|
||||
this->option("wall_filament", true)->setInt(extruder);
|
||||
// Don't propagate the current extruder to support.
|
||||
// For non-soluble supports, the default "0" extruder means to use the active extruder,
|
||||
@@ -8435,8 +8438,11 @@ void DynamicPrintConfig::normalize_fdm_1()
|
||||
}
|
||||
}
|
||||
|
||||
if (!this->has("solid_infill_filament") && this->has("sparse_infill_filament"))
|
||||
this->option("solid_infill_filament", true)->setInt(this->option("sparse_infill_filament")->getInt());
|
||||
if (this->has("sparse_infill_filament")) {
|
||||
int sparse_infill_filament = this->option("sparse_infill_filament")->getInt();
|
||||
if (sparse_infill_filament > 0 && (!this->has("solid_infill_filament") || this->option("solid_infill_filament")->getInt() == 0))
|
||||
this->option("solid_infill_filament", true)->setInt(sparse_infill_filament);
|
||||
}
|
||||
|
||||
if (this->has("spiral_mode") && this->opt<ConfigOptionBool>("spiral_mode", true)->value) {
|
||||
{
|
||||
|
||||
@@ -3511,6 +3511,12 @@ static void clamp_exturder_to_default(ConfigOptionInt &opt, size_t num_extruders
|
||||
opt.value = 1;
|
||||
}
|
||||
|
||||
static void clamp_feature_filament_to_valid(ConfigOptionInt &opt, size_t num_extruders)
|
||||
{
|
||||
if (opt.value <= 0 || opt.value > (int)num_extruders)
|
||||
opt.value = 1;
|
||||
}
|
||||
|
||||
PrintObjectConfig PrintObject::object_config_from_model_object(const PrintObjectConfig &default_object_config, const ModelObject &object, size_t num_extruders)
|
||||
{
|
||||
PrintObjectConfig config = default_object_config;
|
||||
@@ -3528,61 +3534,88 @@ PrintObjectConfig PrintObject::object_config_from_model_object(const PrintObject
|
||||
const std::string key_extruder { "extruder" };
|
||||
static constexpr const std::initializer_list<const std::string_view> keys_extruders { "sparse_infill_filament"sv, "solid_infill_filament"sv, "wall_filament"sv };
|
||||
|
||||
static void apply_to_print_region_config(PrintRegionConfig &out, const DynamicPrintConfig &in)
|
||||
struct FeatureFilamentOverrideMask
|
||||
{
|
||||
// 1) Map legacy "extruder" to feature filament keys as a fallback only.
|
||||
// If any feature-specific filament is explicitly set, keep those values.
|
||||
bool sparse_infill_filament = false;
|
||||
bool solid_infill_filament = false;
|
||||
bool wall_filament = false;
|
||||
};
|
||||
|
||||
static void apply_to_print_region_config(PrintRegionConfig &out, const DynamicPrintConfig &in, FeatureFilamentOverrideMask &feature_overrides)
|
||||
{
|
||||
// 1) Explicit feature filament values take precedence over base extruder fallback.
|
||||
auto *opt_extruder = in.opt<ConfigOptionInt>(key_extruder);
|
||||
auto *opt_sparse_infill_filament = in.opt<ConfigOptionInt>("sparse_infill_filament");
|
||||
auto *opt_solid_infill_filament = in.opt<ConfigOptionInt>("solid_infill_filament");
|
||||
auto *opt_wall_filament = in.opt<ConfigOptionInt>("wall_filament");
|
||||
const bool has_feature_filament_override =
|
||||
(opt_sparse_infill_filament != nullptr && opt_sparse_infill_filament->value > 0) ||
|
||||
(opt_solid_infill_filament != nullptr && opt_solid_infill_filament->value > 0) ||
|
||||
(opt_wall_filament != nullptr && opt_wall_filament->value > 0);
|
||||
if (opt_extruder)
|
||||
if (int extruder = opt_extruder->value; extruder > 1 && ! has_feature_filament_override) {
|
||||
// Not a default extruder.
|
||||
out.sparse_infill_filament.value = extruder;
|
||||
out.solid_infill_filament.value = extruder;
|
||||
out.wall_filament.value = extruder;
|
||||
}
|
||||
int base_extruder = (opt_extruder != nullptr) ? opt_extruder->value : 0;
|
||||
|
||||
// 2) Copy the rest of the values.
|
||||
for (auto it = in.cbegin(); it != in.cend(); ++ it)
|
||||
if (it->first != key_extruder)
|
||||
if (ConfigOption* my_opt = out.option(it->first, false); my_opt != nullptr) {
|
||||
if (one_of(it->first, keys_extruders)) {
|
||||
// Ignore "default" extruders.
|
||||
// "Default" (0) clears explicit override for this scope and lets fallback apply.
|
||||
int extruder = static_cast<const ConfigOptionInt*>(it->second.get())->value;
|
||||
if (extruder > 0)
|
||||
if (extruder > 0) {
|
||||
my_opt->setInt(extruder);
|
||||
if (it->first == "sparse_infill_filament")
|
||||
feature_overrides.sparse_infill_filament = true;
|
||||
else if (it->first == "solid_infill_filament")
|
||||
feature_overrides.solid_infill_filament = true;
|
||||
else if (it->first == "wall_filament")
|
||||
feature_overrides.wall_filament = true;
|
||||
} else {
|
||||
if (it->first == "sparse_infill_filament")
|
||||
feature_overrides.sparse_infill_filament = false;
|
||||
else if (it->first == "solid_infill_filament")
|
||||
feature_overrides.solid_infill_filament = false;
|
||||
else if (it->first == "wall_filament")
|
||||
feature_overrides.wall_filament = false;
|
||||
}
|
||||
} else
|
||||
my_opt->set(it->second.get());
|
||||
}
|
||||
|
||||
// 3) Apply base extruder only to features that were not explicitly overridden.
|
||||
if (base_extruder > 0) {
|
||||
if (!feature_overrides.sparse_infill_filament)
|
||||
out.sparse_infill_filament.value = base_extruder;
|
||||
if (!feature_overrides.solid_infill_filament)
|
||||
out.solid_infill_filament.value = base_extruder;
|
||||
if (!feature_overrides.wall_filament)
|
||||
out.wall_filament.value = base_extruder;
|
||||
}
|
||||
}
|
||||
|
||||
PrintRegionConfig region_config_from_model_volume(const PrintRegionConfig &default_or_parent_region_config, const DynamicPrintConfig *layer_range_config, const ModelVolume &volume, size_t num_extruders)
|
||||
{
|
||||
PrintRegionConfig config = default_or_parent_region_config;
|
||||
FeatureFilamentOverrideMask feature_overrides;
|
||||
|
||||
// For model parts, non-zero values coming from the print defaults should stay explicit.
|
||||
if (volume.is_model_part()) {
|
||||
feature_overrides.sparse_infill_filament = (config.sparse_infill_filament.value > 0);
|
||||
feature_overrides.solid_infill_filament = (config.solid_infill_filament.value > 0);
|
||||
feature_overrides.wall_filament = (config.wall_filament.value > 0);
|
||||
}
|
||||
|
||||
if (volume.is_model_part()) {
|
||||
// default_or_parent_region_config contains the Print's PrintRegionConfig.
|
||||
// Override with ModelObject's PrintRegionConfig values.
|
||||
apply_to_print_region_config(config, volume.get_object()->config.get());
|
||||
apply_to_print_region_config(config, volume.get_object()->config.get(), feature_overrides);
|
||||
} else {
|
||||
// default_or_parent_region_config contains parent PrintRegion config, which already contains ModelVolume's config.
|
||||
}
|
||||
apply_to_print_region_config(config, volume.config.get());
|
||||
apply_to_print_region_config(config, volume.config.get(), feature_overrides);
|
||||
if (! volume.material_id().empty())
|
||||
apply_to_print_region_config(config, volume.material()->config.get());
|
||||
apply_to_print_region_config(config, volume.material()->config.get(), feature_overrides);
|
||||
if (layer_range_config != nullptr) {
|
||||
// Not applicable to modifiers.
|
||||
assert(volume.is_model_part());
|
||||
apply_to_print_region_config(config, *layer_range_config);
|
||||
apply_to_print_region_config(config, *layer_range_config, feature_overrides);
|
||||
}
|
||||
// Clamp invalid extruders to the default extruder (with index 1).
|
||||
clamp_exturder_to_default(config.sparse_infill_filament, num_extruders);
|
||||
clamp_exturder_to_default(config.wall_filament, num_extruders);
|
||||
clamp_exturder_to_default(config.solid_infill_filament, num_extruders);
|
||||
// Resolve feature defaults and clamp invalid extruders to index 1.
|
||||
clamp_feature_filament_to_valid(config.sparse_infill_filament, num_extruders);
|
||||
clamp_feature_filament_to_valid(config.wall_filament, num_extruders);
|
||||
clamp_feature_filament_to_valid(config.solid_infill_filament, num_extruders);
|
||||
if (config.sparse_infill_density.value < 0.00011f)
|
||||
// Switch of infill for very low infill rates, also avoid division by zero in infill generator for these very low rates.
|
||||
// See GH issue #5910.
|
||||
|
||||
@@ -1573,31 +1573,31 @@ std::vector<int> PartPlate::get_extruders(bool conside_custom_gcode) const
|
||||
plate_extruders.push_back(glb_support_extr);
|
||||
}
|
||||
|
||||
int obj_wall_extr = 1;
|
||||
int obj_wall_extr = 0;
|
||||
const ConfigOption* wall_opt = mo->config.option("wall_filament");
|
||||
if (wall_opt != nullptr)
|
||||
obj_wall_extr = wall_opt->getInt();
|
||||
if (obj_wall_extr != 1)
|
||||
if (obj_wall_extr != 0)
|
||||
plate_extruders.push_back(obj_wall_extr);
|
||||
else if (glb_wall_extr != 1)
|
||||
else if (glb_wall_extr != 0)
|
||||
plate_extruders.push_back(glb_wall_extr);
|
||||
|
||||
int obj_sparse_infill_extr = 1;
|
||||
int obj_sparse_infill_extr = 0;
|
||||
const ConfigOption* sparse_infill_opt = mo->config.option("sparse_infill_filament");
|
||||
if (sparse_infill_opt != nullptr)
|
||||
obj_sparse_infill_extr = sparse_infill_opt->getInt();
|
||||
if (obj_sparse_infill_extr != 1)
|
||||
if (obj_sparse_infill_extr != 0)
|
||||
plate_extruders.push_back(obj_sparse_infill_extr);
|
||||
else if (glb_sparse_infill_extr != 1)
|
||||
else if (glb_sparse_infill_extr != 0)
|
||||
plate_extruders.push_back(glb_sparse_infill_extr);
|
||||
|
||||
int obj_solid_infill_extr = 1;
|
||||
int obj_solid_infill_extr = 0;
|
||||
const ConfigOption* solid_infill_opt = mo->config.option("solid_infill_filament");
|
||||
if (solid_infill_opt != nullptr)
|
||||
obj_solid_infill_extr = solid_infill_opt->getInt();
|
||||
if (obj_solid_infill_extr != 1)
|
||||
if (obj_solid_infill_extr != 0)
|
||||
plate_extruders.push_back(obj_solid_infill_extr);
|
||||
else if (glb_solid_infill_extr != 1)
|
||||
else if (glb_solid_infill_extr != 0)
|
||||
plate_extruders.push_back(glb_solid_infill_extr);
|
||||
|
||||
}
|
||||
@@ -1695,31 +1695,31 @@ std::vector<int> PartPlate::get_extruders_under_cli(bool conside_custom_gcode, D
|
||||
else if (glb_support_extr != 0)
|
||||
plate_extruders.push_back(glb_support_extr);
|
||||
|
||||
int obj_wall_extr = 1;
|
||||
int obj_wall_extr = 0;
|
||||
const ConfigOption* wall_opt = object->config.option("wall_filament");
|
||||
if (wall_opt != nullptr)
|
||||
obj_wall_extr = wall_opt->getInt();
|
||||
if (obj_wall_extr != 1)
|
||||
if (obj_wall_extr != 0)
|
||||
plate_extruders.push_back(obj_wall_extr);
|
||||
else if (glb_wall_extr != 1)
|
||||
else if (glb_wall_extr != 0)
|
||||
plate_extruders.push_back(glb_wall_extr);
|
||||
|
||||
int obj_sparse_infill_extr = 1;
|
||||
int obj_sparse_infill_extr = 0;
|
||||
const ConfigOption* sparse_infill_opt = object->config.option("sparse_infill_filament");
|
||||
if (sparse_infill_opt != nullptr)
|
||||
obj_sparse_infill_extr = sparse_infill_opt->getInt();
|
||||
if (obj_sparse_infill_extr != 1)
|
||||
if (obj_sparse_infill_extr != 0)
|
||||
plate_extruders.push_back(obj_sparse_infill_extr);
|
||||
else if (glb_sparse_infill_extr != 1)
|
||||
else if (glb_sparse_infill_extr != 0)
|
||||
plate_extruders.push_back(glb_sparse_infill_extr);
|
||||
|
||||
int obj_solid_infill_extr = 1;
|
||||
int obj_solid_infill_extr = 0;
|
||||
const ConfigOption* solid_infill_opt = object->config.option("solid_infill_filament");
|
||||
if (solid_infill_opt != nullptr)
|
||||
obj_solid_infill_extr = solid_infill_opt->getInt();
|
||||
if (obj_solid_infill_extr != 1)
|
||||
if (obj_solid_infill_extr != 0)
|
||||
plate_extruders.push_back(obj_solid_infill_extr);
|
||||
else if (glb_solid_infill_extr != 1)
|
||||
else if (glb_solid_infill_extr != 0)
|
||||
plate_extruders.push_back(glb_solid_infill_extr);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -876,54 +876,6 @@ struct DynamicFilamentList : DynamicList
|
||||
}
|
||||
};
|
||||
|
||||
struct DynamicFilamentList1Based : DynamicFilamentList
|
||||
{
|
||||
void apply_on(Choice *c) override
|
||||
{
|
||||
if (items.empty())
|
||||
update(true);
|
||||
auto cb = dynamic_cast<ComboBox *>(c->window);
|
||||
auto n = cb->GetSelection();
|
||||
cb->Clear();
|
||||
for (auto i : items) {
|
||||
cb->Append(i.first, *i.second);
|
||||
}
|
||||
if (n < cb->GetCount())
|
||||
cb->SetSelection(n);
|
||||
}
|
||||
wxString get_value(int index) override
|
||||
{
|
||||
wxString str;
|
||||
str << index+1;
|
||||
return str;
|
||||
}
|
||||
int index_of(wxString value) override
|
||||
{
|
||||
long n = 0;
|
||||
if(!value.ToLong(&n))
|
||||
return -1;
|
||||
--n;
|
||||
return (n >= 0 && n <= items.size()) ? int(n) : -1;
|
||||
}
|
||||
void update(bool force = false)
|
||||
{
|
||||
items.clear();
|
||||
if (!force && m_choices.empty())
|
||||
return;
|
||||
auto icons = get_extruder_color_icons(true);
|
||||
auto presets = wxGetApp().preset_bundle->filament_presets;
|
||||
for (int i = 0; i < presets.size(); ++i) {
|
||||
wxString str;
|
||||
std::string type;
|
||||
wxGetApp().preset_bundle->filaments.find_preset(presets[i])->get_filament_type(type);
|
||||
str << type;
|
||||
items.push_back({str, i < icons.size() ? icons[i] : nullptr});
|
||||
}
|
||||
DynamicList::update();
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
// Check if the machine supports Junction Deviation (Marlin firmware with machine_max_junction_deviation > 0)
|
||||
static bool has_junction_deviation(const DynamicPrintConfig* printer_config)
|
||||
{
|
||||
@@ -940,7 +892,6 @@ static bool has_junction_deviation(const DynamicPrintConfig* printer_config)
|
||||
}
|
||||
|
||||
static DynamicFilamentList dynamic_filament_list;
|
||||
static DynamicFilamentList1Based dynamic_filament_list_1_based;
|
||||
|
||||
class AMSCountPopupWindow : public PopupWindow
|
||||
{
|
||||
@@ -1647,9 +1598,9 @@ Sidebar::Sidebar(Plater *parent)
|
||||
{
|
||||
Choice::register_dynamic_list("support_filament", &dynamic_filament_list);
|
||||
Choice::register_dynamic_list("support_interface_filament", &dynamic_filament_list);
|
||||
Choice::register_dynamic_list("wall_filament", &dynamic_filament_list_1_based);
|
||||
Choice::register_dynamic_list("sparse_infill_filament", &dynamic_filament_list_1_based);
|
||||
Choice::register_dynamic_list("solid_infill_filament", &dynamic_filament_list_1_based);
|
||||
Choice::register_dynamic_list("wall_filament", &dynamic_filament_list);
|
||||
Choice::register_dynamic_list("sparse_infill_filament", &dynamic_filament_list);
|
||||
Choice::register_dynamic_list("solid_infill_filament", &dynamic_filament_list);
|
||||
Choice::register_dynamic_list("wipe_tower_filament", &dynamic_filament_list);
|
||||
|
||||
p->scrolled = new wxPanel(this);
|
||||
@@ -3767,7 +3718,6 @@ void Sidebar::show_SEMM_buttons()
|
||||
void Sidebar::update_dynamic_filament_list()
|
||||
{
|
||||
dynamic_filament_list.update();
|
||||
dynamic_filament_list_1_based.update();
|
||||
}
|
||||
|
||||
PlaterPresetComboBox* Sidebar::printer_combox()
|
||||
@@ -6203,6 +6153,23 @@ std::vector<size_t> Plater::priv::load_files(const std::vector<fs::path>& input_
|
||||
}
|
||||
}
|
||||
|
||||
if (load_config && !config_loaded.empty() &&
|
||||
(en_3mf_file_type == En3mfType::From_BBS || en_3mf_file_type == En3mfType::From_Orca) &&
|
||||
file_version < Semver("2.4.0-dev")) {
|
||||
int converted_count = ConfigMigrations::migrate_legacy_feature_filament_defaults(config_loaded);
|
||||
for (ModelObject *model_object : model.objects) {
|
||||
converted_count += ConfigMigrations::migrate_legacy_feature_filament_defaults(model_object->config);
|
||||
for (ModelVolume *model_volume : model_object->volumes)
|
||||
converted_count += ConfigMigrations::migrate_legacy_feature_filament_defaults(model_volume->config);
|
||||
}
|
||||
|
||||
if (converted_count > 0) {
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << " "
|
||||
<< boost::format("old 3mf version %1%, migrated %2% feature filament selections from 1 to 0 (Default)")
|
||||
% file_version.to_string() % converted_count;
|
||||
}
|
||||
}
|
||||
|
||||
// plate data
|
||||
if (plate_data.size() > 0) {
|
||||
BOOST_LOG_TRIVIAL(info) << __FUNCTION__ << ":" << __LINE__ << boost::format(", import 3mf UPDATE_GCODE_RESULT \n");
|
||||
|
||||
Reference in New Issue
Block a user