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

Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate

Browse Source
This commit is contained in:
Filip Sykala - NTB T15p 2023-01-18 09:18:54 +01:00
commit 8c2ac9d83b
5 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/libslic3r/PrintApply.cpp
View File

@ -1201,7 +1201,6 @@ Print::ApplyStatus Print::apply(const Model &model, DynamicPrintConfig new_full_
} }
// Invalidate just the supports step. // Invalidate just the supports step.
for (const PrintObjectStatus &print_object_status : print_objects_range) { for (const PrintObjectStatus &print_object_status : print_objects_range) {
update_apply_status(print_object_status.print_object->invalidate_step(posSupportSpotsSearch));
update_apply_status(print_object_status.print_object->invalidate_step(posSupportMaterial)); update_apply_status(print_object_status.print_object->invalidate_step(posSupportMaterial));
} }
if (supports_differ) { if (supports_differ) {

5
src/libslic3r/PrintConfig.cpp
View File

@ -534,7 +534,7 @@ void PrintConfigDef::init_fff_params()
def->category = L("Speed"); def->category = L("Speed");
def->tooltip = L("This setting enables dynamic speed control on overhangs."); def->tooltip = L("This setting enables dynamic speed control on overhangs.");
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionBool(true)); def->set_default_value(new ConfigOptionBool(false));
def = this->add("overhang_overlap_levels", coPercents); def = this->add("overhang_overlap_levels", coPercents);
def->full_label = L("Overhang overlap levels"); def->full_label = L("Overhang overlap levels");
@ -841,7 +841,8 @@ void PrintConfigDef::init_fff_params()
def = this->add("extra_perimeters_on_overhangs", coBool); def = this->add("extra_perimeters_on_overhangs", coBool);
def->label = L("Extra perimeters on overhangs (Experimental)"); def->label = L("Extra perimeters on overhangs (Experimental)");
def->category = L("Layers and Perimeters"); def->category = L("Layers and Perimeters");
def->tooltip = L("Create additional perimeter paths over steep overhangs and areas where bridges cannot be anchored."); def->tooltip = L("Detect overhang areas where bridges cannot be anchored, and fill them with "
"extra perimeter paths. These paths are anchored to the nearby non-overhang area when possible.");
def->mode = comExpert; def->mode = comExpert;
def->set_default_value(new ConfigOptionBool(false)); def->set_default_value(new ConfigOptionBool(false));

4
src/libslic3r/PrintObject.cpp
View File

@ -789,10 +789,10 @@ bool PrintObject::invalidate_step(PrintObjectStep step)
// propagate to dependent steps // propagate to dependent steps
if (step == posPerimeters) { if (step == posPerimeters) {
invalidated |= this->invalidate_steps({ posPrepareInfill, posInfill, posIroning, posEstimateCurledExtrusions }); invalidated |= this->invalidate_steps({ posPrepareInfill, posInfill, posIroning, posSupportSpotsSearch, posEstimateCurledExtrusions });
invalidated |= m_print->invalidate_steps({ psSkirtBrim }); invalidated |= m_print->invalidate_steps({ psSkirtBrim });
} else if (step == posPrepareInfill) { } else if (step == posPrepareInfill) {
invalidated |= this->invalidate_steps({ posInfill, posIroning }); invalidated |= this->invalidate_steps({ posInfill, posIroning, posSupportSpotsSearch });
} else if (step == posInfill) { } else if (step == posInfill) {
invalidated |= this->invalidate_steps({ posIroning, posSupportSpotsSearch }); invalidated |= this->invalidate_steps({ posIroning, posSupportSpotsSearch });
invalidated |= m_print->invalidate_steps({ psSkirtBrim }); invalidated |= m_print->invalidate_steps({ psSkirtBrim });

12
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp
View File

@ -517,14 +517,6 @@ bool GLGizmoFdmSupports::has_backend_supports()
return done; return done;
} }
void GLGizmoFdmSupports::reslice_FDM_supports(bool postpone_error_messages) const {
wxGetApp().CallAfter(
[this, postpone_error_messages]() {
wxGetApp().plater()->reslice_FFF_until_step(posSupportSpotsSearch,
*m_c->selection_info()->model_object(), postpone_error_messages);
});
}
void GLGizmoFdmSupports::auto_generate() void GLGizmoFdmSupports::auto_generate()
{ {
ModelObject *mo = m_c->selection_info()->model_object(); ModelObject *mo = m_c->selection_info()->model_object();
@ -549,8 +541,10 @@ void GLGizmoFdmSupports::auto_generate()
} }
} }
wxGetApp().CallAfter([this]() {
wxGetApp().plater()->reslice_FFF_until_step(posSupportSpotsSearch, *m_c->selection_info()->model_object(), false);
this->waiting_for_autogenerated_supports = true; this->waiting_for_autogenerated_supports = true;
wxGetApp().CallAfter([this]() { reslice_FDM_supports(); }); });
} }
} }

1
src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.hpp
View File

@ -44,7 +44,6 @@ private:
bool waiting_for_autogenerated_supports = false; bool waiting_for_autogenerated_supports = false;
bool has_backend_supports(); bool has_backend_supports();
void reslice_FDM_supports(bool postpone_error_messages = false) const;
void auto_generate(); void auto_generate();
void apply_data_from_backend(); void apply_data_from_backend();
}; };