Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_project_dirty_state

src/slic3r/GUI/Gizmos/GLGizmoFdmSupports.cpp

@@ -7,6 +7,7 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/ImGuiWrapper.hpp"
 #include "slic3r/GUI/Plater.hpp"
+#include "slic3r/GUI/GUI_ObjectList.hpp"
 
 
 #include <GL/glew.h>
@@ -316,8 +317,12 @@ void GLGizmoFdmSupports::update_model_object() const
         updated |= mv->supported_facets.set(*m_triangle_selectors[idx].get());
     }
 
-    if (updated)
+    if (updated) {
+        const ModelObjectPtrs& mos = wxGetApp().model().objects;
+        wxGetApp().obj_list()->update_info_items(std::find(mos.begin(), mos.end(), mo) - mos.begin());
+
         m_parent.post_event(SimpleEvent(EVT_GLCANVAS_SCHEDULE_BACKGROUND_PROCESS));
+    }
 }
 
 

src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp

@@ -7,9 +7,10 @@
 
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/GUI.hpp"
+#include "slic3r/GUI/Plater.hpp"
 #include "libslic3r/PresetBundle.hpp"
 
-#include "libslic3r/SLA/Rotfinder.hpp"
+#include "slic3r/GUI/Jobs/RotoptimizeJob.hpp"
 
 namespace Slic3r {
 namespace GUI {
@@ -204,6 +205,30 @@ void GLGizmoRotate3D::on_render_input_window(float x, float y, float bottom_limi
 {
     if (wxGetApp().preset_bundle->printers.get_edited_preset().printer_technology() != ptSLA)
         return;
+
+    RotoptimzeWindow popup{m_imgui, m_rotoptimizewin_state, {x, y, bottom_limit}};
+}
+
+void GLGizmoRotate3D::load_rotoptimize_state()
+{
+    std::string accuracy_str =
+        wxGetApp().app_config->get("sla_auto_rotate", "accuracy");
+
+    std::string method_str =
+        wxGetApp().app_config->get("sla_auto_rotate", "method_id");
+
+    if (!accuracy_str.empty()) {
+        float accuracy = std::stof(accuracy_str);
+        accuracy = std::max(0.f, std::min(accuracy, 1.f));
+
+        m_rotoptimizewin_state.accuracy = accuracy;
+    }
+
+    if (!method_str.empty()) {
+        int method_id = std::stoi(method_str);
+        if (method_id < int(RotoptimizeJob::get_methods_count()))
+            m_rotoptimizewin_state.method_id = method_id;
+    }
 }
 
 void GLGizmoRotate::render_circle() const
@@ -436,6 +461,8 @@ GLGizmoRotate3D::GLGizmoRotate3D(GLCanvas3D& parent, const std::string& icon_fil
     {
         m_gizmos[i].set_group_id(i);
     }
+
+    load_rotoptimize_state();
 }
 
 bool GLGizmoRotate3D::on_init()
@@ -492,5 +519,51 @@ void GLGizmoRotate3D::on_render() const
         m_gizmos[Z].render();
 }
 
+const char * GLGizmoRotate3D::RotoptimzeWindow::options[RotoptimizeJob::get_methods_count()];
+bool GLGizmoRotate3D::RotoptimzeWindow::options_valid = false;
+
+GLGizmoRotate3D::RotoptimzeWindow::RotoptimzeWindow(ImGuiWrapper *   imgui,
+                                                    State &          state,
+                                                    const Alignment &alignment)
+    : m_imgui{imgui}
+{
+    imgui->begin(_L("Optimize orientation"), ImGuiWindowFlags_NoMove |
+                                     ImGuiWindowFlags_AlwaysAutoResize |
+                                     ImGuiWindowFlags_NoCollapse);
+
+    // adjust window position to avoid overlap the view toolbar
+    float win_h = ImGui::GetWindowHeight();
+    float x = alignment.x, y = alignment.y;
+    y = std::min(y, alignment.bottom_limit - win_h);
+    ImGui::SetWindowPos(ImVec2(x, y), ImGuiCond_Always);
+
+    ImGui::PushItemWidth(200.f);
+
+    size_t methods_cnt = RotoptimizeJob::get_methods_count();
+    if (!options_valid) {
+        for (size_t i = 0; i < methods_cnt; ++i)
+            options[i] = RotoptimizeJob::get_method_names()[i].c_str();
+
+        options_valid = true;
+    }
+
+    int citem = state.method_id;
+    if (ImGui::Combo(_L("Choose goal").c_str(), &citem, options, methods_cnt) ) {
+        state.method_id = citem;
+        wxGetApp().app_config->set("sla_auto_rotate", "method_id", std::to_string(state.method_id));
+    }
+
+    ImGui::Separator();
+
+    if ( imgui->button(_L("Optimize")) ) {
+        wxGetApp().plater()->optimize_rotation();
+    }
+}
+
+GLGizmoRotate3D::RotoptimzeWindow::~RotoptimzeWindow()
+{
+    m_imgui->end();
+}
+
 } // namespace GUI
 } // namespace Slic3r

src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp

@@ -2,6 +2,7 @@
 #define slic3r_GLGizmoRotate_hpp_
 
 #include "GLGizmoBase.hpp"
+#include "../Jobs/RotoptimizeJob.hpp"
 
 
 namespace Slic3r {
@@ -136,6 +137,39 @@ protected:
     }
 
     void on_render_input_window(float x, float y, float bottom_limit) override;
+
+private:
+
+    class RotoptimzeWindow {
+        ImGuiWrapper *m_imgui = nullptr;
+
+        static const char * options [];
+        static bool options_valid;
+
+    public:
+
+        struct State {
+            float  accuracy  = 1.f;
+            int    method_id = 0;
+        };
+
+        struct Alignment { float x, y, bottom_limit; };
+
+        RotoptimzeWindow(ImGuiWrapper *   imgui,
+                         State &          state,
+                         const Alignment &bottom_limit);
+
+        ~RotoptimzeWindow();
+
+        RotoptimzeWindow(const RotoptimzeWindow&) = delete;
+        RotoptimzeWindow(RotoptimzeWindow &&) = delete;
+        RotoptimzeWindow& operator=(const RotoptimzeWindow &) = delete;
+        RotoptimzeWindow& operator=(RotoptimzeWindow &&) = delete;
+    };
+
+    RotoptimzeWindow::State m_rotoptimizewin_state = {};
+
+    void load_rotoptimize_state();
 };
 
 } // namespace GUI

src/slic3r/GUI/Gizmos/GLGizmoSeam.cpp

@@ -7,7 +7,7 @@
 #include "slic3r/GUI/GUI_App.hpp"
 #include "slic3r/GUI/ImGuiWrapper.hpp"
 #include "slic3r/GUI/Plater.hpp"
-
+#include "slic3r/GUI/GUI_ObjectList.hpp"
 
 #include <GL/glew.h>
 
@@ -222,8 +222,12 @@ void GLGizmoSeam::update_model_object() const
         updated |= mv->seam_facets.set(*m_triangle_selectors[idx].get());
     }
 
-    if (updated)
+    if (updated) {
+        const ModelObjectPtrs& mos = wxGetApp().model().objects;
+        wxGetApp().obj_list()->update_info_items(std::find(mos.begin(), mos.end(), mo) - mos.begin());
+
         m_parent.post_event(SimpleEvent(EVT_GLCANVAS_SCHEDULE_BACKGROUND_PROCESS));
+    }
 }
 
 

src/slic3r/GUI/Gizmos/GLGizmosManager.cpp

@@ -163,6 +163,17 @@ void GLGizmosManager::reset_all_states()
     m_hover = Undefined;
 }
 
+bool GLGizmosManager::open_gizmo(EType type)
+{
+    int idx = int(type);
+    if (m_gizmos[idx]->is_selectable() && m_gizmos[idx]->is_activable()) {
+        activate_gizmo(m_current == idx ? Undefined : (EType)idx);
+        update_data();
+        return true;
+    }
+    return false;
+}
+
 void GLGizmosManager::set_hover_id(int id)
 {
     if (!m_enabled || m_current == Undefined)
@@ -266,24 +277,21 @@ bool GLGizmosManager::is_running() const
 
 bool GLGizmosManager::handle_shortcut(int key)
 {
-    if (!m_enabled)
+    if (!m_enabled || m_parent.get_selection().is_empty())
         return false;
 
-    if (m_parent.get_selection().is_empty())
+    auto it = std::find_if(m_gizmos.begin(), m_gizmos.end(),
+            [key](const std::unique_ptr<GLGizmoBase>& gizmo) {
+                int gizmo_key = gizmo->get_shortcut_key();
+                return gizmo->is_selectable()
+                       && ((gizmo_key == key - 64) || (gizmo_key == key - 96));
+    });
+
+    if (it == m_gizmos.end())
         return false;
 
-    bool handled = false;
-
-    for (size_t idx : get_selectable_idxs()) {
-        int it_key = m_gizmos[idx]->get_shortcut_key();
-
-        if (m_gizmos[idx]->is_activable() && ((it_key == key - 64) || (it_key == key - 96))) {
-                activate_gizmo(m_current == idx ? Undefined : (EType)idx);
-                handled = true;
-        }
-    }
-
-    return handled;
+    EType gizmo_type = EType(it - m_gizmos.begin());
+    return open_gizmo(gizmo_type);
 }
 
 bool GLGizmosManager::is_dragging() const
@@ -814,10 +822,7 @@ bool GLGizmosManager::on_char(wxKeyEvent& evt)
     if (!processed && !evt.HasModifiers())
     {
         if (handle_shortcut(keyCode))
-        {
-            update_data();
             processed = true;
-        }
     }
 
     if (processed)
@@ -1156,5 +1161,11 @@ bool GLGizmosManager::is_in_editing_mode(bool error_notification) const
     return true;
 }
 
+
+int GLGizmosManager::get_shortcut_key(GLGizmosManager::EType type) const
+{
+    return m_gizmos[type]->get_shortcut_key();
+}
+
 } // namespace GUI
 } // namespace Slic3r

src/slic3r/GUI/Gizmos/GLGizmosManager.hpp

@@ -171,6 +171,7 @@ public:
     void refresh_on_off_state();
     void reset_all_states();
     bool is_serializing() const { return m_serializing; }
+    bool open_gizmo(EType type);
 
     void set_hover_id(int id);
     void enable_grabber(EType type, unsigned int id, bool enable);
@@ -228,6 +229,7 @@ public:
     void update_after_undo_redo(const UndoRedo::Snapshot& snapshot);
 
     int get_selectable_icons_cnt() const { return get_selectable_idxs().size(); }
+    int get_shortcut_key(GLGizmosManager::EType) const;
 
 private:
     void render_background(float left, float top, float right, float bottom, float border) const;