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

Cut:

Browse Source 
- fixed incomplete message about  invalid connectors
- added detection of a connectors placed on an internal contour
- fixed a hang during part selection calculation when a contour was too small
This commit is contained in:
Lukas Matena 2023-05-03 13:22:18 +02:00
parent 0e1d43322c
commit 7b576d3312
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
View File

@ -356,6 +356,7 @@ bool GLGizmoCut3D::on_mouse(const wxMouseEvent &mouse_event)
if (! m_part_selection.valid()) if (! m_part_selection.valid())
process_contours(); process_contours();
m_part_selection.toggle_selection(mouse_pos); m_part_selection.toggle_selection(mouse_pos);
check_and_update_connectors_state(); // after a contour is deactivated, its connectors are inside the object
return true; return true;
} }
@ -2283,11 +2284,20 @@ bool GLGizmoCut3D::is_outside_of_cut_contour(size_t idx, const CutConnectors& co
its_transform(mesh, translation_transform(cur_pos) * m_rotation_m); its_transform(mesh, translation_transform(cur_pos) * m_rotation_m);
for (const Vec3f& vertex : vertices) { for (const Vec3f& vertex : vertices) {
if (m_c->object_clipper() && m_c->object_clipper()->is_projection_inside_cut(vertex.cast<double>()) == -1) { if (m_c->object_clipper()) {
int contour_idx = m_c->object_clipper()->is_projection_inside_cut(vertex.cast<double>());
bool is_invalid = (contour_idx == -1);
if (m_part_selection.valid() && ! is_invalid) {
assert(contour_idx >= 0);
const std::vector<size_t>& ignored = *(m_part_selection.get_ignored_contours_ptr());
is_invalid = (std::find(ignored.begin(), ignored.end(), size_t(contour_idx)) != ignored.end());
}
if (is_invalid) {
m_info_stats.outside_cut_contour++; m_info_stats.outside_cut_contour++;
return true; return true;
} }
} }
}
return false; return false;
} }
@ -2326,6 +2336,7 @@ bool GLGizmoCut3D::is_conflict_for_connector(size_t idx, const CutConnectors& co
void GLGizmoCut3D::check_and_update_connectors_state() void GLGizmoCut3D::check_and_update_connectors_state()
{ {
m_info_stats.invalidate();
m_invalid_connectors_idxs.clear(); m_invalid_connectors_idxs.clear();
const ModelObject* mo = m_c->selection_info()->model_object(); const ModelObject* mo = m_c->selection_info()->model_object();
auto inst_id = m_c->selection_info()->get_active_instance(); auto inst_id = m_c->selection_info()->get_active_instance();
@ -2369,8 +2380,6 @@ void GLGizmoCut3D::render_connectors()
const Vec3d& instance_offset = mi->get_offset(); const Vec3d& instance_offset = mi->get_offset();
const double sla_shift = double(m_c->selection_info()->get_sla_shift()); const double sla_shift = double(m_c->selection_info()->get_sla_shift());
m_info_stats.invalidate();
const bool looking_forward = is_looking_forward(); const bool looking_forward = is_looking_forward();
for (size_t i = 0; i < connectors.size(); ++i) { for (size_t i = 0; i < connectors.size(); ++i) {

2
src/slic3r/GUI/MeshUtils.cpp
View File

@ -203,7 +203,7 @@ std::vector<Vec3d> MeshClipper::point_per_contour() const
} }
if (done) if (done)
break; break;
i += isl.expoly.contour.size() / 5; i += std::max(size_t(2), isl.expoly.contour.size() / 5);
} }
// If the above failed, just return the centroid, regardless of whether // If the above failed, just return the centroid, regardless of whether
// it is inside the contour or in a hole (we must return something). // it is inside the contour or in a hole (we must return something).