From 4503764323da66ed56af6fb249bb29540c5185d4 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Wed, 1 Mar 2023 15:01:05 +0100 Subject: [PATCH] Follow-up to 7a9f75ed96bc669e6e29ca82e6d48d4bc64f49ec Experiment: Added a rectilinear monotonic infill without perimeter connection lines for top / bottom infill patterns. Fixed code compatibility issues in configuration. --- src/libslic3r/PrintConfig.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 7fe174974..69e221cab 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -717,16 +717,22 @@ void PrintConfigDef::init_fff_params() def->tooltip = L("Fill pattern for top infill. This only affects the top visible layer, and not its adjacent solid shells."); def->cli = "top-fill-pattern|external-fill-pattern|solid-fill-pattern"; def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); - def->set_enum_values({ - { "rectilinear", L("Rectilinear") }, - { "monotonic", L("Monotonic") }, - { "monotoniclines", L("Monotonic Lines") }, - { "alignedrectilinear", L("Aligned Rectilinear") }, - { "concentric", L("Concentric") }, - { "hilbertcurve", L("Hilbert Curve") }, - { "archimedeanchords", L("Archimedean Chords") }, - { "octagramspiral", L("Octagram Spiral") } - }); + def->enum_values.push_back("rectilinear"); + def->enum_values.push_back("monotonic"); + def->enum_values.push_back("monotoniclines"); + def->enum_values.push_back("alignedrectilinear"); + def->enum_values.push_back("concentric"); + def->enum_values.push_back("hilbertcurve"); + def->enum_values.push_back("archimedeanchords"); + def->enum_values.push_back("octagramspiral"); + def->enum_labels.push_back(L("Rectilinear")); + def->enum_labels.push_back(L("Monotonic")); + def->enum_labels.push_back(L("Monotonic Lines")); + def->enum_labels.push_back(L("Aligned Rectilinear")); + def->enum_labels.push_back(L("Concentric")); + def->enum_labels.push_back(L("Hilbert Curve")); + def->enum_labels.push_back(L("Archimedean Chords")); + def->enum_labels.push_back(L("Octagram Spiral")); // solid_fill_pattern is an obsolete equivalent to top_fill_pattern/bottom_fill_pattern. def->aliases = { "solid_fill_pattern", "external_fill_pattern" };