From 53861b2012b0341b7bf626299a28bd2c31f12d9a Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 9 Apr 2019 18:15:25 +0200 Subject: [PATCH] Removing separate X and Y relative correction. --- src/libslic3r/SLAPrint.cpp | 16 ++++++++-------- src/slic3r/GUI/Tab.cpp | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/libslic3r/SLAPrint.cpp b/src/libslic3r/SLAPrint.cpp index d973ca1561..e5a5744638 100644 --- a/src/libslic3r/SLAPrint.cpp +++ b/src/libslic3r/SLAPrint.cpp @@ -1654,16 +1654,16 @@ Vec3d SLAPrint::relative_correction() const { Vec3d corr(1., 1., 1.); - if(printer_config().relative_correction.values.size() == 3) { - corr(X) = printer_config().relative_correction.values[X]; - corr(Y) = printer_config().relative_correction.values[Y]; - corr(Z) = printer_config().relative_correction.values[Z]; + if(printer_config().relative_correction.values.size() == 2) { + corr(X) = printer_config().relative_correction.values[0]; + corr(Y) = printer_config().relative_correction.values[0]; + corr(Z) = printer_config().relative_correction.values[1]; } - if(material_config().material_correction.values.size() == 3) { - corr(X) *= material_config().material_correction.values[X]; - corr(Y) *= material_config().material_correction.values[Y]; - corr(Z) *= material_config().material_correction.values[Z]; + if(material_config().material_correction.values.size() == 2) { + corr(X) *= material_config().material_correction.values[0]; + corr(Y) *= material_config().material_correction.values[0]; + corr(Z) *= material_config().material_correction.values[1]; } return corr; diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index e5b83587e7..7e8b83e9ef 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2007,7 +2007,8 @@ void TabPrinter::build_sla() optgroup = page->new_optgroup(_(L("Corrections"))); line = Line{ m_config->def()->get("relative_correction")->full_label, "" }; - std::vector axes{ "X", "Y", "Z" }; +// std::vector axes{ "X", "Y", "Z" }; + std::vector axes{ "XY", "Z" }; int id = 0; for (auto& axis : axes) { auto opt = optgroup->get_option("relative_correction", id);