Correcting parameter name changes and the additional slaposIndexSlices step

This commit is contained in:
tamasmeszaros 2018-11-27 11:06:25 +01:00
parent 85e81a2a21
commit 415a4fa02b

View file

@ -900,12 +900,12 @@ bool SLAPrintObject::invalidate_state_by_config_options(const std::vector<t_conf
std::vector<SLAPrintObjectStep> steps; std::vector<SLAPrintObjectStep> steps;
bool invalidated = false; bool invalidated = false;
for (const t_config_option_key &opt_key : opt_keys) { for (const t_config_option_key &opt_key : opt_keys) {
if ( opt_key == "support_head_front_radius" if ( opt_key == "supports_enable"
|| opt_key == "support_head_front_diameter"
|| opt_key == "support_head_penetration" || opt_key == "support_head_penetration"
|| opt_key == "support_head_back_radius"
|| opt_key == "support_head_width" || opt_key == "support_head_width"
|| opt_key == "support_pillar_radius" || opt_key == "support_pillar_diameter"
|| opt_key == "support_base_radius" || opt_key == "support_base_diameter"
|| opt_key == "support_base_height" || opt_key == "support_base_height"
|| opt_key == "support_critical_angle" || opt_key == "support_critical_angle"
|| opt_key == "support_max_bridge_length" || opt_key == "support_max_bridge_length"
@ -937,18 +937,21 @@ bool SLAPrintObject::invalidate_step(SLAPrintObjectStep step)
if (step == slaposObjectSlice) { if (step == slaposObjectSlice) {
invalidated |= this->invalidate_all_steps(); invalidated |= this->invalidate_all_steps();
} else if (step == slaposSupportIslands) { } else if (step == slaposSupportIslands) {
invalidated |= this->invalidate_steps({ slaposSupportPoints, slaposSupportTree, slaposBasePool, slaposSliceSupports }); invalidated |= this->invalidate_steps({ slaposSupportPoints, slaposSupportTree, slaposBasePool, slaposSliceSupports, slaposIndexSlices });
invalidated |= m_print->invalidate_step(slapsRasterize); invalidated |= m_print->invalidate_step(slapsRasterize);
} else if (step == slaposSupportPoints) { } else if (step == slaposSupportPoints) {
invalidated |= this->invalidate_steps({ slaposSupportTree, slaposBasePool, slaposSliceSupports }); invalidated |= this->invalidate_steps({ slaposSupportTree, slaposBasePool, slaposSliceSupports, slaposIndexSlices });
invalidated |= m_print->invalidate_step(slapsRasterize); invalidated |= m_print->invalidate_step(slapsRasterize);
} else if (step == slaposSupportTree) { } else if (step == slaposSupportTree) {
invalidated |= this->invalidate_steps({ slaposBasePool, slaposSliceSupports }); invalidated |= this->invalidate_steps({ slaposBasePool, slaposSliceSupports, slaposIndexSlices });
invalidated |= m_print->invalidate_step(slapsRasterize); invalidated |= m_print->invalidate_step(slapsRasterize);
} else if (step == slaposBasePool) { } else if (step == slaposBasePool) {
invalidated |= this->invalidate_step(slaposSliceSupports); invalidated |= this->invalidate_steps({slaposSliceSupports, slaposIndexSlices});
invalidated |= m_print->invalidate_step(slapsRasterize); invalidated |= m_print->invalidate_step(slapsRasterize);
} else if (step == slaposSliceSupports) { } else if (step == slaposSliceSupports) {
invalidated |= this->invalidate_step(slaposIndexSlices);
invalidated |= m_print->invalidate_step(slapsRasterize);
} else if(step == slaposIndexSlices) {
invalidated |= m_print->invalidate_step(slapsRasterize); invalidated |= m_print->invalidate_step(slapsRasterize);
} }
return invalidated; return invalidated;