diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp index df6260c5e0..11ace515fa 100644 --- a/src/libslic3r/Preset.cpp +++ b/src/libslic3r/Preset.cpp @@ -622,10 +622,7 @@ static std::vector s_Preset_sla_material_options { "material_ow_branchingsupport_pillar_diameter", "material_ow_support_points_density_relative", - - "material_ow_relative_correction_x", - "material_ow_relative_correction_y", - "material_ow_relative_correction_z", + "material_ow_absolute_correction", "material_ow_elefant_foot_compensation" }; diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp index e4dfcdf866..d89831827f 100644 --- a/src/libslic3r/PrintConfig.cpp +++ b/src/libslic3r/PrintConfig.cpp @@ -3947,6 +3947,7 @@ void PrintConfigDef::init_sla_params() def->full_label = L("Printer absolute correction"); def->tooltip = L("Will inflate or deflate the sliced 2D polygons according " "to the sign of the correction."); + def->sidetext = L("mm"); def->mode = comExpert; 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_width", "branchingsupport_head_width", "support_pillar_diameter", "branchingsupport_pillar_diameter", - "relative_correction_x", "relative_correction_y", "relative_correction_z", - "elefant_foot_compensation", + "elefant_foot_compensation", "absolute_correction", // int "support_points_density_relative" }) { diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp index 5159bcdbc2..5cbb2cf770 100644 --- a/src/libslic3r/PrintConfig.hpp +++ b/src/libslic3r/PrintConfig.hpp @@ -1168,9 +1168,7 @@ PRINT_CONFIG_CLASS_DEFINE( ((ConfigOptionFloatNullable, material_ow_branchingsupport_head_width)) ((ConfigOptionIntNullable, material_ow_support_points_density_relative)) ((ConfigOptionFloatNullable, material_ow_elefant_foot_compensation)) - ((ConfigOptionFloatNullable, material_ow_relative_correction_x)) - ((ConfigOptionFloatNullable, material_ow_relative_correction_y)) - ((ConfigOptionFloatNullable, material_ow_relative_correction_z)) + ((ConfigOptionFloatNullable, material_ow_absolute_correction)) ((ConfigOptionFloat, area_fill)) //tilt params diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp index 33e57ed5cb..42b06f7239 100644 --- a/src/libslic3r/SLAPrint.cpp +++ b/src/libslic3r/SLAPrint.cpp @@ -219,10 +219,8 @@ static t_config_option_keys print_config_diffs(const StaticPrintConfig &curr "branchingsupport_head_width"sv, "branchingsupport_pillar_diameter"sv, "support_points_density_relative"sv, - "relative_correction_x"sv, - "relative_correction_y"sv, - "relative_correction_z"sv, "elefant_foot_compensation"sv, + "absolute_correction"sv, }; static constexpr auto material_ow_prefix = "material_ow_"; @@ -908,9 +906,7 @@ bool SLAPrint::invalidate_state_by_config_options(const std::vector get_override_opt_kyes_for_line(const std::string for (auto& prefix : { "", "branching" }) 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 opt_keys.push_back(preprefix + key); @@ -5638,17 +5634,7 @@ void TabSLAMaterial::create_line_with_near_label_widget(ConfigOptionsGroupShp op add_options_into_line(optgroup, { {"", L("Default")}, {"branching", L("Branching")} }, key, "material_ow_"); else { 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); } Line* line = optgroup->get_last_line(); @@ -5694,7 +5680,7 @@ std::vector>> material_overrides "support_points_density_relative" }}, {"Corrections", { - "relative_correction", + "absolute_correction", "elefant_foot_compensation" }} };