Fixes after merge with master

src/slic3r/GUI/Gizmos/GLGizmoBase.cpp

@@ -84,8 +84,8 @@ void GLGizmoBase::set_hover_id(int id)
     assert(!m_dragging);
 
     // allow empty grabbers when not using grabbers but use hover_id - flatten, rotate
-    if (!m_grabbers.empty() && id >= (int) m_grabbers.size())
+//    if (!m_grabbers.empty() && id >= (int) m_grabbers.size())
-        return;
+//        return;
     
     m_hover_id = id;
     on_set_hover_id();    
@@ -160,14 +160,20 @@ bool GLGizmoBase::use_grabbers(const wxMouseEvent &mouse_event) {
 
     if (mouse_event.LeftDown()) {
         Selection &selection = m_parent.get_selection();        
-        if (!selection.is_empty() && m_hover_id != -1 && 
+        if (!selection.is_empty() && m_hover_id != -1 /*&& 
-            (m_grabbers.empty() || m_hover_id < static_cast<int>(m_grabbers.size()))) {
+            (m_grabbers.empty() || m_hover_id < static_cast<int>(m_grabbers.size()))*/) {
             selection.setup_cache();
 
             m_dragging = true;
             for (auto &grabber : m_grabbers) grabber.dragging = false;
-            if (!m_grabbers.empty() && m_hover_id < int(m_grabbers.size()))
+            //if (!m_grabbers.empty() && m_hover_id < int(m_grabbers.size()))
+            //    m_grabbers[m_hover_id].dragging = true;
+            if (!m_grabbers.empty()) {
+                if (m_hover_id < int(m_grabbers.size()))
                     m_grabbers[m_hover_id].dragging = true;
+                else if (m_group_id >= 0 && m_hover_id >= m_group_id)
+                    m_grabbers[m_hover_id - m_group_id].dragging = true;
+            }
             
             // prevent change of hover_id during dragging
             m_parent.set_mouse_as_dragging();

src/slic3r/GUI/Gizmos/GLGizmoCut.cpp

@@ -31,7 +31,8 @@ GLGizmoCut3D::GLGizmoCut3D(GLCanvas3D& parent, const std::string& icon_filename,
                         * Eigen::AngleAxisd(0.0, Vec3d::UnitY())
                         * Eigen::AngleAxisd(0.0, Vec3d::UnitX()))
 {
-    set_group_id(3);
+    m_rotation_gizmo.use_only_grabbers();
+    m_group_id = 3;
 
     m_modes = { _u8L("Planar"),  _u8L("By Line"),_u8L("Grid")
 //              , _u8L("Radial"), _u8L("Modular")
@@ -56,7 +57,7 @@ std::string GLGizmoCut3D::get_tooltip() const
     std::string tooltip = m_rotation_gizmo.get_tooltip();
     if (tooltip.empty()) {
         double koef = wxGetApp().app_config->get("use_inches") == "1" ? ObjectManipulation::mm_to_in : 1.0;
-        if (m_hover_id == get_group_id() || m_grabbers[0].dragging)
+        if (m_hover_id == m_group_id || m_grabbers[0].dragging)
             return "X: " + format(m_plane_center.x() * koef, 2) + "; " +//"\n" +
                    "Y: " + format(m_plane_center.y() * koef, 2) + "; " +//"\n" +
                    "Z: " + format(m_plane_center.z() * koef, 2);
@@ -65,8 +66,12 @@ std::string GLGizmoCut3D::get_tooltip() const
     return tooltip;
 }
 
-bool GLGizmoCut::on_mouse(const wxMouseEvent &mouse_event)
+bool GLGizmoCut3D::on_mouse(const wxMouseEvent &mouse_event)
 {
+    if (m_rotation_gizmo.on_mouse(mouse_event)) {
+        update_clipper();
+        return true;
+    }
     return use_grabbers(mouse_event);
 }
 
@@ -288,13 +293,6 @@ void GLGizmoCut3D::render_cut_plane()
     if (shader == nullptr)
         return;
     shader->start_using();
-        Vec3d diff = plane_center - m_old_center;
-        // Z changed when move with cut plane
-        // X and Y changed when move with cutted object
-        bool  is_changed = std::abs(diff.x()) > EPSILON ||
-                          std::abs(diff.y()) > EPSILON ||
-                          std::abs(diff.z()) > EPSILON;
-        m_old_center = plane_center;
 
     const Vec3d& angles = m_rotation_gizmo.get_rotation();
 
@@ -360,7 +358,7 @@ void GLGizmoCut3D::render_cut_center_graber()
 
     glsafe(::glEnable(GL_DEPTH_TEST));
     glsafe(::glClear(GL_DEPTH_BUFFER_BIT));
-    glsafe(::glLineWidth(m_hover_id == get_group_id() ? 2.0f : 1.5f));
+    glsafe(::glLineWidth(m_hover_id == m_group_id ? 2.0f : 1.5f));
 
     GLShaderProgram* shader = wxGetApp().get_shader("flat");
     if (shader != nullptr) {
@@ -395,7 +393,7 @@ void GLGizmoCut3D::render_cut_center_graber()
         shader->set_uniform("emission_factor", 0.1f);
 
         m_grabbers[0].color = GRABBER_COLOR;
-        m_grabbers[0].render(m_hover_id == get_group_id(), float((box.size().x() + box.size().y() + box.size().z()) / 3.0));
+        m_grabbers[0].render(m_hover_id == m_group_id, float((box.size().x() + box.size().y() + box.size().z()) / 3.0));
 
         shader->stop_using();
     }
@@ -429,21 +427,7 @@ void GLGizmoCut3D::on_set_state()
 
 void GLGizmoCut3D::on_set_hover_id() 
 {
-    m_rotation_gizmo.set_hover_id(m_hover_id < get_group_id() ? m_hover_id: -1);
+    m_rotation_gizmo.set_hover_id(m_hover_id < m_group_id ? m_hover_id: -1);
-}
-
-void GLGizmoCut3D::on_enable_grabber(unsigned int id) 
-{
-    m_rotation_gizmo.enable_grabber(id);
-    if (id == get_group_id())
-        m_grabbers[0].enabled = true;
-}
-
-void GLGizmoCut3D::on_disable_grabber(unsigned int id) 
-{
-    m_rotation_gizmo.disable_grabber(id);
-    if (id == get_group_id())
-        m_grabbers[0].enabled = false;
 }
 
 bool GLGizmoCut3D::on_is_activable() const
@@ -453,22 +437,12 @@ bool GLGizmoCut3D::on_is_activable() const
     return m_parent.get_selection().is_single_full_instance();
 }
 
-void GLGizmoCut3D::on_start_dragging()
+void GLGizmoCut3D::on_dragging(const UpdateData& data)
 {
-    m_rotation_gizmo.start_dragging();
+    assert(m_hover_id == m_group_id);
-}
 
-void GLGizmoCut3D::on_stop_dragging()
-{
-    m_rotation_gizmo.stop_dragging();
-}
-
-void GLGizmoCut3D::on_update(const UpdateData& data)
-{
-    if (m_hover_id == get_group_id()) {
     const Vec3d & starting_box_center = m_plane_center;
     const Vec3d & starting_drag_position = m_grabbers[0].center;
-
     double projection = 0.0;
 
     Vec3d starting_vec = starting_drag_position - starting_box_center;
@@ -491,11 +465,6 @@ void GLGizmoCut3D::on_update(const UpdateData& data)
 
     set_center(starting_box_center + starting_vec * projection);
 }
-    else {
-        m_rotation_gizmo.update(data);
-        update_clipper();
-    }
-}
 
 void GLGizmoCut3D::set_center_pos(const Vec3d& center_pos)
 {
@@ -547,7 +516,7 @@ void GLGizmoCut3D::on_render()
     render_cut_plane();
     render_cut_center_graber();
     if (m_mode == CutMode::cutPlanar) {
-        if (m_hover_id < get_group_id())
+        if (m_hover_id < m_group_id)
             m_rotation_gizmo.render();
     }
 
@@ -606,7 +575,7 @@ void GLGizmoCut3D::on_render_input_window(float x, float y, float bottom_limit)
             revert_rotation = render_revert_button("rotation");
             for (Axis axis : {X, Y, Z})
                 render_rotation_input(axis);
-            m_imgui->text(_L("°"));
+            m_imgui->text(_L("°"));
         }
         else {
             ImGui::AlignTextToFramePadding();

src/slic3r/GUI/Gizmos/GLGizmoCut.hpp

@@ -127,12 +127,8 @@ protected:
     void on_set_state() override;
     CommonGizmosDataID on_get_requirements() const override;
     void on_set_hover_id() override;
-    void on_enable_grabber(unsigned int id) override;
-    void on_disable_grabber(unsigned int id) override;
     bool on_is_activable() const override;
-    void on_start_dragging() override;
+    void on_dragging(const UpdateData& data) override;
-    void on_stop_dragging() override;
-    void on_update(const UpdateData& data) override;
     void on_render() override;
     void on_render_for_picking() override;
     void on_render_input_window(float x, float y, float bottom_limit) override;

src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp

@@ -679,7 +679,7 @@ GLGizmoRotate3D::GLGizmoRotate3D(GLCanvas3D& parent, const std::string& icon_fil
 
 bool GLGizmoRotate3D::on_mouse(const wxMouseEvent &mouse_event)
 {
-    if (mouse_event.Dragging() && m_dragging) {
+    if (mouse_event.Dragging() && m_dragging && !m_use_only_grabbers) {
         // Apply new temporary rotations
         TransformationType transformation_type(
             TransformationType::World_Relative_Joint);

src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp

@@ -63,7 +63,6 @@ public:
 
     double get_angle() const { return m_angle; }
     void set_angle(double angle);
-    void set_center_z(double center_z);
     void set_center(const Vec3d& center);
 
     std::string get_tooltip() const override;
@@ -118,6 +117,7 @@ private:
 class GLGizmoRotate3D : public GLGizmoBase
 {
     std::array<GLGizmoRotate, 3> m_gizmos;
+    bool  m_use_only_grabbers{ false };
 
 public:
     GLGizmoRotate3D(GLCanvas3D& parent, const std::string& icon_filename, unsigned int sprite_id);
@@ -125,6 +125,7 @@ public:
     Vec3d get_rotation() const { return Vec3d(m_gizmos[X].get_angle(), m_gizmos[Y].get_angle(), m_gizmos[Z].get_angle()); }
     void set_rotation(const Vec3d& rotation) { m_gizmos[X].set_angle(rotation(0)); m_gizmos[Y].set_angle(rotation(1)); m_gizmos[Z].set_angle(rotation(2)); }
     void set_center(const Vec3d& center) { m_gizmos[X].set_center(center); m_gizmos[Y].set_center(center); m_gizmos[Z].set_center(center); }
+    void use_only_grabbers()             { m_use_only_grabbers = true; }
 
     std::string get_tooltip() const override {
         std::string tooltip = m_gizmos[X].get_tooltip();