From 53af32dd1abec7676bbade12e0983e89a74d7ef9 Mon Sep 17 00:00:00 2001 From: "qing.zhang" Date: Thu, 24 Nov 2022 17:23:06 +0800 Subject: [PATCH] ENH: add infill pattern archimedeanchords pattern octagramspiral pattern Signed-off-by: qing.zhang Change-Id: If07cca732de1f0169e89d5999a290839e2f00da1 (cherry picked from commit 9e322618e8ef03cf79be1526685017eafb9cb3ae) --- src/libslic3r/PrintConfig.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 51d677dad..935497475 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -941,16 +941,16 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("monotonicline"); def->enum_values.push_back("alignedrectilinear"); def->enum_values.push_back("hilbertcurve"); - //def->enum_values.push_back("archimedeanchords"); - //def->enum_values.push_back("octagramspiral"); + def->enum_values.push_back("archimedeanchords"); + def->enum_values.push_back("octagramspiral"); def->enum_labels.push_back(L("Concentric")); def->enum_labels.push_back(L("Rectilinear")); def->enum_labels.push_back(L("Monotonic")); def->enum_labels.push_back(L("Monotonic line")); def->enum_labels.push_back(L("Aligned Rectilinear")); def->enum_labels.push_back(L("Hilbert Curve")); - //def->enum_labels.push_back(L("Archimedean Chords")); - //def->enum_labels.push_back(L("Octagram Spiral")); + def->enum_labels.push_back(L("Archimedean Chords")); + def->enum_labels.push_back(L("Octagram Spiral")); def->set_default_value(new ConfigOptionEnum(ipRectilinear)); def = this->add("bottom_surface_pattern", coEnum); @@ -1271,11 +1271,11 @@ void PrintConfigDef::init_fff_params() def->enum_values.push_back("honeycomb"); def->enum_values.push_back("adaptivecubic"); def->enum_values.push_back("alignedrectilinear"); - //def->enum_values.push_back("3dhoneycomb"); - //def->enum_values.push_back("hilbertcurve"); - //def->enum_values.push_back("archimedeanchords"); - //def->enum_values.push_back("octagramspiral"); - //def->enum_values.push_back("supportcubic"); + def->enum_values.push_back("3dhoneycomb"); + def->enum_values.push_back("hilbertcurve"); + def->enum_values.push_back("archimedeanchords"); + def->enum_values.push_back("octagramspiral"); + def->enum_values.push_back("supportcubic"); #if HAS_LIGHTNING_INFILL def->enum_values.push_back("lightning"); #endif // HAS_LIGHTNING_INFILL @@ -1290,11 +1290,11 @@ void PrintConfigDef::init_fff_params() def->enum_labels.push_back(L("Honeycomb")); def->enum_labels.push_back(L("Adaptive Cubic")); def->enum_labels.push_back(L("Aligned Rectilinear")); - //def->enum_labels.push_back(L("3D Honeycomb")); - //def->enum_labels.push_back(L("Hilbert Curve")); - //def->enum_labels.push_back(L("Archimedean Chords")); - //def->enum_labels.push_back(L("Octagram Spiral")); - //def->enum_labels.push_back(L("Support Cubic")); + def->enum_labels.push_back(L("3D Honeycomb")); + def->enum_labels.push_back(L("Hilbert Curve")); + def->enum_labels.push_back(L("Archimedean Chords")); + def->enum_labels.push_back(L("Octagram Spiral")); + def->enum_labels.push_back(L("Support Cubic")); #if HAS_LIGHTNING_INFILL def->enum_labels.push_back(L("Lightning")); #endif // HAS_LIGHTNING_INFILL