From dcec1fa74969341230cf11c38ed2b5e356678790 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik Date: Wed, 27 Jan 2021 09:36:39 +0100 Subject: Commented out fuzzy_skin_shape for now, the parameter may be used in the future, but for now we don't want the parameter to be stored into configuration files. --- src/libslic3r/PerimeterGenerator.cpp | 12 ++++++++---- src/libslic3r/PrintConfig.cpp | 2 ++ src/libslic3r/PrintConfig.hpp | 8 ++++++-- src/slic3r/GUI/Field.cpp | 4 ++-- src/slic3r/GUI/GUI.cpp | 4 ++-- src/slic3r/GUI/OptionsGroup.cpp | 6 +++--- 6 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/libslic3r/PerimeterGenerator.cpp b/src/libslic3r/PerimeterGenerator.cpp index ff9e439ba..a29f293ce 100644 --- a/src/libslic3r/PerimeterGenerator.cpp +++ b/src/libslic3r/PerimeterGenerator.cpp @@ -231,13 +231,15 @@ static ExtrusionEntityCollection traverse_loops(const PerimeterGenerator &perime return out; } +/* enum class FuzzyShape { Triangle, Sawtooth, Random }; +*/ -static void fuzzy_polygon(Polygon &poly, FuzzyShape shape, double fuzzy_skin_thickness, double fuzzy_skin_point_dist) +static void fuzzy_polygon(Polygon &poly, /* FuzzyShape shape, */ double fuzzy_skin_thickness, double fuzzy_skin_point_dist) { #if 0 Point last = poly.points.at(poly.points.size() - 1); @@ -396,8 +398,9 @@ void PerimeterGenerator::process() // fuzzy skin configuration double fuzzy_skin_thickness; double fuzzy_skin_point_dist; - FuzzyShape fuzzy_skin_shape; + //FuzzyShape fuzzy_skin_shape; if (this->object_config->fuzzy_skin_perimeter_mode != FuzzySkinPerimeterMode::None) { + /* switch (this->object_config->fuzzy_skin_shape) { case FuzzySkinShape::Triangle1: case FuzzySkinShape::Triangle2: @@ -415,6 +418,7 @@ void PerimeterGenerator::process() fuzzy_skin_shape = FuzzyShape::Random; break; } + */ fuzzy_skin_thickness = scale_(this->object_config->fuzzy_skin_thickness); fuzzy_skin_point_dist = scale_(this->object_config->fuzzy_skin_point_dist); } @@ -514,12 +518,12 @@ void PerimeterGenerator::process() this->object_config->fuzzy_skin_perimeter_mode == FuzzySkinPerimeterMode::ExternalSkipFirst ) { ExPolygon expolygon_fuzzy(expolygon); - fuzzy_polygon(expolygon_fuzzy.contour, fuzzy_skin_shape, fuzzy_skin_thickness, fuzzy_skin_point_dist); + fuzzy_polygon(expolygon_fuzzy.contour, /* fuzzy_skin_shape, */ fuzzy_skin_thickness, fuzzy_skin_point_dist); // compensate for the depth of intersection. contours[i].emplace_back(PerimeterGeneratorLoop(expolygon_fuzzy.contour, i, true)); skip_polygon = true; } else - fuzzy_polygon(expolygon.contour, fuzzy_skin_shape, fuzzy_skin_thickness, fuzzy_skin_point_dist); + fuzzy_polygon(expolygon.contour, /* fuzzy_skin_shape, */ fuzzy_skin_thickness, fuzzy_skin_point_dist); } } diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index 9247e69da..064b00b4c 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -1029,6 +1029,7 @@ void PrintConfigDef::init_fff_params() def->category = L("Fuzzy Skin"); def->tooltip = L("Fuzzy skin shape."); +/* def->enum_keys_map = &ConfigOptionEnum::get_enum_values(); def->enum_values.push_back("triangle1"); def->enum_values.push_back("triangle2"); @@ -1050,6 +1051,7 @@ void PrintConfigDef::init_fff_params() def->enum_labels.push_back(L("Random (3)")); def->mode = comSimple; def->set_default_value(new ConfigOptionEnum(FuzzySkinShape::Triangle1)); +*/ def = this->add("fuzzy_skin_thickness", coFloat); def->label = L("Fuzzy skin thickness"); diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 40929c34b..e2f71a941 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -50,6 +50,7 @@ enum class FuzzySkinPerimeterMode { All }; +/* enum class FuzzySkinShape { Triangle1, Triangle2, @@ -61,6 +62,7 @@ enum class FuzzySkinShape { Random2, Random3 }; +*/ enum InfillPattern : int { ipRectilinear, ipMonotonic, ipAlignedRectilinear, ipGrid, ipTriangles, ipStars, ipCubic, ipLine, ipConcentric, ipHoneycomb, ip3DHoneycomb, @@ -170,6 +172,7 @@ template<> inline const t_config_enum_values& ConfigOptionEnum inline const t_config_enum_values& ConfigOptionEnum::get_enum_values() { static t_config_enum_values keys_map; if (keys_map.empty()) { @@ -185,6 +188,7 @@ template<> inline const t_config_enum_values& ConfigOptionEnum:: } return keys_map; } +*/ template<> inline const t_config_enum_values& ConfigOptionEnum::get_enum_values() { static t_config_enum_values keys_map; @@ -479,7 +483,7 @@ public: ConfigOptionFloatOrPercent extrusion_width; ConfigOptionFloatOrPercent first_layer_height; ConfigOptionEnum fuzzy_skin_perimeter_mode; - ConfigOptionEnum fuzzy_skin_shape; +// ConfigOptionEnum fuzzy_skin_shape; ConfigOptionFloat fuzzy_skin_thickness; ConfigOptionFloat fuzzy_skin_point_dist; ConfigOptionBool infill_only_where_needed; @@ -528,7 +532,7 @@ protected: OPT_PTR(extrusion_width); OPT_PTR(first_layer_height); OPT_PTR(fuzzy_skin_perimeter_mode); - OPT_PTR(fuzzy_skin_shape); +// OPT_PTR(fuzzy_skin_shape); OPT_PTR(fuzzy_skin_thickness); OPT_PTR(fuzzy_skin_point_dist); OPT_PTR(infill_only_where_needed); diff --git a/src/slic3r/GUI/Field.cpp b/src/slic3r/GUI/Field.cpp index 93e259e6a..dfe95e71e 100644 --- a/src/slic3r/GUI/Field.cpp +++ b/src/slic3r/GUI/Field.cpp @@ -1202,8 +1202,8 @@ boost::any& Choice::get_value() m_value = static_cast(ret_enum); else if (m_opt_id.compare("fuzzy_skin_perimeter_mode") == 0) m_value = static_cast(ret_enum); - else if (m_opt_id.compare("fuzzy_skin_shape") == 0) - m_value = static_cast(ret_enum); +// else if (m_opt_id.compare("fuzzy_skin_shape") == 0) +// m_value = static_cast(ret_enum); else if (m_opt_id.compare("gcode_flavor") == 0) m_value = static_cast(ret_enum); else if (m_opt_id.compare("machine_limits_usage") == 0) diff --git a/src/slic3r/GUI/GUI.cpp b/src/slic3r/GUI/GUI.cpp index 6b664c0ed..b0322a821 100644 --- a/src/slic3r/GUI/GUI.cpp +++ b/src/slic3r/GUI/GUI.cpp @@ -184,8 +184,8 @@ void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt config.set_key_value(opt_key, new ConfigOptionEnum(boost::any_cast(value))); else if (opt_key.compare("fuzzy_skin_perimeter_mode") == 0) config.set_key_value(opt_key, new ConfigOptionEnum(boost::any_cast(value))); - else if (opt_key.compare("fuzzy_skin_shape") == 0) - config.set_key_value(opt_key, new ConfigOptionEnum(boost::any_cast(value))); +// else if (opt_key.compare("fuzzy_skin_shape") == 0) +// config.set_key_value(opt_key, new ConfigOptionEnum(boost::any_cast(value))); else if (opt_key.compare("gcode_flavor") == 0) config.set_key_value(opt_key, new ConfigOptionEnum(boost::any_cast(value))); else if (opt_key.compare("machine_limits_usage") == 0) diff --git a/src/slic3r/GUI/OptionsGroup.cpp b/src/slic3r/GUI/OptionsGroup.cpp index ced780adb..5f9391645 100644 --- a/src/slic3r/GUI/OptionsGroup.cpp +++ b/src/slic3r/GUI/OptionsGroup.cpp @@ -873,9 +873,9 @@ boost::any ConfigOptionsGroup::get_config_value(const DynamicPrintConfig& config else if (opt_key == "fuzzy_skin_perimeter_mode") { ret = static_cast(config.option>(opt_key)->value); } - else if (opt_key == "fuzzy_skin_shape") { - ret = static_cast(config.option>(opt_key)->value); - } +// else if (opt_key == "fuzzy_skin_shape") { +// ret = static_cast(config.option>(opt_key)->value); +// } else if (opt_key == "gcode_flavor") { ret = static_cast(config.option>(opt_key)->value); } -- cgit v1.2.3