GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 02:29:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'lm_spe2262' into lm_spe1916_274

Browse Source
This commit is contained in:
Lukas Matena 2024-05-27 11:45:27 +02:00
commit 0568739577
5 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libslic3r/Preset.cpp
View File

@ -622,10 +622,7 @@ static std::vector<std::string> s_Preset_sla_material_options {
"material_ow_branchingsupport_pillar_diameter", "material_ow_branchingsupport_pillar_diameter",
"material_ow_support_points_density_relative", "material_ow_support_points_density_relative",
"material_ow_absolute_correction",
"material_ow_relative_correction_x",
"material_ow_relative_correction_y",
"material_ow_relative_correction_z",
"material_ow_elefant_foot_compensation" "material_ow_elefant_foot_compensation"
}; };

4
src/libslic3r/PrintConfig.cpp
View File

@ -3947,6 +3947,7 @@ void PrintConfigDef::init_sla_params()
def->full_label = L("Printer absolute correction"); def->full_label = L("Printer absolute correction");
def->tooltip = L("Will inflate or deflate the sliced 2D polygons according " def->tooltip = L("Will inflate or deflate the sliced 2D polygons according "
"to the sign of the correction."); "to the sign of the correction.");
def->sidetext = L("mm");
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionFloat(0.0)); def->set_default_value(new ConfigOptionFloat(0.0));
@ -4398,8 +4399,7 @@ void PrintConfigDef::init_sla_params()
"support_head_penetration", "branchingsupport_head_penetration", "support_head_penetration", "branchingsupport_head_penetration",
"support_head_width", "branchingsupport_head_width", "support_head_width", "branchingsupport_head_width",
"support_pillar_diameter", "branchingsupport_pillar_diameter", "support_pillar_diameter", "branchingsupport_pillar_diameter",
"relative_correction_x", "relative_correction_y", "relative_correction_z", "elefant_foot_compensation", "absolute_correction",
"elefant_foot_compensation",
// int // int
"support_points_density_relative" "support_points_density_relative"
}) { }) {

4
src/libslic3r/PrintConfig.hpp
View File

@ -1168,9 +1168,7 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionFloatNullable, material_ow_branchingsupport_head_width)) ((ConfigOptionFloatNullable, material_ow_branchingsupport_head_width))
((ConfigOptionIntNullable, material_ow_support_points_density_relative)) ((ConfigOptionIntNullable, material_ow_support_points_density_relative))
((ConfigOptionFloatNullable, material_ow_elefant_foot_compensation)) ((ConfigOptionFloatNullable, material_ow_elefant_foot_compensation))
((ConfigOptionFloatNullable, material_ow_relative_correction_x)) ((ConfigOptionFloatNullable, material_ow_absolute_correction))
((ConfigOptionFloatNullable, material_ow_relative_correction_y))
((ConfigOptionFloatNullable, material_ow_relative_correction_z))
((ConfigOptionFloat, area_fill)) ((ConfigOptionFloat, area_fill))
//tilt params //tilt params

8
src/libslic3r/SLAPrint.cpp
View File

@ -219,10 +219,8 @@ static t_config_option_keys print_config_diffs(const StaticPrintConfig &curr
"branchingsupport_head_width"sv, "branchingsupport_head_width"sv,
"branchingsupport_pillar_diameter"sv, "branchingsupport_pillar_diameter"sv,
"support_points_density_relative"sv, "support_points_density_relative"sv,
"relative_correction_x"sv,
"relative_correction_y"sv,
"relative_correction_z"sv,
"elefant_foot_compensation"sv, "elefant_foot_compensation"sv,
"absolute_correction"sv,
}; };
static constexpr auto material_ow_prefix = "material_ow_"; static constexpr auto material_ow_prefix = "material_ow_";
@ -908,9 +906,7 @@ bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_opt
"material_ow_branchingsupport_head_width"sv, "material_ow_branchingsupport_head_width"sv,
"material_ow_elefant_foot_compensation"sv, "material_ow_elefant_foot_compensation"sv,
"material_ow_support_points_density_relative"sv, "material_ow_support_points_density_relative"sv,
"material_ow_relative_correction_x"sv, "material_ow_absolute_correction"sv,
"material_ow_relative_correction_y"sv,
"material_ow_relative_correction_z"sv,
"printer_model"sv, "printer_model"sv,
}; };

16
src/slic3r/GUI/Tab.cpp
View File

@ -5622,10 +5622,6 @@ static std::vector<std::string> get_override_opt_kyes_for_line(const std::string
for (auto& prefix : { "", "branching" }) for (auto& prefix : { "", "branching" })
opt_keys.push_back(preprefix + prefix + key); opt_keys.push_back(preprefix + prefix + key);
} }
else if (key == "relative_correction") {
for (auto& axis : { "x", "y", "z" })
opt_keys.push_back(preprefix + key + "_" + char(axis[0]));
}
else else
opt_keys.push_back(preprefix + key); opt_keys.push_back(preprefix + key);
@ -5638,16 +5634,6 @@ void TabSLAMaterial::create_line_with_near_label_widget(ConfigOptionsGroupShp op
add_options_into_line(optgroup, { {"", L("Default")}, {"branching", L("Branching")} }, key, "material_ow_"); add_options_into_line(optgroup, { {"", L("Default")}, {"branching", L("Branching")} }, key, "material_ow_");
else { else {
const std::string opt_key = std::string("material_ow_") + key; const std::string opt_key = std::string("material_ow_") + key;
if (key == "relative_correction") {
Line line = Line{ m_preset_bundle->printers.get_edited_preset().config.def()->get("relative_correction")->full_label, "" };
for (auto& axis : { "X", "Y", "Z" }) {
auto opt = optgroup->get_option(opt_key + "_" + char(std::tolower(axis[0])));
opt.opt.label = axis;
line.append_option(opt);
}
optgroup->append_line(line);
}
else
optgroup->append_single_option_line(opt_key); optgroup->append_single_option_line(opt_key);
} }
@ -5694,7 +5680,7 @@ std::vector<std::pair<std::string, std::vector<std::string>>> material_overrides
"support_points_density_relative" "support_points_density_relative"
}}, }},
{"Corrections", { {"Corrections", {
"relative_correction", "absolute_correction",
"elefant_foot_compensation" "elefant_foot_compensation"
}} }}
}; };