3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Print step invalidation: Improvement of readability.

Browse source
This commit is contained in:
bubnikv 2018-10-31 19:21:00 +01:00
parent 8cab0a9757
commit e6d78cc063
3 changed files with 29 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libslic3r/Print.cpp
View file

@ -977,14 +977,13 @@ Print::ApplyStatus Print::apply(const Model &model, const DynamicPrintConfig &co
new_objects = true;
if (it_old != old.end())
const_cast<PrintObjectStatus*>(*it_old)->status = PrintObjectStatus::Deleted;
} else if ((*it_old)->print_object->copies() != new_instances.copies) {
} else {
// The PrintObject already exists and the copies differ.
if ((*it_old)->print_object->copies().size() != new_instances.copies.size())
update_apply_status(this->invalidate_step(psWipeTower));
if ((*it_old)->print_object->set_copies(new_instances.copies)) {
// Invalidated
static PrintStep steps[] = { psSkirt, psBrim, psGCodeExport };
update_apply_status(this->invalidate_multiple_steps(steps, steps + 3));
update_apply_status(this->invalidate_steps({ psSkirt, psBrim, psGCodeExport }));
}
print_objects_new.emplace_back((*it_old)->print_object);
const_cast<PrintObjectStatus*>(*it_old)->status = PrintObjectStatus::Reused;
@ -1002,10 +1001,8 @@ Print::ApplyStatus Print::apply(const Model &model, const DynamicPrintConfig &co
delete pos.print_object;
deleted_objects = true;
}
if (deleted_objects) {
static PrintStep steps[] = { psSkirt, psBrim, psWipeTower, psGCodeExport };
update_apply_status(this->invalidate_multiple_steps(steps, steps + 4));
}
if (new_objects || deleted_objects)
update_apply_status(this->invalidate_steps({ psSkirt, psBrim, psWipeTower, psGCodeExport }));
update_apply_status(new_objects);
}
print_object_status.clear();