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

Merge branch 'tm_sla_supports_backend'

Browse source
This commit is contained in:
tamasmeszaros 2018-11-29 13:34:48 +01:00
commit 38733ff56a
4 changed files with 55 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/slic3r/GUI/Plater.cpp
View file

@ -1746,6 +1746,9 @@ void Plater::priv::sla_optimize_rotation() {
if(rotoptimizing.load()) // wasn't canceled
for(ModelInstance * oi : o->instances) oi->set_rotation({r[X], r[Y], r[Z]});
// Correct the z offset of the object which was corrupted be the rotation
o->ensure_on_bed();
stfn(0, L("Orientation found."));
statusbar()->set_range(prev_range);
statusbar()->set_cancel_callback();

6
src/slic3r/GUI/ProgressStatusBar.cpp
View file

@ -75,7 +75,11 @@ void ProgressStatusBar::set_progress(int val)
if(val == m_prog->GetRange()) {
m_prog->SetValue(0);
show_progress(false);
} else {
}
else if(val < 0) {
m_prog->Pulse();
}
else {
m_prog->SetValue(val);
}
}