Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2020-02-03 17:00:49 +0300
committerEnrico Turri <enricoturri@seznam.cz>2020-02-03 17:00:49 +0300
commit8453c8848238c1bb20bc7dc85cad4763203534c9 (patch)
tree227062dcd42009edbd8fd0e6be53de35d759b0d0 /src/slic3r/GUI/Gizmos
parentc09091c40703bdfae84e4bee3094bf6db23d8487 (diff)
Cut Gizmo -> added movements using arrow keys:
Up arrow = increase Z by 1mm Down arrow = decrease Z by 1mm
Diffstat (limited to 'src/slic3r/GUI/Gizmos')
-rw-r--r--src/slic3r/GUI/Gizmos/GLGizmoCut.cpp4
-rw-r--r--src/slic3r/GUI/Gizmos/GLGizmoCut.hpp4
-rw-r--r--src/slic3r/GUI/Gizmos/GLGizmosManager.cpp16
3 files changed, 22 insertions, 2 deletions
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
index e98446749..52d710249 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.cpp
@@ -9,6 +9,8 @@
#include <wx/stattext.h>
#include <wx/sizer.h>
+#include <algorithm>
+
#include "slic3r/GUI/GUI_App.hpp"
@@ -189,7 +191,7 @@ void GLGizmoCut::update_max_z(const Selection& selection) const
void GLGizmoCut::set_cut_z(double cut_z) const
{
// Clamp the plane to the object's bounding box
- m_cut_z = std::max(0.0, std::min(m_max_z, cut_z));
+ m_cut_z = std::clamp(cut_z, 0.0, m_max_z);
}
void GLGizmoCut::perform_cut(const Selection& selection)
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
index 6e5738a42..b6e10861f 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoCut.hpp
@@ -25,6 +25,9 @@ class GLGizmoCut : public GLGizmoBase
public:
GLGizmoCut(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
+ double get_cut_z() const { return m_cut_z; }
+ void set_cut_z(double cut_z) const;
+
protected:
virtual bool on_init();
virtual void on_load(cereal::BinaryInputArchive& ar) { ar(m_cut_z, m_keep_upper, m_keep_lower, m_rotate_lower); }
@@ -40,7 +43,6 @@ protected:
private:
void update_max_z(const Selection& selection) const;
- void set_cut_z(double cut_z) const;
void perform_cut(const Selection& selection);
double calc_projection(const Linef3& mouse_ray) const;
};
diff --git a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
index d830e4f3a..e1b4a97e8 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
@@ -815,6 +815,22 @@ bool GLGizmosManager::on_key(wxKeyEvent& evt)
default: { break; }
}
}
+ else if (m_current == Cut)
+ {
+ auto do_move = [this, &processed](double delta_z) {
+ GLGizmoCut* cut = dynamic_cast<GLGizmoCut*>(get_current());
+ cut->set_cut_z(delta_z + cut->get_cut_z());
+ m_parent.set_as_dirty();
+ processed = true;
+ };
+
+ switch (keyCode)
+ {
+ case WXK_NUMPAD_UP: case WXK_UP: { do_move(1.0); break; }
+ case WXK_NUMPAD_DOWN: case WXK_DOWN: { do_move(-1.0); break; }
+ default: { break; }
+ }
+ }
// if (processed)
// m_parent.set_cursor(GLCanvas3D::Standard);