From c0047dcac35f3dbda874be46042d6764a9bc84aa Mon Sep 17 00:00:00 2001 From: cjw Date: Thu, 19 Dec 2024 14:46:48 +0800 Subject: [PATCH] =?UTF-8?q?ppt12=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libslic3r/PrintConfig.cpp | 18 ++++++++++++------ slic3r/GUI/Tab.cpp | 18 +++++++++--------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/libslic3r/PrintConfig.cpp b/libslic3r/PrintConfig.cpp index 7c879d751..757320544 100644 --- a/libslic3r/PrintConfig.cpp +++ b/libslic3r/PrintConfig.cpp @@ -1615,12 +1615,15 @@ void PrintConfigDef::init_fff_params() 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"); + //xiamian- + //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("lightning"); def->enum_values.push_back("crosshatch"); + //xiamian+ + def->enum_values.push_back("fiberspiral"); def->enum_labels.push_back(L("Concentric")); def->enum_labels.push_back(L("Rectilinear")); def->enum_labels.push_back(L("Grid")); @@ -1633,12 +1636,15 @@ void PrintConfigDef::init_fff_params() 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")); + //xiamian- + //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("Lightning")); def->enum_labels.push_back(L("Cross Hatch")); + //xiamian+ + def->enum_labels.push_back(L("Fiber Spiral")); def->set_default_value(new ConfigOptionEnum(ipCubic)); def = this->add("top_surface_acceleration", coFloat); diff --git a/slic3r/GUI/Tab.cpp b/slic3r/GUI/Tab.cpp index d446952d5..9d5051ff1 100644 --- a/slic3r/GUI/Tab.cpp +++ b/slic3r/GUI/Tab.cpp @@ -1923,7 +1923,7 @@ void TabPrint::build() load_initial_data(); //xiamian+ - auto page = add_options_page("peizhi", "empty"); + auto page = add_options_page(L("Configuration"), "empty"); auto optgroup = page->new_optgroup("", L"param_layer_height"); optgroup->append_single_option_line("wall_loops", "wall-generator"); optgroup->append_single_option_line("layer_height", "layer-height"); @@ -1932,6 +1932,7 @@ void TabPrint::build() optgroup->append_single_option_line("top_shell_thickness"); optgroup->append_single_option_line("bottom_shell_layers"); optgroup->append_single_option_line("bottom_shell_thickness"); + optgroup->append_single_option_line("sparse_infill_density"); page = add_options_page(L("Quality"), "empty"); //xiamian- //auto page = add_options_page(L("Quality"), "empty"); @@ -2016,7 +2017,6 @@ void TabPrint::build() //optgroup = page->new_optgroup(L("Top/bottom shells"), L"param_shell"); optgroup->append_single_option_line("interface_shells"); optgroup->append_single_option_line("top_surface_pattern", "fill-patterns#Infill of the top surface and bottom surface"); - //xiamian- //optgroup->append_single_option_line("top_shell_layers"); //optgroup->append_single_option_line("top_shell_thickness"); optgroup->append_single_option_line("bottom_surface_pattern", "fill-patterns#Infill of the top surface and bottom surface"); @@ -2025,20 +2025,20 @@ void TabPrint::build() optgroup->append_single_option_line("internal_solid_infill_pattern"); //optgroup = page->new_optgroup(L("Sparse infill"), L"param_infill"); - optgroup->append_single_option_line("sparse_infill_density"); + //optgroup->append_single_option_line("sparse_infill_density"); optgroup->append_single_option_line("sparse_infill_pattern", "fill-patterns#infill types and their properties of sparse"); - optgroup->append_single_option_line("sparse_infill_anchor"); - optgroup->append_single_option_line("sparse_infill_anchor_max"); + //optgroup->append_single_option_line("sparse_infill_anchor"); + //optgroup->append_single_option_line("sparse_infill_anchor_max"); optgroup->append_single_option_line("filter_out_gap_fill"); //optgroup = page->new_optgroup(L("Advanced"), L"param_advanced"); - optgroup->append_single_option_line("infill_wall_overlap","parameter/strength-advance-settings"); - optgroup->append_single_option_line("infill_direction","parameter/strength-advance-settings"); + //optgroup->append_single_option_line("infill_wall_overlap","parameter/strength-advance-settings"); + //optgroup->append_single_option_line("infill_direction","parameter/strength-advance-settings"); optgroup->append_single_option_line("bridge_angle","parameter/strength-advance-settings"); optgroup->append_single_option_line("minimum_sparse_infill_area","parameter/strength-advance-settings"); optgroup->append_single_option_line("infill_combination","parameter/strength-advance-settings"); - optgroup->append_single_option_line("detect_narrow_internal_solid_infill","parameter/strength-advance-settings"); - optgroup->append_single_option_line("ensure_vertical_shell_thickness","parameter/strength-advance-settings"); + //optgroup->append_single_option_line("detect_narrow_internal_solid_infill","parameter/strength-advance-settings"); + //optgroup->append_single_option_line("ensure_vertical_shell_thickness","parameter/strength-advance-settings"); //optgroup->append_single_option_line("internal_bridge_support_thickness","parameter/strength-advance-settings"); page = add_options_page(L("Speed"), "empty");