Merge remote-tracking branch 'upstream/main' into dev/p2s-pr

This commit is contained in:
Noisyfox
2025-11-07 10:42:06 +08:00
7 changed files with 27 additions and 22 deletions

View File

@@ -1164,12 +1164,15 @@ void PrintConfigDef::init_fff_params()
def = this->add("bridge_density", coPercent);
def->label = L("External bridge density");
def->category = L("Strength");
def->tooltip = L("Controls the density (spacing) of external bridge lines. 100% means solid bridge. Default is 100%.\n\n"
def->tooltip = L("Controls the density (spacing) of external bridge lines. Default is 100%.\n\n"
"Lower density external bridges can help improve reliability as there is more space for air to circulate "
"around the extruded bridge, improving its cooling speed.");
"around the extruded bridge, improving its cooling speed. Minimum is 10%.\n\n"
"Higher densities can produce smoother bridge surfaces, as overlapping lines provide "
"additional support during printing. Maximum is 120%. \n"
"Note: Bridge density that is too high can cause warping or overextrusion.");
def->sidetext = "%";
def->min = 10;
def->max = 100;
def->max = 120;
def->mode = comAdvanced;
def->set_default_value(new ConfigOptionPercent(100));

View File

@@ -858,7 +858,7 @@ static void _collect_filament_info(const wxString& shown_name,
unordered_map<wxString, wxString>& query_filament_types)
{
query_filament_vendors[shown_name] = filament.config.get_filament_vendor();
query_filament_vendors[shown_name] = filament.config.get_filament_type();
query_filament_types[shown_name] = filament.config.get_filament_type();
}
void AMSMaterialsSetting::Popup(wxString filament, wxString sn, wxString temp_min, wxString temp_max, wxString k, wxString n)

View File

@@ -789,7 +789,7 @@ void ConfigManipulation::toggle_print_fff_options(DynamicPrintConfig *config, co
toggle_field(el, have_support_material && !(support_is_normal_tree && !have_raft));
bool has_ironing = (config->opt_enum<IroningType>("ironing_type") != IroningType::NoIroning);
for (auto el : { "ironing_pattern", "ironing_flow", "ironing_spacing", "ironing_angle", "ironing_inset"})
for (auto el : { "ironing_pattern", "ironing_flow", "ironing_spacing", "ironing_angle", "ironing_inset", "ironing_angle_fixed" })
toggle_line(el, has_ironing);
toggle_line("ironing_speed", has_ironing || has_support_ironing);