GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-19 01:55:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

CutGizmo: Next bug-fixing:

Browse Source 
* Performance during drawing of the cut line. Recalculate cut only when Mouse button is up.
* Reset button for Depth / Width modification + tolerance
This commit is contained in:
YuSanka 2023-08-10 16:40:20 +02:00
parent e241e905ec
commit b213ff01d4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2543,7 +2543,7 @@ void GLGizmoCut3D::render_groove_float_input(const std::string& label, float& in
ImGui::SameLine(); ImGui::SameLine();
m_imgui->disabled_begin(is_approx(in_val, init_val)); m_imgui->disabled_begin(is_approx(in_val, init_val) && is_approx(in_tolerance, 0.1f));
const std::string act_name = _u8L("Reset"); const std::string act_name = _u8L("Reset");
if (render_reset_button(("##groove_" + label + act_name).c_str(), act_name)) { if (render_reset_button(("##groove_" + label + act_name).c_str(), act_name)) {
Plater::TakeSnapshot snapshot(wxGetApp().plater(), format_wxstr("%1%: %2%", act_name, label), UndoRedo::SnapshotType::GizmoAction); Plater::TakeSnapshot snapshot(wxGetApp().plater(), format_wxstr("%1%: %2%", act_name, label), UndoRedo::SnapshotType::GizmoAction);
@ -3446,6 +3446,8 @@ bool GLGizmoCut3D::process_cut_line(SLAGizmoEventType action, const Vec2d& mouse
} }
if (cut_line_processing()) { if (cut_line_processing()) {
if (CutMode(m_mode) == CutMode::cutTongueAndGroove)
m_groove_editing = true;
reset_cut_by_contours(); reset_cut_by_contours();
m_line_end = pt; m_line_end = pt;
@ -3478,9 +3480,11 @@ bool GLGizmoCut3D::process_cut_line(SLAGizmoEventType action, const Vec2d& mouse
m_angle_arc.reset(); m_angle_arc.reset();
discard_cut_line_processing(); discard_cut_line_processing();
if (CutMode(m_mode) == CutMode::cutTongueAndGroove) if (CutMode(m_mode) == CutMode::cutTongueAndGroove) {
m_groove_editing = false;
reset_cut_by_contours(); reset_cut_by_contours();
} }
}
else if (action == SLAGizmoEventType::Moving) else if (action == SLAGizmoEventType::Moving)
this->set_dirty(); this->set_dirty();
return true; return true;