Move checkbox for support alerts into AppConfig preferences.

Separate Alerts into new print object step so that not warnings are thrown for autopaint.
finally fix -1 access int SupportSpotGenerator bridge detection
This commit is contained in:
PavelMikus 2023-01-27 14:40:06 +01:00 committed by Pavel Mikuš
parent 43020d02c5
commit 05c4e759cf
12 changed files with 92 additions and 69 deletions

View File

@ -66,6 +66,9 @@ void AppConfig::set_defaults()
// Disable background processing by default as it is not stable. // Disable background processing by default as it is not stable.
if (get("background_processing").empty()) if (get("background_processing").empty())
set("background_processing", "0"); set("background_processing", "0");
// Enable support issues alerts by default
if (get("alert_when_supports_needed").empty())
set("alert_when_supports_needed", "1");
// If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden. // If set, the "Controller" tab for the control of the printer over serial line and the serial port settings are hidden.
// By default, Prusa has the controller hidden. // By default, Prusa has the controller hidden.
if (get("no_controller").empty()) if (get("no_controller").empty())

View File

@ -444,7 +444,7 @@ static std::vector<std::string> s_Preset_print_options {
"top_solid_infill_speed", "support_material_speed", "support_material_xy_spacing", "support_material_interface_speed", "top_solid_infill_speed", "support_material_speed", "support_material_xy_spacing", "support_material_interface_speed",
"bridge_speed", "gap_fill_speed", "gap_fill_enabled", "travel_speed", "travel_speed_z", "first_layer_speed", "first_layer_speed_over_raft", "perimeter_acceleration", "infill_acceleration", "bridge_speed", "gap_fill_speed", "gap_fill_enabled", "travel_speed", "travel_speed_z", "first_layer_speed", "first_layer_speed_over_raft", "perimeter_acceleration", "infill_acceleration",
"bridge_acceleration", "first_layer_acceleration", "first_layer_acceleration_over_raft", "default_acceleration", "skirts", "skirt_distance", "skirt_height", "draft_shield", "bridge_acceleration", "first_layer_acceleration", "first_layer_acceleration_over_raft", "default_acceleration", "skirts", "skirt_distance", "skirt_height", "draft_shield",
"min_skirt_length", "brim_width", "brim_separation", "brim_type", "check_for_issues_mode", "support_material", "support_material_auto", "support_material_threshold", "support_material_enforce_layers", "min_skirt_length", "brim_width", "brim_separation", "brim_type", "support_material", "support_material_auto", "support_material_threshold", "support_material_enforce_layers",
"raft_layers", "raft_first_layer_density", "raft_first_layer_expansion", "raft_contact_distance", "raft_expansion", "raft_layers", "raft_first_layer_density", "raft_first_layer_expansion", "raft_contact_distance", "raft_expansion",
"support_material_pattern", "support_material_with_sheath", "support_material_spacing", "support_material_closing_radius", "support_material_style", "support_material_pattern", "support_material_with_sheath", "support_material_spacing", "support_material_closing_radius", "support_material_style",
"support_material_synchronize_layers", "support_material_angle", "support_material_interface_layers", "support_material_bottom_interface_layers", "support_material_synchronize_layers", "support_material_angle", "support_material_interface_layers", "support_material_bottom_interface_layers",

View File

@ -841,6 +841,8 @@ void Print::process()
obj->ironing(); obj->ironing();
for (PrintObject *obj : m_objects) for (PrintObject *obj : m_objects)
obj->generate_support_spots(); obj->generate_support_spots();
for (PrintObject *obj : m_objects)
obj->alert_when_supports_needed();
for (PrintObject *obj : m_objects) for (PrintObject *obj : m_objects)
obj->generate_support_material(); obj->generate_support_material();
for (PrintObject *obj : m_objects) for (PrintObject *obj : m_objects)

View File

@ -64,7 +64,7 @@ enum PrintStep : unsigned int {
enum PrintObjectStep : unsigned int { enum PrintObjectStep : unsigned int {
posSlice, posPerimeters, posPrepareInfill, posSlice, posPerimeters, posPrepareInfill,
posInfill, posIroning, posSupportSpotsSearch, posSupportMaterial, posEstimateCurledExtrusions, posCount, posInfill, posIroning, posSupportSpotsSearch, posAlertWhenSupportsNeeded, posSupportMaterial, posEstimateCurledExtrusions, posCount,
}; };
// A PrintRegion object represents a group of volumes to print // A PrintRegion object represents a group of volumes to print
@ -205,6 +205,7 @@ public:
struct GeneratedSupportPoints{ struct GeneratedSupportPoints{
Transform3d object_transform; // for frontend object mapping Transform3d object_transform; // for frontend object mapping
SupportSpotsGenerator::SupportPoints support_points; SupportSpotsGenerator::SupportPoints support_points;
SupportSpotsGenerator::PartialObjects partial_objects;
}; };
std::vector<std::unique_ptr<PrintRegion>> all_regions; std::vector<std::unique_ptr<PrintRegion>> all_regions;
@ -370,6 +371,7 @@ private:
void infill(); void infill();
void ironing(); void ironing();
void generate_support_spots(); void generate_support_spots();
void alert_when_supports_needed();
void generate_support_material(); void generate_support_material();
void estimate_curled_extrusions(); void estimate_curled_extrusions();

View File

@ -2589,14 +2589,6 @@ void PrintConfigDef::init_fff_params()
def->mode = comAdvanced; def->mode = comAdvanced;
def->set_default_value(new ConfigOptionEnum<SlicingMode>(SlicingMode::Regular)); def->set_default_value(new ConfigOptionEnum<SlicingMode>(SlicingMode::Regular));
def = this->add("check_for_issues_mode", coBool);
def->label = L("Check for issues: ");
def->category = L("Support material");
def->tooltip = L("Check for supportable issues that may appear during printing. "
"If enabled, slicer will make alerts when it detects "
"issues that may be resolved with supports and/or brim.");
def->set_default_value(new ConfigOptionBool(true));
def = this->add("support_material", coBool); def = this->add("support_material", coBool);
def->label = L("Generate support material"); def->label = L("Generate support material");
def->category = L("Support material"); def->category = L("Support material");

View File

@ -516,7 +516,6 @@ PRINT_CONFIG_CLASS_DEFINE(
((ConfigOptionInt, wall_distribution_count)) ((ConfigOptionInt, wall_distribution_count))
((ConfigOptionFloatOrPercent, min_feature_size)) ((ConfigOptionFloatOrPercent, min_feature_size))
((ConfigOptionFloatOrPercent, min_bead_width)) ((ConfigOptionFloatOrPercent, min_bead_width))
((ConfigOptionBool, check_for_issues_mode))
((ConfigOptionBool, support_material)) ((ConfigOptionBool, support_material))
// Automatic supports (generated based fdm support point generator). // Automatic supports (generated based fdm support point generator).
((ConfigOptionBool, support_material_auto)) ((ConfigOptionBool, support_material_auto))

View File

@ -417,7 +417,7 @@ void PrintObject::generate_support_spots()
{ {
if (this->set_started(posSupportSpotsSearch)) { if (this->set_started(posSupportSpotsSearch)) {
BOOST_LOG_TRIVIAL(debug) << "Searching support spots - start"; BOOST_LOG_TRIVIAL(debug) << "Searching support spots - start";
m_print->set_status(75, L("Searching support spots")); m_print->set_status(65, L("Searching support spots"));
if (!this->shared_regions()->generated_support_points.has_value()) { if (!this->shared_regions()->generated_support_points.has_value()) {
PrintTryCancel cancel_func = m_print->make_try_cancel(); PrintTryCancel cancel_func = m_print->make_try_cancel();
SupportSpotsGenerator::Params params{this->print()->m_config.filament_type.values, SupportSpotsGenerator::Params params{this->print()->m_config.filament_type.values,
@ -425,8 +425,19 @@ void PrintObject::generate_support_spots()
this->config().raft_layers.getInt(), this->config().brim_type.value, this->config().raft_layers.getInt(), this->config().brim_type.value,
float(this->config().brim_width.getFloat())}; float(this->config().brim_width.getFloat())};
auto [supp_points, partial_objects] = SupportSpotsGenerator::full_search(this, cancel_func, params); auto [supp_points, partial_objects] = SupportSpotsGenerator::full_search(this, cancel_func, params);
this->m_shared_regions->generated_support_points = {this->trafo_centered(), supp_points}; this->m_shared_regions->generated_support_points = {this->trafo_centered(), supp_points, partial_objects};
m_print->throw_if_canceled(); m_print->throw_if_canceled();
}
BOOST_LOG_TRIVIAL(debug) << "Searching support spots - end";
this->set_done(posSupportSpotsSearch);
}
}
void PrintObject::alert_when_supports_needed()
{
if (this->set_started(posAlertWhenSupportsNeeded)) {
BOOST_LOG_TRIVIAL(debug) << "posAlertWhenSupportsNeeded - start";
m_print->set_status(69, L("Alert if supports needed"));
auto alert_fn = [&](PrintStateBase::WarningLevel level, SupportSpotsGenerator::SupportPointCause cause) { auto alert_fn = [&](PrintStateBase::WarningLevel level, SupportSpotsGenerator::SupportPointCause cause) {
switch (cause) { switch (cause) {
@ -462,11 +473,13 @@ void PrintObject::generate_support_spots()
} }
}; };
if (!this->has_support() && this->config().check_for_issues_mode.getBool()) { if (!this->has_support() && this->m_shared_regions->generated_support_points.has_value()) {
SupportSpotsGenerator::SupportPoints supp_points = this->m_shared_regions->generated_support_points->support_points;
SupportSpotsGenerator::PartialObjects partial_objects = this->m_shared_regions->generated_support_points->partial_objects;
SupportSpotsGenerator::raise_alerts_for_issues(supp_points, partial_objects, alert_fn); SupportSpotsGenerator::raise_alerts_for_issues(supp_points, partial_objects, alert_fn);
} }
}
BOOST_LOG_TRIVIAL(debug) << "Searching support spots - end"; BOOST_LOG_TRIVIAL(debug) << "posAlertWhenSupportsNeeded - end";
this->set_done(posSupportSpotsSearch); this->set_done(posSupportSpotsSearch);
} }
} }
@ -476,7 +489,7 @@ void PrintObject::generate_support_material()
if (this->set_started(posSupportMaterial)) { if (this->set_started(posSupportMaterial)) {
this->clear_support_layers(); this->clear_support_layers();
if ((this->has_support() && m_layers.size() > 1) || (this->has_raft() && ! m_layers.empty())) { if ((this->has_support() && m_layers.size() > 1) || (this->has_raft() && ! m_layers.empty())) {
m_print->set_status(85, L("Generating support material")); m_print->set_status(70, L("Generating support material"));
this->_generate_support_material(); this->_generate_support_material();
m_print->throw_if_canceled(); m_print->throw_if_canceled();
} else { } else {
@ -619,8 +632,6 @@ bool PrintObject::invalidate_state_by_config_options(
steps.emplace_back(posSupportSpotsSearch); steps.emplace_back(posSupportSpotsSearch);
// Brim is printed below supports, support invalidates brim and skirt. // Brim is printed below supports, support invalidates brim and skirt.
steps.emplace_back(posSupportMaterial); steps.emplace_back(posSupportMaterial);
}else if (opt_key == "check_for_issues_mode") {
steps.emplace_back(posSupportSpotsSearch);
} else if ( } else if (
opt_key == "perimeters" opt_key == "perimeters"
|| opt_key == "extra_perimeters" || opt_key == "extra_perimeters"
@ -834,17 +845,20 @@ 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, posSupportSpotsSearch, posEstimateCurledExtrusions }); invalidated |= this->invalidate_steps({ posPrepareInfill, posInfill, posIroning, posSupportSpotsSearch, posAlertWhenSupportsNeeded, 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, posSupportSpotsSearch }); invalidated |= this->invalidate_steps({ posInfill, posIroning, posSupportSpotsSearch, posAlertWhenSupportsNeeded });
} else if (step == posInfill) { } else if (step == posInfill) {
invalidated |= this->invalidate_steps({ posIroning, posSupportSpotsSearch }); invalidated |= this->invalidate_steps({ posIroning, posSupportSpotsSearch, posAlertWhenSupportsNeeded });
invalidated |= m_print->invalidate_steps({ psSkirtBrim }); invalidated |= m_print->invalidate_steps({ psSkirtBrim });
} else if (step == posSlice) { } else if (step == posSlice) {
invalidated |= this->invalidate_steps({ posPerimeters, posPrepareInfill, posInfill, posIroning, posSupportSpotsSearch, posSupportMaterial, posEstimateCurledExtrusions }); invalidated |= this->invalidate_steps({posPerimeters, posPrepareInfill, posInfill, posIroning, posSupportSpotsSearch,
posAlertWhenSupportsNeeded, posSupportMaterial, posEstimateCurledExtrusions});
invalidated |= m_print->invalidate_steps({ psSkirtBrim }); invalidated |= m_print->invalidate_steps({ psSkirtBrim });
m_slicing_params.valid = false; m_slicing_params.valid = false;
} else if (step == posSupportSpotsSearch) {
invalidated |= posAlertWhenSupportsNeeded;
} else if (step == posSupportMaterial) { } else if (step == posSupportMaterial) {
invalidated |= m_print->invalidate_steps({ psSkirtBrim, }); invalidated |= m_print->invalidate_steps({ psSkirtBrim, });
invalidated |= this->invalidate_steps({ posEstimateCurledExtrusions }); invalidated |= this->invalidate_steps({ posEstimateCurledExtrusions });

View File

@ -256,15 +256,14 @@ std::vector<ExtrusionLine> check_extrusion_entity_stability(const ExtrusionEntit
for (size_t i = 0; i < annotated_points.size(); ++i) { for (size_t i = 0; i < annotated_points.size(); ++i) {
ExtendedPoint &curr_point = annotated_points[i]; ExtendedPoint &curr_point = annotated_points[i];
ExtendedPoint &prev_point = i > 0 ? annotated_points[i] : annotated_points[i - 1]; const ExtendedPoint &prev_point = i > 0 ? annotated_points[i - 1] : annotated_points[i];
SupportPointCause potential_cause = std::abs(curr_point.curvature) > 0.1 ? SupportPointCause::FloatingBridgeAnchor : SupportPointCause potential_cause = std::abs(curr_point.curvature) > 0.1 ? SupportPointCause::FloatingBridgeAnchor :
SupportPointCause::LongBridge; SupportPointCause::LongBridge;
float line_len = i > 0 ? ((annotated_points[i - 1].position - curr_point.position).norm()) : 0.0f; float line_len = (prev_point.position - curr_point.position).norm();
Vec2d line_dir = line_len > EPSILON ? Vec2d((curr_point.position - prev_point.position) / double(line_len)) : Vec2d::Zero(); Vec2d line_dir = line_len > EPSILON ? Vec2d((curr_point.position - prev_point.position) / double(line_len)) : Vec2d::Zero();
ExtrusionLine line_out{i > 0 ? annotated_points[i - 1].position.cast<float>() : curr_point.position.cast<float>(), ExtrusionLine line_out{prev_point.position.cast<float>(), curr_point.position.cast<float>(), line_len, entity};
curr_point.position.cast<float>(), line_len, entity};
float max_bridge_len = std::max(params.support_points_interface_radius * 2.0f, float max_bridge_len = std::max(params.support_points_interface_radius * 2.0f,
params.bridge_distance / params.bridge_distance /
@ -309,9 +308,9 @@ std::vector<ExtrusionLine> check_extrusion_entity_stability(const ExtrusionEntit
0.0f; 0.0f;
for (size_t i = 0; i < annotated_points.size(); ++i) { for (size_t i = 0; i < annotated_points.size(); ++i) {
ExtendedPoint &curr_point = annotated_points[i]; ExtendedPoint &curr_point = annotated_points[i];
float line_len = i > 0 ? ((annotated_points[i - 1].position - curr_point.position).norm()) : 0.0f; const ExtendedPoint &prev_point = i > 0 ? annotated_points[i - 1] : annotated_points[i];
ExtrusionLine line_out{i > 0 ? annotated_points[i - 1].position.cast<float>() : curr_point.position.cast<float>(), float line_len = (prev_point.position - curr_point.position).norm();
curr_point.position.cast<float>(), line_len, entity}; ExtrusionLine line_out{prev_point.position.cast<float>(), curr_point.position.cast<float>(), line_len, entity};
const ExtrusionLine nearest_prev_layer_line = prev_layer_lines.get_lines().size() > 0 ? const ExtrusionLine nearest_prev_layer_line = prev_layer_lines.get_lines().size() > 0 ?
prev_layer_lines.get_line(curr_point.nearest_prev_layer_line) : prev_layer_lines.get_line(curr_point.nearest_prev_layer_line) :

View File

@ -53,7 +53,7 @@ static SettingsFactory::Bundle FREQ_SETTINGS_BUNDLE_FFF =
{ {
{ L("Layers and Perimeters"), { "layer_height" , "perimeters", "top_solid_layers", "bottom_solid_layers" } }, { L("Layers and Perimeters"), { "layer_height" , "perimeters", "top_solid_layers", "bottom_solid_layers" } },
{ L("Infill") , { "fill_density", "fill_pattern" } }, { L("Infill") , { "fill_density", "fill_pattern" } },
{ L("Support material") , { "check_for_issues_mode", "support_material", "support_material_auto", "support_material_threshold", { L("Support material") , { "support_material", "support_material_auto", "support_material_threshold",
"support_material_pattern", "support_material_interface_pattern", "support_material_buildplate_only", "support_material_pattern", "support_material_interface_pattern", "support_material_buildplate_only",
"support_material_spacing" } }, "support_material_spacing" } },
{ L("Wipe options") , { "wipe_into_infill", "wipe_into_objects" } } { L("Wipe options") , { "wipe_into_infill", "wipe_into_objects" } }

View File

@ -4271,7 +4271,12 @@ void Plater::priv::on_slicing_update(SlicingStatusEvent &evt)
this->preview->reload_print(); this->preview->reload_print();
} }
if (evt.status.flags & (PrintBase::SlicingStatus::UPDATE_PRINT_STEP_WARNINGS | PrintBase::SlicingStatus::UPDATE_PRINT_OBJECT_STEP_WARNINGS)) { if ((evt.status.flags & PrintBase::SlicingStatus::UPDATE_PRINT_OBJECT_STEP_WARNINGS) &&
static_cast<PrintObjectStep>(evt.status.warning_step) == posAlertWhenSupportsNeeded &&
get_app_config()->get("alert_when_supports_needed") != "1") {
// This alerts are from posAlertWhenSupportsNeeded and the respective app settings is not Enabled, so discard the alerts.
} else if (evt.status.flags &
(PrintBase::SlicingStatus::UPDATE_PRINT_STEP_WARNINGS | PrintBase::SlicingStatus::UPDATE_PRINT_OBJECT_STEP_WARNINGS)) {
// Update notification center with warnings of object_id and its warning_step. // Update notification center with warnings of object_id and its warning_step.
ObjectID object_id = evt.status.warning_object_id; ObjectID object_id = evt.status.warning_object_id;
int warning_step = evt.status.warning_step; int warning_step = evt.status.warning_step;

View File

@ -273,6 +273,14 @@ void PreferencesDialog::build()
"as they\'re loaded in order to save time when exporting G-code."), "as they\'re loaded in order to save time when exporting G-code."),
app_config->get("background_processing") == "1"); app_config->get("background_processing") == "1");
append_bool_option(m_optgroup_general, "alert_when_supports_needed",
L("Alert when supports needed"),
L("If this is enabled, Slic3r will raise alerts when it detects "
"issues in the sliced object, that can be resolved with supports (and brim). "
"Examples of such issues are floating object parts, unsupported extrusions and low bed adhesion."),
app_config->get("alert_when_supports_needed") == "1");
m_optgroup_general->append_separator(); m_optgroup_general->append_separator();
// Please keep in sync with ConfigWizard // Please keep in sync with ConfigWizard

View File

@ -1495,7 +1495,6 @@ void TabPrint::build()
page = add_options_page(L("Support material"), "support"); page = add_options_page(L("Support material"), "support");
category_path = "support-material_1698#"; category_path = "support-material_1698#";
optgroup = page->new_optgroup(L("Support material")); optgroup = page->new_optgroup(L("Support material"));
optgroup->append_single_option_line("check_for_issues_mode", category_path + "check-for-issues-mode");
optgroup->append_single_option_line("support_material", category_path + "generate-support-material"); optgroup->append_single_option_line("support_material", category_path + "generate-support-material");
optgroup->append_single_option_line("support_material_auto", category_path + "auto-generated-supports"); optgroup->append_single_option_line("support_material_auto", category_path + "auto-generated-supports");
optgroup->append_single_option_line("support_material_threshold", category_path + "overhang-threshold"); optgroup->append_single_option_line("support_material_threshold", category_path + "overhang-threshold");