This commit is contained in:
cjw 2024-12-19 14:46:48 +08:00
parent 6888247c5f
commit c0047dcac3
2 changed files with 21 additions and 15 deletions

View File

@ -1615,12 +1615,15 @@ void PrintConfigDef::init_fff_params()
def->enum_values.push_back("adaptivecubic"); def->enum_values.push_back("adaptivecubic");
def->enum_values.push_back("alignedrectilinear"); def->enum_values.push_back("alignedrectilinear");
def->enum_values.push_back("3dhoneycomb"); def->enum_values.push_back("3dhoneycomb");
def->enum_values.push_back("hilbertcurve"); //xiamian-
def->enum_values.push_back("archimedeanchords"); //def->enum_values.push_back("hilbertcurve");
def->enum_values.push_back("octagramspiral"); //def->enum_values.push_back("archimedeanchords");
//def->enum_values.push_back("octagramspiral");
def->enum_values.push_back("supportcubic"); def->enum_values.push_back("supportcubic");
def->enum_values.push_back("lightning"); def->enum_values.push_back("lightning");
def->enum_values.push_back("crosshatch"); 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("Concentric"));
def->enum_labels.push_back(L("Rectilinear")); def->enum_labels.push_back(L("Rectilinear"));
def->enum_labels.push_back(L("Grid")); 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("Adaptive Cubic"));
def->enum_labels.push_back(L("Aligned Rectilinear")); def->enum_labels.push_back(L("Aligned Rectilinear"));
def->enum_labels.push_back(L("3D Honeycomb")); def->enum_labels.push_back(L("3D Honeycomb"));
def->enum_labels.push_back(L("Hilbert Curve")); //xiamian-
def->enum_labels.push_back(L("Archimedean Chords")); //def->enum_labels.push_back(L("Hilbert Curve"));
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->enum_labels.push_back(L("Support Cubic")); def->enum_labels.push_back(L("Support Cubic"));
def->enum_labels.push_back(L("Lightning")); def->enum_labels.push_back(L("Lightning"));
def->enum_labels.push_back(L("Cross Hatch")); def->enum_labels.push_back(L("Cross Hatch"));
//xiamian+
def->enum_labels.push_back(L("Fiber Spiral"));
def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipCubic)); def->set_default_value(new ConfigOptionEnum<InfillPattern>(ipCubic));
def = this->add("top_surface_acceleration", coFloat); def = this->add("top_surface_acceleration", coFloat);

View File

@ -1923,7 +1923,7 @@ void TabPrint::build()
load_initial_data(); load_initial_data();
//xiamian+ //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"); auto optgroup = page->new_optgroup("", L"param_layer_height");
optgroup->append_single_option_line("wall_loops", "wall-generator"); optgroup->append_single_option_line("wall_loops", "wall-generator");
optgroup->append_single_option_line("layer_height", "layer-height"); 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("top_shell_thickness");
optgroup->append_single_option_line("bottom_shell_layers"); optgroup->append_single_option_line("bottom_shell_layers");
optgroup->append_single_option_line("bottom_shell_thickness"); optgroup->append_single_option_line("bottom_shell_thickness");
optgroup->append_single_option_line("sparse_infill_density");
page = add_options_page(L("Quality"), "empty"); page = add_options_page(L("Quality"), "empty");
//xiamian- //xiamian-
//auto page = add_options_page(L("Quality"), "empty"); //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 = page->new_optgroup(L("Top/bottom shells"), L"param_shell");
optgroup->append_single_option_line("interface_shells"); 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_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_layers");
//optgroup->append_single_option_line("top_shell_thickness"); //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_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->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_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_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");
optgroup->append_single_option_line("sparse_infill_anchor_max"); //optgroup->append_single_option_line("sparse_infill_anchor_max");
optgroup->append_single_option_line("filter_out_gap_fill"); 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_wall_overlap","parameter/strength-advance-settings");
optgroup->append_single_option_line("infill_direction","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("bridge_angle","parameter/strength-advance-settings");
optgroup->append_single_option_line("minimum_sparse_infill_area","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("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("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("ensure_vertical_shell_thickness","parameter/strength-advance-settings");
//optgroup->append_single_option_line("internal_bridge_support_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"); page = add_options_page(L("Speed"), "empty");