3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Follow-up of bc81c22e (renamed the new CLI option --dont-ensure-on-bed to avoid double negatives)

Browse source
This commit is contained in:
Lukas Matena 2021-08-04 15:43:22 +02:00
parent 7fd9a9cf6e
commit e76b54b770
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/PrusaSlicer.cpp
View file

@ -258,7 +258,6 @@ int CLI::run(int argc, char **argv)
Points bed = get_bed_shape(m_print_config);
ArrangeParams arrange_cfg;
arrange_cfg.min_obj_distance = scaled(min_object_distance(m_print_config));
bool user_ensure_on_bed = true;
for (auto const &opt_key : m_transforms) {
if (opt_key == "merge") {
@ -331,10 +330,8 @@ int CLI::run(int argc, char **argv)
}
} else if (opt_key == "dont_arrange") {
// do nothing - this option alters other transform options
} else if (opt_key == "dont_ensure_on_bed") {
// Remember that we saw this so we don't lift objects from the bed
// after the other transformations are processed.
user_ensure_on_bed = false;
} else if (opt_key == "ensure_on_bed") {
// do nothing, the value is used later
} else if (opt_key == "rotate") {
for (auto &model : m_models)
for (auto &o : model.objects)
@ -439,7 +436,7 @@ int CLI::run(int argc, char **argv)
// All transforms have been dealt with. Now ensure that the objects are on bed.
// (Unless the user said otherwise.)
if (user_ensure_on_bed)
if (m_config.opt_bool("ensure_on_bed"))
for (auto &model : m_models)
for (auto &o : model.objects)
o->ensure_on_bed();

7
src/libslic3r/PrintConfig.cpp
View file

@ -4154,9 +4154,10 @@ CLITransformConfigDef::CLITransformConfigDef()
def->label = L("Don't arrange");
def->tooltip = L("Do not rearrange the given models before merging and keep their original XY coordinates.");
def = this->add("dont_ensure_on_bed", coBool);
def->label = L("Don't ensure on bed");
def->tooltip = L("Do not lift the object above the bed when it is partially below.");
def = this->add("ensure_on_bed", coBool);
def->label = L("Ensure on bed");
def->tooltip = L("Lift the object above the bed when it is partially below. Enabled by default, use --no-ensure-on-bed to disable.");
def->set_default_value(new ConfigOptionBool(true));
def = this->add("duplicate", coInt);
def->label = L("Duplicate");