Trying to solve forward compatibility for SLA relative_corrections

This commit is contained in:
tamasmeszaros 2021-10-22 16:34:20 +02:00
parent 36df8df8b4
commit c6de3e84eb
6 changed files with 119 additions and 27 deletions

View file

@ -2479,14 +2479,11 @@ void TabPrinter::build_sla()
optgroup = page->new_optgroup(L("Corrections"));
line = Line{ m_config->def()->get("relative_correction")->full_label, "" };
// std::vector<std::string> axes{ "X", "Y", "Z" };
std::vector<std::string> axes{ "XY", "Z" };
int id = 0;
std::vector<std::string> axes{ "X", "Y", "Z" };
for (auto& axis : axes) {
auto opt = optgroup->get_option("relative_correction", id);
auto opt = optgroup->get_option(std::string("relative_correction_") + char(std::tolower(axis[0])));
opt.opt.label = axis;
line.append_option(opt);
++id;
}
optgroup->append_line(line);
optgroup->append_single_option_line("absolute_correction");
@ -4204,21 +4201,16 @@ void TabSLAMaterial::build()
optgroup->append_single_option_line("initial_exposure_time");
optgroup = page->new_optgroup(L("Corrections"));
std::vector<std::string> corrections = {"material_correction"};
// std::vector<std::string> axes{ "X", "Y", "Z" };
std::vector<std::string> axes{ "XY", "Z" };
for (auto& opt_key : corrections) {
auto line = Line{ m_config->def()->get(opt_key)->full_label, "" };
int id = 0;
for (auto& axis : axes) {
auto opt = optgroup->get_option(opt_key, id);
opt.opt.label = axis;
line.append_option(opt);
++id;
}
optgroup->append_line(line);
auto line = Line{ m_config->def()->get("material_correction")->full_label, "" };
std::vector<std::string> axes{ "X", "Y", "Z" };
for (auto& axis : axes) {
auto opt = optgroup->get_option(std::string("material_correction_") + char(std::tolower(axis[0])));
opt.opt.label = axis;
line.append_option(opt);
}
optgroup->append_line(line);
page = add_options_page(L("Notes"), "note.png");
optgroup = page->new_optgroup(L("Notes"), 0);
optgroup->label_width = 0;