3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-03 05:20:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: modify the clumping detection text

Browse source 
jira: none
Change-Id: I646e2fdcb3802bb9255dd77b158ce6d516c7afaf
(cherry picked from commit 370ca3c217ef28a1d1aac08af720578c48aac405)
This commit is contained in:
zhimin.zeng 2025-07-29 20:54:36 +08:00 • committed by Noisyfox
parent f2e759e885
commit 6bb19e10b2
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libslic3r/Print.cpp
View file

@ -971,7 +971,7 @@ static StringObjectException layered_print_cleareance_valid(const Print &print,
}
if (print_config.enable_wrapping_detection.value && !intersection(wrapping_poly, convex_hull).empty()) {
return {inst->model_instance->get_object()->name + L(" is too close to wrapping detection area, there may be collisions when printing.") + "\n",
return {inst->model_instance->get_object()->name + L(" is too close to clumping detection area, there may be collisions when printing.") + "\n",
inst->model_instance->get_object()};
}
convex_hulls_other.emplace_back(convex_hull);
@ -1025,7 +1025,7 @@ static StringObjectException layered_print_cleareance_valid(const Print &print,
return {L("Prime Tower") + L(" is too close to exclusion area, and collisions will be caused.\n")};
}
if (print_config.enable_wrapping_detection.value && !intersection({wrapping_poly}, convex_hulls_temp).empty()) {
return {L("Prime Tower") + L(" is too close to wrapping detection area, and collisions will be caused.\n")};
return {L("Prime Tower") + L(" is too close to clumping detection area, and collisions will be caused.\n")};
}
return {};
}
@ -1165,7 +1165,7 @@ StringObjectException Print::validate(StringObjectException *warning, Polygons*
return {L("Smooth mode of timelapse is not supported when \"by object\" sequence is enabled.")};
if (m_config.enable_wrapping_detection)
return {L("Wrapping detection is not supported when \"by object\" sequence is enabled.")};
return {L("Clumping detection is not supported when \"by object\" sequence is enabled.")};
//BBS: refine seq-print validation logic
auto ret = sequential_print_clearance_valid(*this, collison_polygons, height_polygons);

2
src/libslic3r/PrintConfig.cpp
View file

@ -3834,7 +3834,7 @@ void PrintConfigDef::init_fff_params()
def->set_default_value(new ConfigOptionString());
def = this->add("wrapping_detection_gcode", coString);
def->label = L("Wrapping detection G-code");
def->label = L("Clumping detection G-code");
def->multiline = true;
def->full_width = true;
def->height = 5;

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

@ -1587,7 +1587,7 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
bool enable_wrapping = m_preset_bundle->printers.get_edited_preset().config.option<ConfigOptionBool>("enable_wrapping_detection")->value;
if (enable_wrapping && !set_enable_prime_tower) {
MessageDialog dlg(wxGetApp().plater(),
_L("A prime tower is required for wrapping detection. There may be flaws on the model without prime tower. Are you sure you want to disable prime tower?"),
_L("A prime tower is required for clumping detection. There may be flaws on the model without prime tower. Are you sure you want to disable prime tower?"),
_L("Warning"), wxICON_WARNING | wxYES | wxNO);
if (dlg.ShowModal() == wxID_NO) {
DynamicPrintConfig new_conf = *m_config;
@ -1616,7 +1616,7 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value)
bool wipe_tower_enabled = m_preset_bundle->prints.get_edited_preset().config.option<ConfigOptionBool>("enable_prime_tower")->value;
if (boost::any_cast<bool>(value) && !wipe_tower_enabled) {
MessageDialog dlg(wxGetApp().plater(),
_L("Prime tower is required for wrapping detection. There may be flaws on the model without prime tower. Do you still want to enable wrapping detection?"),
_L("Prime tower is required for clumping detection. There may be flaws on the model without prime tower. Do you still want to enable clumping detection?"),
_L("Warning"), wxICON_WARNING | wxYES | wxNO);
if (dlg.ShowModal() == wxID_NO) {
DynamicPrintConfig new_conf = *m_config;
@ -4345,7 +4345,7 @@ void TabPrinter::build_fff()
option.opt.height = gcode_field_height;//150;
optgroup->append_single_option_line(option);
optgroup = page->new_optgroup(L("Wrapping Detection G-code"), L"param_gcode", 0);
optgroup = page->new_optgroup(L("Clumping Detection G-code"), L"param_gcode", 0);
optgroup->m_on_change = [this, optgroup](const t_config_option_key &opt_key, const boost::any &value) {
validate_custom_gcode_cb(this, optgroup, opt_key, value);
};