From b60de250863c04f37c8cb528e9605e768fd8b4d5 Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Wed, 22 May 2024 13:36:07 +0200
Subject: [PATCH] Removed printer scaling correction from material overrides

---
 src/libslic3r/Preset.cpp      |  3 ---
 src/libslic3r/PrintConfig.cpp |  1 -
 src/libslic3r/PrintConfig.hpp |  3 ---
 src/libslic3r/SLAPrint.cpp    |  6 ------
 src/slic3r/GUI/Tab.cpp        | 17 +----------------
 5 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
index 98c44192c6..11ace515fa 100644
--- a/src/libslic3r/Preset.cpp
+++ b/src/libslic3r/Preset.cpp
@@ -623,9 +623,6 @@ static std::vector<std::string> s_Preset_sla_material_options {
 
     "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"
 };
 
diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 628398ed64..73cb4ca190 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -4398,7 +4398,6 @@ 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", "absolute_correction",
         // int
         "support_points_density_relative"
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index 9a3be796f0..5cbb2cf770 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -1169,9 +1169,6 @@ PRINT_CONFIG_CLASS_DEFINE(
     ((ConfigOptionIntNullable,                 material_ow_support_points_density_relative))
     ((ConfigOptionFloatNullable,               material_ow_elefant_foot_compensation))
     ((ConfigOptionFloatNullable,               material_ow_absolute_correction))
-    ((ConfigOptionFloatNullable,               material_ow_relative_correction_x))
-    ((ConfigOptionFloatNullable,               material_ow_relative_correction_y))
-    ((ConfigOptionFloatNullable,               material_ow_relative_correction_z))
     ((ConfigOptionFloat,                       area_fill))
 
     //tilt params
diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp
index 2d59190236..42b06f7239 100644
--- a/src/libslic3r/SLAPrint.cpp
+++ b/src/libslic3r/SLAPrint.cpp
@@ -219,9 +219,6 @@ 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,
     };
@@ -910,9 +907,6 @@ bool SLAPrint::invalidate_state_by_config_options(const std::vector<t_config_opt
         "material_ow_elefant_foot_compensation"sv,
         "material_ow_support_points_density_relative"sv,
         "material_ow_absolute_correction"sv,
-        "material_ow_relative_correction_x"sv,
-        "material_ow_relative_correction_y"sv,
-        "material_ow_relative_correction_z"sv,
         "printer_model"sv,
     };
 
diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp
index 787dfa5ac7..18505e4660 100644
--- a/src/slic3r/GUI/Tab.cpp
+++ b/src/slic3r/GUI/Tab.cpp
@@ -5622,10 +5622,6 @@ static std::vector<std::string> 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();
@@ -5695,7 +5681,6 @@ std::vector<std::pair<std::string, std::vector<std::string>>> material_overrides
     }},
     {"Corrections", {
         "absolute_correction",
-        "relative_correction",
         "elefant_foot_compensation"
     }}
 };