mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ppt10-11页修改，不包括下拉框的图片显示

This commit is contained in:
cjw 2024-12-18 14:44:48 +08:00
parent 882acc9696
commit 6888247c5f
2 changed files with 85 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libslic3r/PrintConfig.cpp
View File

@ -1160,17 +1160,24 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("monotonic");
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");
//xiamian-
//def->enum_values.push_back("hilbertcurve");
//def->enum_values.push_back("archimedeanchords");
//def->enum_values.push_back("octagramspiral");
//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("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"));
//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"));
//xiamian+
def->enum_labels.push_back(L("Fiber Spiral"));
def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipRectilinear));
def = this->add("bottom_surface_pattern", coEnum);
@ -2850,13 +2857,14 @@ void PrintConfigDef::init_fff_params()
def->category = L("Quality");
def->tooltip = L("The start position to print each part of outer wall");
def->enum_keys_map = &ConfigOptionEnum<SeamPosition>::get_enum_values();
def->enum_values.push_back("nearest");
//xiamian-
//def->enum_values.push_back("nearest");
def->enum_values.push_back("aligned");
def->enum_values.push_back("back");
//def->enum_values.push_back("back");
def->enum_values.push_back("random");
def->enum_labels.push_back(L("Nearest"));
//def->enum_labels.push_back(L("Nearest"));
def->enum_labels.push_back(L("Aligned"));
def->enum_labels.push_back(L("Back"));
//def->enum_labels.push_back(L("Back"));
def->enum_labels.push_back(L("Random"));
def->mode = comSimple;
def->set_default_value(new ConfigOptionEnum<SeamPosition>(spAligned));

117
slic3r/GUI/Tab.cpp
View File

@ -1922,25 +1922,38 @@ void TabPrint::build()
m_presets = &m_preset_bundle->prints;
load_initial_data();
auto page = add_options_page(L("Quality"), "empty");
auto optgroup = page->new_optgroup(L("Layer height"), L"param_layer_height");
optgroup->append_single_option_line("layer_height", "layer-height");
//xiamian+
auto page = add_options_page("peizhi", "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");
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");
//optgroup->append_single_option_line("layer_height", "layer-height");
optgroup->append_single_option_line("initial_layer_print_height", "layer-height");
optgroup = page->new_optgroup(L("Line width"), L"param_line_width");
optgroup->append_single_option_line("line_width","parameter/line-width");
//xiamian-
//optgroup = page->new_optgroup(L("Line width"), L"param_line_width");
//optgroup->append_single_option_line("line_width","parameter/line-width");
optgroup->append_single_option_line("initial_layer_line_width","parameter/line-width");
optgroup->append_single_option_line("outer_wall_line_width","parameter/line-width");
optgroup->append_single_option_line("inner_wall_line_width","parameter/line-width");
optgroup->append_single_option_line("top_surface_line_width","parameter/line-width");
optgroup->append_single_option_line("sparse_infill_line_width","parameter/line-width");
optgroup->append_single_option_line("internal_solid_infill_line_width","parameter/line-width");
//optgroup->append_single_option_line("internal_solid_infill_line_width","parameter/line-width");
optgroup->append_single_option_line("support_line_width","parameter/line-width");
optgroup = page->new_optgroup(L("Seam"), L"param_seam");
optgroup->append_single_option_line("seam_position", "Seam");
//xiamian-
//optgroup = page->new_optgroup(L("Seam"), L"param_seam");
//optgroup->append_single_option_line("seam_position", "Seam");
optgroup->append_single_option_line("seam_gap", "Seam");
optgroup->append_single_option_line("seam_slope_type");
//optgroup->append_single_option_line("seam_slope_type");
optgroup->append_single_option_line("seam_slope_conditional");
optgroup->append_single_option_line("scarf_angle_threshold");
optgroup->append_single_option_line("seam_slope_start_height");
@ -1949,25 +1962,25 @@ void TabPrint::build()
optgroup->append_single_option_line("seam_slope_steps");
optgroup->append_single_option_line("seam_slope_inner_walls");
optgroup->append_single_option_line("wipe_speed", "Seam");
optgroup = page->new_optgroup(L("Precision"), L"param_precision");
optgroup->append_single_option_line("slice_closing_radius");
//xiamian-
//optgroup = page->new_optgroup(L("Precision"), L"param_precision");
//optgroup->append_single_option_line("slice_closing_radius");
optgroup->append_single_option_line("resolution","acr-move");
optgroup->append_single_option_line("enable_arc_fitting", "acr-move");
optgroup->append_single_option_line("xy_hole_compensation", "xy-hole-contour-compensation");
optgroup->append_single_option_line("xy_contour_compensation", "xy-hole-contour-compensation");
optgroup->append_single_option_line("elefant_foot_compensation", "parameter/elephant-foot");
optgroup->append_single_option_line("precise_z_height");
optgroup = page->new_optgroup(L("Ironing"), L"param_ironing");
optgroup->append_single_option_line("ironing_type", "parameter/ironing");
//optgroup->append_single_option_line("xy_hole_compensation", "xy-hole-contour-compensation");
//optgroup->append_single_option_line("xy_contour_compensation", "xy-hole-contour-compensation");
//optgroup->append_single_option_line("elefant_foot_compensation", "parameter/elephant-foot");
//optgroup->append_single_option_line("precise_z_height");
//xiamian-
//optgroup = page->new_optgroup(L("Ironing"), L"param_ironing");
//optgroup->append_single_option_line("ironing_type", "parameter/ironing");
optgroup->append_single_option_line("ironing_pattern");
optgroup->append_single_option_line("ironing_speed");
optgroup->append_single_option_line("ironing_flow");
optgroup->append_single_option_line("ironing_spacing");
optgroup->append_single_option_line("ironing_direction");
optgroup = page->new_optgroup(L("Wall generator"), L"param_wall");
//xiamian-
//optgroup = page->new_optgroup(L("Wall generator"), L"param_wall");
optgroup->append_single_option_line("wall_generator", "wall-generator");
optgroup->append_single_option_line("wall_transition_angle");
optgroup->append_single_option_line("wall_transition_filter_deviation");
@ -1975,46 +1988,50 @@ void TabPrint::build()
optgroup->append_single_option_line("wall_distribution_count");
optgroup->append_single_option_line("min_bead_width");
optgroup->append_single_option_line("min_feature_size");
optgroup = page->new_optgroup(L("Advanced"), L"param_advanced");
//xiamian-
//optgroup = page->new_optgroup(L("Advanced"), L"param_advanced");
optgroup->append_single_option_line("wall_sequence");
optgroup->append_single_option_line("is_infill_first");
optgroup->append_single_option_line("bridge_flow","parameter/bridge");
optgroup->append_single_option_line("thick_bridges","parameter/bridge");
optgroup->append_single_option_line("top_solid_infill_flow_ratio");
optgroup->append_single_option_line("initial_layer_flow_ratio");
optgroup->append_single_option_line("top_one_wall_type");
optgroup->append_single_option_line("top_area_threshold");
optgroup->append_single_option_line("only_one_wall_first_layer");
optgroup->append_single_option_line("detect_overhang_wall");
optgroup->append_single_option_line("smooth_speed_discontinuity_area");
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("is_infill_first");
//optgroup->append_single_option_line("bridge_flow","parameter/bridge");
//optgroup->append_single_option_line("thick_bridges","parameter/bridge");
//optgroup->append_single_option_line("top_solid_infill_flow_ratio");
//optgroup->append_single_option_line("initial_layer_flow_ratio");
//optgroup->append_single_option_line("top_one_wall_type");
//optgroup->append_single_option_line("top_area_threshold");
//optgroup->append_single_option_line("only_one_wall_first_layer");
//optgroup->append_single_option_line("detect_overhang_wall");
//optgroup->append_single_option_line("smooth_speed_discontinuity_area");
//optgroup->append_single_option_line("smooth_coefficient");
//optgroup->append_single_option_line("reduce_crossing_wall");
//optgroup->append_single_option_line("max_travel_detour_distance");
page = add_options_page(L("Strength"), "empty");
optgroup = page->new_optgroup(L("Walls"), L"param_wall");
optgroup->append_single_option_line("wall_loops","wall-generator");
//xiamian+
optgroup = page->new_optgroup("", L"param_wall");
//xiamian-
//optgroup = page->new_optgroup(L("Walls"), L"param_wall");
//optgroup->append_single_option_line("wall_loops","wall-generator");
optgroup->append_single_option_line("detect_thin_wall","wall-generator");
optgroup = page->new_optgroup(L("Top/bottom shells"), L"param_shell");
//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");
optgroup->append_single_option_line("top_shell_layers");
optgroup->append_single_option_line("top_shell_thickness");
//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");
optgroup->append_single_option_line("bottom_shell_layers");
optgroup->append_single_option_line("bottom_shell_thickness");
//optgroup->append_single_option_line("bottom_shell_layers");
//optgroup->append_single_option_line("bottom_shell_thickness");
optgroup->append_single_option_line("internal_solid_infill_pattern");
optgroup = page->new_optgroup(L("Sparse infill"), L"param_infill");
//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_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("filter_out_gap_fill");
optgroup = page->new_optgroup(L("Advanced"), L"param_advanced");
//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("bridge_angle","parameter/strength-advance-settings");