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

Removing separate X and Y relative correction.

Browse Source
This commit is contained in:
tamasmeszaros 2019-04-09 18:15:25 +02:00
parent 81f4ce5f2e
commit 53861b2012
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libslic3r/SLAPrint.cpp
View File

@ -1654,16 +1654,16 @@ Vec3d SLAPrint::relative_correction() const
{ {
Vec3d corr(1., 1., 1.); Vec3d corr(1., 1., 1.);
if(printer_config().relative_correction.values.size() == 3) { if(printer_config().relative_correction.values.size() == 2) {
corr(X) = printer_config().relative_correction.values[X]; corr(X) = printer_config().relative_correction.values[0];
corr(Y) = printer_config().relative_correction.values[Y]; corr(Y) = printer_config().relative_correction.values[0];
corr(Z) = printer_config().relative_correction.values[Z]; corr(Z) = printer_config().relative_correction.values[1];
} }
if(material_config().material_correction.values.size() == 3) { if(material_config().material_correction.values.size() == 2) {
corr(X) *= material_config().material_correction.values[X]; corr(X) *= material_config().material_correction.values[0];
corr(Y) *= material_config().material_correction.values[Y]; corr(Y) *= material_config().material_correction.values[0];
corr(Z) *= material_config().material_correction.values[Z]; corr(Z) *= material_config().material_correction.values[1];
} }
return corr; return corr;

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

@ -2007,7 +2007,8 @@ void TabPrinter::build_sla()
optgroup = page->new_optgroup(_(L("Corrections"))); optgroup = page->new_optgroup(_(L("Corrections")));
line = Line{ m_config->def()->get("relative_correction")->full_label, "" }; line = Line{ m_config->def()->get("relative_correction")->full_label, "" };
std::vector<std::string> axes{ "X", "Y", "Z" }; // std::vector<std::string> axes{ "X", "Y", "Z" };
std::vector<std::string> axes{ "XY", "Z" };
int id = 0; int id = 0;
for (auto& axis : axes) { for (auto& axis : axes) {
auto opt = optgroup->get_option("relative_correction", id); auto opt = optgroup->get_option("relative_correction", id);