From 52168dd863f54c0b69fee1ab8a5a1dc66a4784d8 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 20 Dec 2024 15:33:03 +0800 Subject: [PATCH] =?UTF-8?q?ppt15.=E6=96=B0=E5=A2=9E=E7=BA=A4=E7=BB=B4?= =?UTF-8?q?=E8=BF=9B=E7=BB=99=E7=8E=87=E5=BE=85=E5=90=8E=E7=BB=AD=E7=A0=94?= =?UTF-8?q?=E7=A9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- slic3r/GUI/Tab.cpp | 107 +++++++++++++++++++++++++-------------------- 1 file changed, 60 insertions(+), 47 deletions(-) diff --git a/slic3r/GUI/Tab.cpp b/slic3r/GUI/Tab.cpp index d242109..cd6e92b 100644 --- a/slic3r/GUI/Tab.cpp +++ b/slic3r/GUI/Tab.cpp @@ -1922,22 +1922,12 @@ void TabPrint::build() m_presets = &m_preset_bundle->prints; load_initial_data(); - //xiamian+ - 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"); - optgroup->append_single_option_line("seam_position", "Seam"); - optgroup->append_single_option_line("top_shell_layers"); - 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"); + + auto page = add_options_page(L("Quality"), "empty"); //xiamian- //auto page = add_options_page(L("Quality"), "empty"); //auto optgroup = page->new_optgroup(L("Layer height"), L"param_layer_height"); - optgroup = page->new_optgroup("", L"param_layer_height"); + auto optgroup = page->new_optgroup("", L"param_layer_height"); //optgroup->append_single_option_line("layer_height", "layer-height"); optgroup->append_single_option_line("initial_layer_print_height", "layer-height"); //xiamian- @@ -2005,6 +1995,11 @@ void TabPrint::build() //optgroup->append_single_option_line("smooth_coefficient"); //optgroup->append_single_option_line("reduce_crossing_wall"); //optgroup->append_single_option_line("max_travel_detour_distance"); + + optgroup->append_single_option_line("support_base_pattern_spacing", "support#base-pattern"); + optgroup->append_single_option_line("support_interface_top_layers", "support#base-pattern"); + optgroup->append_single_option_line("support_interface_bottom_layers", "support#base-pattern"); + optgroup->append_single_option_line("support_interface_spacing", "support#base-pattern"); page = add_options_page(L("Strength"), "empty"); //xiamian+ @@ -2099,8 +2094,11 @@ void TabPrint::build() #endif /* HAS_PRESSURE_EQUALIZER */ page = add_options_page(L("Support"), "support"); - optgroup = page->new_optgroup(L("Support"), L"param_support"); - optgroup->append_single_option_line("enable_support", "support"); + //xiamian+ + optgroup = page->new_optgroup("", L"param_support"); + //ximian- + //optgroup = page->new_optgroup(L("Support"), L"param_support"); + //optgroup->append_single_option_line("enable_support", "support"); optgroup->append_single_option_line("support_type", "support#support-types"); optgroup->append_single_option_line("support_style", "support#support-styles"); optgroup->append_single_option_line("support_threshold_angle", "support#threshold-angle"); @@ -2109,12 +2107,12 @@ void TabPrint::build() optgroup->append_single_option_line("support_remove_small_overhang"); //optgroup->append_single_option_line("enforce_support_layers"); - optgroup = page->new_optgroup(L("Raft"), L"param_raft"); + //optgroup = page->new_optgroup(L("Raft"), L"param_raft"); optgroup->append_single_option_line("raft_layers"); optgroup->append_single_option_line("raft_contact_distance"); optgroup->append_single_option_line("raft_first_layer_density"); - optgroup = page->new_optgroup(L("Support filament"), L"param_support_filament"); + //optgroup = page->new_optgroup(L("Support filament"), L"param_support_filament"); optgroup->append_single_option_line("support_filament", "support#support-filament"); optgroup->append_single_option_line("support_interface_filament", "support#support-filament"); optgroup->append_single_option_line("support_interface_not_for_body", "support#support-filament"); @@ -2122,55 +2120,70 @@ void TabPrint::build() //optgroup = page->new_optgroup(L("Options for support material and raft")); //BBS - optgroup = page->new_optgroup(L("Advanced"), L"param_advanced"); + //optgroup = page->new_optgroup(L("Advanced"), L"param_advanced"); optgroup->append_single_option_line("raft_first_layer_expansion"); // not only for raft, but for support too optgroup->append_single_option_line("tree_support_wall_count"); - optgroup->append_single_option_line("support_top_z_distance", "support#top-z-distance"); - optgroup->append_single_option_line("support_bottom_z_distance", "support#bottom-z-distance"); + //optgroup->append_single_option_line("support_top_z_distance", "support#top-z-distance"); + //optgroup->append_single_option_line("support_bottom_z_distance", "support#bottom-z-distance"); optgroup->append_single_option_line("support_base_pattern", "support#base-pattern"); - optgroup->append_single_option_line("support_base_pattern_spacing", "support#base-pattern"); - optgroup->append_single_option_line("support_angle"); - optgroup->append_single_option_line("support_interface_top_layers", "support#base-pattern"); - optgroup->append_single_option_line("support_interface_bottom_layers", "support#base-pattern"); + //optgroup->append_single_option_line("support_base_pattern_spacing", "support#base-pattern"); + //optgroup->append_single_option_line("support_angle"); + //optgroup->append_single_option_line("support_interface_top_layers", "support#base-pattern"); + //optgroup->append_single_option_line("support_interface_bottom_layers", "support#base-pattern"); optgroup->append_single_option_line("support_interface_pattern", "support#base-pattern"); - optgroup->append_single_option_line("support_interface_spacing", "support#base-pattern"); + //optgroup->append_single_option_line("support_interface_spacing", "support#base-pattern"); optgroup->append_single_option_line("support_bottom_interface_spacing"); - optgroup->append_single_option_line("support_expansion", "support#base-pattern"); + //optgroup->append_single_option_line("support_expansion", "support#base-pattern"); //optgroup->append_single_option_line("support_interface_loop_pattern"); optgroup->append_single_option_line("support_object_xy_distance", "support"); - optgroup->append_single_option_line("support_object_first_layer_gap", "support"); + //optgroup->append_single_option_line("support_object_first_layer_gap", "support"); optgroup->append_single_option_line("bridge_no_support", "support#base-pattern"); optgroup->append_single_option_line("max_bridge_length", "support#base-pattern"); optgroup->append_single_option_line("independent_support_layer_height", "support"); - optgroup = page->new_optgroup(L("Tree Support"), L"param_advanced"); + //optgroup = page->new_optgroup(L("Tree Support"), L"param_advanced"); optgroup->append_single_option_line("tree_support_branch_distance", "support#tree-support-only-options"); optgroup->append_single_option_line("tree_support_branch_diameter", "support#tree-support-only-options"); optgroup->append_single_option_line("tree_support_branch_angle", "support#tree-support-only-options"); + //xiamian+ + page = add_options_page(L("Configuration"), "empty"); + 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"); + optgroup->append_single_option_line("seam_position", "Seam"); + optgroup->append_single_option_line("top_shell_layers"); + 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"); + optgroup->append_single_option_line("enable_support", "support"); page = add_options_page(L("Others"), "advanced"); - optgroup = page->new_optgroup(L("Bed adhension"), L"param_adhension"); - optgroup->append_single_option_line("skirt_loops"); - optgroup->append_single_option_line("skirt_height"); - optgroup->append_single_option_line("skirt_distance"); + //xiamian+ + optgroup = page->new_optgroup("", L"param_adhension"); + //xiamian- + //optgroup = page->new_optgroup(L("Bed adhension"), L"param_adhension"); + //optgroup->append_single_option_line("skirt_loops"); + //optgroup->append_single_option_line("skirt_height"); + //optgroup->append_single_option_line("skirt_distance"); //optgroup->append_single_option_line("draft_shield"); - optgroup->append_single_option_line("brim_type", "auto-brim"); - optgroup->append_single_option_line("brim_width", "auto-brim#manual"); - optgroup->append_single_option_line("brim_object_gap", "auto-brim#brim-object-gap"); + //optgroup->append_single_option_line("brim_type", "auto-brim"); + //optgroup->append_single_option_line("brim_width", "auto-brim#manual"); + //optgroup->append_single_option_line("brim_object_gap", "auto-brim#brim-object-gap"); - optgroup = page->new_optgroup(L("Prime tower"), L"param_tower"); - optgroup->append_single_option_line("enable_prime_tower","parameter/prime-tower"); - optgroup->append_single_option_line("prime_tower_width","parameter/prime-tower"); - optgroup->append_single_option_line("prime_volume","parameter/prime-tower"); - optgroup->append_single_option_line("prime_tower_brim_width","parameter/prime-tower"); + //optgroup = page->new_optgroup(L("Prime tower"), L"param_tower"); + //optgroup->append_single_option_line("enable_prime_tower","parameter/prime-tower"); + //optgroup->append_single_option_line("prime_tower_width","parameter/prime-tower"); + //optgroup->append_single_option_line("prime_volume","parameter/prime-tower"); + //optgroup->append_single_option_line("prime_tower_brim_width","parameter/prime-tower"); - optgroup = page->new_optgroup(L("Flush options"), L"param_flush"); - optgroup->append_single_option_line("flush_into_infill", "reduce-wasting-during-filament-change#wipe-into-infill"); - optgroup->append_single_option_line("flush_into_objects", "reduce-wasting-during-filament-change#wipe-into-object"); - optgroup->append_single_option_line("flush_into_support", "reduce-wasting-during-filament-change#wipe-into-support-enabled-by-default"); + //optgroup = page->new_optgroup(L("Flush options"), L"param_flush"); + //optgroup->append_single_option_line("flush_into_infill", "reduce-wasting-during-filament-change#wipe-into-infill"); + //optgroup->append_single_option_line("flush_into_objects", "reduce-wasting-during-filament-change#wipe-into-object"); + //optgroup->append_single_option_line("flush_into_support", "reduce-wasting-during-filament-change#wipe-into-support-enabled-by-default"); - optgroup = page->new_optgroup(L("Special mode"), L"param_special"); + //optgroup = page->new_optgroup(L("Special mode"), L"param_special"); optgroup->append_single_option_line("slicing_mode"); optgroup->append_single_option_line("print_sequence", "sequent-print"); optgroup->append_single_option_line("spiral_mode", "spiral-vase"); @@ -2182,11 +2195,11 @@ void TabPrint::build() optgroup->append_single_option_line("fuzzy_skin_point_distance"); optgroup->append_single_option_line("fuzzy_skin_thickness"); - optgroup = page->new_optgroup(L("Advanced"), L"advanced"); + //optgroup = page->new_optgroup(L("Advanced"), L"advanced"); // optgroup->append_single_option_line("mmu_segmented_region_max_width"); optgroup->append_single_option_line("mmu_segmented_region_interlocking_depth"); - optgroup = page->new_optgroup(L("G-code output"), L"param_gcode"); + //optgroup = page->new_optgroup(L("G-code output"), L"param_gcode"); optgroup->append_single_option_line("reduce_infill_retraction"); optgroup->append_single_option_line("gcode_add_line_number"); optgroup->append_single_option_line("exclude_object");