Merge pull request #10035 from mpaperno/mp/enh_fit_view_shortcut

ENH: Add "Fit camera to scene or selection" function from 3D navigator as a global shortcut.

Author: guanyun-gudujian

src/slic3r/GUI/GLCanvas3D.cpp

@@ -2339,6 +2339,23 @@ void GLCanvas3D::zoom_to_plate(int plate_idx)
     }
 }
 
+void GLCanvas3D::zoom_to_fit()
+{
+    if (!can_show_3d_navigator())
+        return;
+
+    select_view("plate");
+    if (m_selection.is_empty()) {
+        if (m_canvas_type == ECanvasType::CanvasAssembleView)
+            zoom_to_volumes();
+        else
+            zoom_to_bed();
+    }
+    else {
+        zoom_to_selection();
+    }
+}
+
 void GLCanvas3D::select_view(const std::string& direction)
 {
     get_active_camera().select_view(direction);
@@ -4304,18 +4321,6 @@ void GLCanvas3D::on_char(wxKeyEvent& evt)
             break;
         }
 #endif // ENABLE_RENDER_PICKING_PASS
-        //case 'Z':
-        //case 'z': {
-        //    if (!m_selection.is_empty())
-        //        zoom_to_selection();
-        //    else {
-        //        if (!m_volumes.empty())
-        //            zoom_to_volumes();
-        //        else
-        //            _zoom_to_box(m_gcode_viewer.get_paths_bounding_box());
-        //    }
-        //    break;
-        //}
         default:  { evt.Skip(); break; }
         }
     }
@@ -9544,18 +9549,7 @@ void GLCanvas3D::_render_fit_camera_toolbar()
 
     if (ImGui::ImageButton3(normal_id, hover_id, button_icon_size, ImVec2(0, 0), ImVec2(1, 1),  -1,
                            ImVec4(0, 0, 0, 0), ImVec4(1, 1, 1, 1), ImVec2(10, 0))) {
-        select_view("plate");
-        if (m_selection.is_empty()) {
-            if (m_canvas_type == ECanvasType::CanvasAssembleView) {
-                zoom_to_volumes();
-            }
-            else {
-                zoom_to_bed();
-            }
-        }
-        else {
-            zoom_to_selection();
-        }
+        zoom_to_fit();
     }
     if (ImGui::IsItemHovered()) {
         auto temp_tooltip = _L("Fit camera to scene or selected object.");

src/slic3r/GUI/GLCanvas3D.hpp

@@ -947,6 +947,7 @@ class GLCanvas3D
     void zoom_to_gcode();
     //BBS -1 for current plate
     void zoom_to_plate(int plate_idx = -1);
+    void zoom_to_fit();
     void select_view(const std::string& direction);
     //BBS: add part plate related logic
     void select_plate();

src/slic3r/GUI/KBShortcutsDialog.cpp

@@ -250,6 +250,7 @@ void KBShortcutsDialog::fill_shortcuts()
             {ctrl + "5", L("Camera view - Left")},
             {ctrl + "6", L("Camera view - Right")},
             {ctrl + "7", L("Camera view - Isometric")},
+            {       "Z", L("Camera view - Fit to scene or selection")},
             {ctrl + "W", L("Reset Window Layout")},
             {ctrl + "E", L("Show Labels by Layer")},
             {L("Shift+E"), L("Show Labels by Object")},

src/slic3r/GUI/MainFrame.cpp

@@ -717,6 +717,12 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, BORDERLESS_FRAME_
             if (m_plater) { m_plater->add_file(); }
             return;
         }
+
+        if (!evt.HasAnyModifiers() && evt.GetKeyCode() == 'Z') {
+            view_zoom_to_fit();
+            return;
+        }
+
         evt.Skip();
     });
 
@@ -2677,6 +2683,8 @@ static void add_common_view_menu_items(wxMenu* view_menu, MainFrame* mainFrame,
     append_menu_item(view_menu, wxID_ANY, _CTX(L_CONTEXT("Isometric", "Camera"), "Camera") + " 3", _L("Isometric View") + " 3",
         [mainFrame](wxCommandEvent &) { mainFrame->select_view("iso_3"); }, "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame);
 #endif
+    append_menu_item(view_menu, wxID_ANY, _L("Fit Camera") + "\t" "Z", _L("Fit camera to scene or selected object."), 
+        [mainFrame](wxCommandEvent &) { mainFrame->view_zoom_to_fit(); }, "", nullptr, [can_change_view]() { return can_change_view(); }, mainFrame);
 }
 
 void MainFrame::init_menubar_as_editor()
@@ -3997,6 +4005,12 @@ void MainFrame::select_view(const std::string& direction)
          m_plater->select_view(direction);
 }
 
+void MainFrame::view_zoom_to_fit() const
+{
+    if (GLCanvas3D *canvas = m_plater ? m_plater->canvas3D() : nullptr)
+        canvas->zoom_to_fit();
+}
+
 // #ys_FIXME_to_delete
 void MainFrame::on_presets_changed(SimpleEvent &event)
 {

src/slic3r/GUI/MainFrame.hpp

@@ -328,6 +328,7 @@ class MainFrame : public DPIFrame
     void        request_select_tab(TabPosition pos);
     int         get_calibration_curr_tab();
     void        select_view(const std::string& direction);
+    void        view_zoom_to_fit() const;
     // Propagate changed configuration from the Tab to the Plater and save changes to the AppConfig
     void        on_config_changed(DynamicPrintConfig* cfg) const ;
     void        set_print_button_to_default(PrintSelectType select_type);