3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-15 02:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Store / retrieve layer height profile from the AMF file.

Browse source 
Reset the layer height profile when changing a print profile to an incompatible one.
Reset button on the layer height bar.
Fixed an update issue on zooming by a scroll wheel.
Fixed an issue when loading an AMF file: Object names are now retained.
This commit is contained in:
bubnikv 2017-02-09 14:56:13 +01:00
parent 61c0ae4e94
commit 88e34ff5de
14 changed files with 379 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xs/src/libslic3r/Print.cpp
View file

@ -371,7 +371,7 @@ Print::add_model_object(ModelObject* model_object, int idx)
this->objects[idx] = o = new PrintObject(this, model_object, bb);
} else {
o = new PrintObject(this, model_object, bb);
objects.push_back(o);
this->objects.push_back(o);
// invalidate steps
this->invalidate_step(psSkirt);
@ -528,8 +528,26 @@ Print::apply_config(DynamicPrintConfig config)
this->clear_objects();
for (ModelObjectPtrs::iterator it = model_objects.begin(); it != model_objects.end(); ++it) {
this->add_model_object(*it);
// Update layer_height_profile from the main thread as it may pull the data from the associated ModelObject.
this->objects.back()->update_layer_height_profile();
}
invalidated = true;
} else {
// Check validity of the layer height profiles.
FOREACH_OBJECT(this, o) {
if (! (*o)->layer_height_profile_valid) {
// The layer_height_profile is not valid for some reason (updated by the user or invalidated due to some option change).
// Start slicing of this object from scratch.
(*o)->invalidate_all_steps();
// Following line sets the layer_height_profile_valid flag.
(*o)->update_layer_height_profile();
invalidated = true;
} else if (! step_done(posSlice)) {
// Update layer_height_profile from the main thread as it may pull the data from the associated ModelObject.
// Only update if the slicing was not finished yet.
(*o)->update_layer_height_profile();
}
}
}
return invalidated;