juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 11:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove range checks for bed_exclude_area and never used printable_area checks

Browse Source
This commit is contained in:
SoftFever
2026-01-08 20:35:42 +08:00
parent 2ca3a85d15
commit 2486bdfbce
1 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/slic3r/GUI/Field.cpp
View File

@@ -511,7 +511,6 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true
str.Replace(" ", wxEmptyString, true); str.Replace(" ", wxEmptyString, true);
if (!str.IsEmpty()) { if (!str.IsEmpty()) {
bool invalid_val = false; bool invalid_val = false;
bool out_of_range_val = false;
wxStringTokenizer thumbnails(str, ","); wxStringTokenizer thumbnails(str, ",");
while (thumbnails.HasMoreTokens()) { while (thumbnails.HasMoreTokens()) {
wxString token = thumbnails.GetNextToken(); wxString token = thumbnails.GetNextToken();
@@ -522,26 +521,8 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true
if (x_str.ToDouble(&x) && thumbnail.HasMoreTokens()) { if (x_str.ToDouble(&x) && thumbnail.HasMoreTokens()) {
wxString y_str = thumbnail.GetNextToken(); wxString y_str = thumbnail.GetNextToken();
if (y_str.ToDouble(&y) && !thumbnail.HasMoreTokens()) { if (y_str.ToDouble(&y) && !thumbnail.HasMoreTokens()) {
if (m_opt_id == "bed_exclude_area") { out_values.push_back(Vec2d(x, y));
if (0 <= x && x <= 350 && 0 <= y && y <= 350) { continue;
out_values.push_back(Vec2d(x, y));
continue;
}
}
else if (m_opt_id == "printable_area") {
if (0 <= x && x <= 1000 && 0 <= y && y <= 1000) {
out_values.push_back(Vec2d(x, y));
continue;
}
}
else {
if (0 < x && x < 1000 && 0 < y && y < 1000) {
out_values.push_back(Vec2d(x, y));
continue;
}
}
out_of_range_val = true;
break;
} }
} }
} }
@@ -549,14 +530,7 @@ void Field::get_value_by_opt_type(wxString& str, const bool check_value/* = true
break; break;
} }
if (out_of_range_val) { if (invalid_val) {
wxString text_value;
if (!m_value.empty())
text_value = get_thumbnails_string(boost::any_cast<std::vector<Vec2d>>(m_value));
set_value(text_value, true);
show_error(m_parent, _L("Value is out of range."));
}
else if (invalid_val) {
wxString text_value; wxString text_value;
if (!m_value.empty()) if (!m_value.empty())
text_value = get_thumbnails_string(boost::any_cast<std::vector<Vec2d>>(m_value)); text_value = get_thumbnails_string(boost::any_cast<std::vector<Vec2d>>(m_value));