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

src/slic3r/GUI/ConfigWizard.cpp

@@ -30,6 +30,8 @@
 #include "libslic3r/Platform.hpp"
 #include "libslic3r/Utils.hpp"
 #include "libslic3r/Config.hpp"
+#include "libslic3r/libslic3r.h"
+#include "libslic3r/Model.hpp"
 #include "GUI.hpp"
 #include "GUI_App.hpp"
 #include "GUI_Utils.hpp"
@@ -40,7 +42,6 @@
 #include "slic3r/Utils/PresetUpdater.hpp"
 #include "format.hpp"
 #include "MsgDialog.hpp"
-#include "libslic3r/libslic3r.h"
 #include "UnsavedChangesDialog.hpp"
 
 #if defined(__linux__) && defined(__WXGTK3__)
@@ -2477,6 +2478,46 @@ static std::string get_first_added_preset(const std::map<std::string, std::strin
 bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *preset_bundle, const PresetUpdater *updater, bool& apply_keeped_changes)
 {
     wxString header, caption = _L("Configuration is editing from ConfigWizard");
+    const auto enabled_vendors = appconfig_new.vendors();
+
+    bool suppress_sla_printer = model_has_multi_part_objects(wxGetApp().model());
+    PrinterTechnology preferred_pt = ptAny;
+    auto get_preferred_printer_technology = [enabled_vendors, suppress_sla_printer](const std::string& bundle_name, const Bundle& bundle) {
+        const auto config = enabled_vendors.find(bundle_name);
+        PrinterTechnology pt = ptAny;
+        if (config != enabled_vendors.end()) {
+            for (const auto& model : bundle.vendor_profile->models) {
+                if (const auto model_it = config->second.find(model.id);
+                    model_it != config->second.end() && model_it->second.size() > 0) {
+                    if (pt == ptAny)
+                        pt = model.technology;
+                    // if preferred printer model has SLA printer technology it's important to check the model for multypart state
+                    if (pt == ptSLA && suppress_sla_printer)
+                        continue;
+                    else
+                        return pt;
+                }
+            }
+        }
+        return pt;
+    };
+    // Prusa printers are considered first, then 3rd party.
+    if (preferred_pt = get_preferred_printer_technology("PrusaResearch", bundles.prusa_bundle());
+        preferred_pt == ptAny || (preferred_pt == ptSLA && suppress_sla_printer)) {
+        for (const auto& bundle : bundles) {
+            if (bundle.second.is_prusa_bundle) { continue; }
+            if (PrinterTechnology pt = get_preferred_printer_technology(bundle.first, bundle.second); pt == ptAny)
+                continue;
+            else if (preferred_pt == ptAny)
+                preferred_pt = pt;
+            if(!(preferred_pt == ptAny || (preferred_pt == ptSLA && suppress_sla_printer)))
+                break;
+        }
+    }
+
+    if (preferred_pt == ptSLA && !wxGetApp().may_switch_to_SLA_preset(caption))
+        return false;
+
     bool check_unsaved_preset_changes = page_welcome->reset_user_profile();
     if (check_unsaved_preset_changes)
         header = _L("All user presets will be deleted.");
@@ -2484,8 +2525,6 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
     if (!check_unsaved_preset_changes)
         act_btns |= UnsavedChangesDialog::ActionButtons::SAVE;
 
-    const auto enabled_vendors = appconfig_new.vendors();
-
     // Install bundles from resources if needed:
     std::vector<std::string> install_bundles;
     for (const auto &pair : bundles) {
@@ -2564,13 +2603,14 @@ bool ConfigWizard::priv::apply_config(AppConfig *app_config, PresetBundle *prese
     std::string preferred_model;
     std::string preferred_variant;
     const auto enabled_vendors_old = app_config->vendors();
-    auto get_preferred_printer_model = [enabled_vendors, enabled_vendors_old](const std::string& bundle_name, const Bundle& bundle, std::string& variant) {
+    auto get_preferred_printer_model = [enabled_vendors, enabled_vendors_old, preferred_pt](const std::string& bundle_name, const Bundle& bundle, std::string& variant) {
         const auto config = enabled_vendors.find(bundle_name);
         if (config == enabled_vendors.end())
             return std::string();
         for (const auto& model : bundle.vendor_profile->models) {
             if (const auto model_it = config->second.find(model.id);
-                model_it != config->second.end() && model_it->second.size() > 0) {
+                model_it != config->second.end() && model_it->second.size() > 0 &&
+                preferred_pt == model.technology) {
                 variant = *model_it->second.begin();
                 const auto config_old = enabled_vendors_old.find(bundle_name);
                 if (config_old == enabled_vendors_old.end())

src/slic3r/GUI/GUI_App.cpp

@@ -2432,6 +2432,20 @@ void GUI_App::open_web_page_localized(const std::string &http_address)
     open_browser_with_warning_dialog(http_address + "&lng=" + this->current_language_code_safe());
 }
 
+// If we are switching from the FFF-preset to the SLA, we should to control the printed objects if they have a part(s).
+// Because of we can't to print the multi-part objects with SLA technology.
+bool GUI_App::may_switch_to_SLA_preset(const wxString& caption)
+{
+    if (model_has_multi_part_objects(model())) {
+        show_info(nullptr,
+            _L("It's impossible to print multi-part object(s) with SLA technology.") + "\n\n" +
+            _L("Please check your object list before preset changing."),
+            caption);
+        return false;
+    }
+    return true;
+}
+
 bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage start_page)
 {
     wxCHECK_MSG(mainframe != nullptr, false, "Internal error: Main frame not created / null");
@@ -2447,13 +2461,9 @@ bool GUI_App::run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage
     if (res) {
         load_current_presets();
 
-        if (preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA
-            && Slic3r::model_has_multi_part_objects(wxGetApp().model())) {
-            GUI::show_info(nullptr,
-                _L("It's impossible to print multi-part object(s) with SLA technology.") + "\n\n" +
-                _L("Please check and fix your object list."),
-                _L("Attention!"));
-        }
+        // #ysFIXME - delete after testing: This part of code looks redundant. All checks are inside ConfigWizard::priv::apply_config() 
+        if (preset_bundle->printers.get_edited_preset().printer_technology() == ptSLA)
+            may_switch_to_SLA_preset(_L("Configuration is editing from ConfigWizard"));
     }
 
     return res;

src/slic3r/GUI/GUI_App.hpp

@@ -309,6 +309,7 @@ public:
     PrintHostJobQueue& printhost_job_queue() { return *m_printhost_job_queue.get(); }
 
     void            open_web_page_localized(const std::string &http_address);
+    bool            may_switch_to_SLA_preset(const wxString& caption);
     bool            run_wizard(ConfigWizard::RunReason reason, ConfigWizard::StartPage start_page = ConfigWizard::SP_WELCOME);
     void            show_desktop_integration_dialog();
 

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -377,10 +377,7 @@ void ObjectList::get_selection_indexes(std::vector<int>& obj_idxs, std::vector<i
 
 int ObjectList::get_mesh_errors_count(const int obj_idx, const int vol_idx /*= -1*/) const
 {
-    if (obj_idx < 0)
-        return 0;
-
-    return (*m_objects)[obj_idx]->get_mesh_errors_count(vol_idx);
+    return obj_idx >= 0 ? (*m_objects)[obj_idx]->get_mesh_errors_count(vol_idx) : 0;
 }
 
 static std::string get_warning_icon_name(const TriangleMeshStats& stats)
@@ -393,7 +390,7 @@ std::pair<wxString, std::string> ObjectList::get_mesh_errors(const int obj_idx,
     const int errors = get_mesh_errors_count(obj_idx, vol_idx);
 
     if (errors == 0)
-        return { "", "" }; // hide tooltip
+        return { {}, {} }; // hide tooltip
 
     // Create tooltip string, if there are errors 
     wxString tooltip = format_wxstr(_L_PLURAL("Auto-repaired %1$d error", "Auto-repaired %1$d errors", errors), errors) + ":\n";
@@ -4043,17 +4040,21 @@ void ObjectList::fix_through_netfabb()
     // clear selections from the non-broken models if any exists
     // and than fill names of models to repairing 
     if (vol_idxs.empty()) {
+#if !FIX_THROUGH_NETFABB_ALWAYS
         for (int i = int(obj_idxs.size())-1; i >= 0; --i)
                 if (object(obj_idxs[i])->get_mesh_errors_count() == 0)
                     obj_idxs.erase(obj_idxs.begin()+i);
+#endif // FIX_THROUGH_NETFABB_ALWAYS
         for (int obj_idx : obj_idxs)
             model_names.push_back(object(obj_idx)->name);
     }
     else {
         ModelObject* obj = object(obj_idxs.front());
+#if !FIX_THROUGH_NETFABB_ALWAYS
         for (int i = int(vol_idxs.size()) - 1; i >= 0; --i)
             if (obj->get_mesh_errors_count(vol_idxs[i]) == 0)
                 vol_idxs.erase(vol_idxs.begin() + i);
+#endif // FIX_THROUGH_NETFABB_ALWAYS
         for (int vol_idx : vol_idxs)
             model_names.push_back(obj->volumes[vol_idx]->name);
     }
@@ -4106,8 +4107,10 @@ void ObjectList::fix_through_netfabb()
     if (vol_idxs.empty()) {
         int vol_idx{ -1 };
         for (int obj_idx : obj_idxs) {
+#if !FIX_THROUGH_NETFABB_ALWAYS
             if (object(obj_idx)->get_mesh_errors_count(vol_idx) == 0)
                 continue;
+#endif // FIX_THROUGH_NETFABB_ALWAYS
             if (!fix_and_update_progress(obj_idx, vol_idx, model_idx, progress_dlg, succes_models, failed_models))
                 break;
             model_idx++;

src/slic3r/GUI/GUI_ObjectList.hpp

@@ -36,6 +36,9 @@ typedef double                                      coordf_t;
 typedef std::pair<coordf_t, coordf_t>               t_layer_height_range;
 typedef std::map<t_layer_height_range, ModelConfig> t_layer_config_ranges;
 
+// Manifold mesh may contain self-intersections, so we want to always allow fixing the mesh.
+#define FIX_THROUGH_NETFABB_ALWAYS 1
+
 namespace GUI {
 
 wxDECLARE_EVENT(EVT_OBJ_LIST_OBJECT_SELECT, SimpleEvent);

src/slic3r/GUI/Gizmos/GLGizmoCut.cpp

@@ -182,7 +182,7 @@ void GLGizmoCut::on_render_input_window(float x, float y, float bottom_limit)
     double cut_z = m_cut_z;
     if (imperial_units)
         cut_z *= ObjectManipulation::mm_to_in;
-    ImGui::InputDouble("", &cut_z, 0.0f, 0.0f, "%.2f");
+    ImGui::InputDouble("", &cut_z, 0.0f, 0.0f, "%.2f", ImGuiInputTextFlags_CharsDecimal);
 
     ImGui::SameLine();
     m_imgui->text(imperial_units ? _L("in") : _L("mm"));

src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp

@@ -60,8 +60,9 @@ void GLGizmoSimplify::on_render_for_picking() {}
 void GLGizmoSimplify::on_render_input_window(float x, float y, float bottom_limit)
 {
     create_gui_cfg();
-    int obj_index;
-    ModelVolume *act_volume = get_selected_volume(&obj_index);
+    const Selection &selection = m_parent.get_selection();
+    int obj_index = selection.get_object_idx();
+    ModelVolume *act_volume = get_volume(selection, wxGetApp().plater()->model());
     if (act_volume == nullptr) {
         switch (m_state) {
         case State::settings: close(); break;
@@ -427,17 +428,34 @@ bool GLGizmoSimplify::exist_volume(ModelVolume *volume) {
     return false;
 }
 
-ModelVolume *GLGizmoSimplify::get_selected_volume(int *object_idx_ptr) const
+ModelVolume * GLGizmoSimplify::get_volume(const Selection &selection, Model &model)
 {
-    const Selection &selection  = m_parent.get_selection();
-    int object_idx = selection.get_object_idx();
-    if (object_idx_ptr != nullptr) *object_idx_ptr = object_idx;
-    if (object_idx < 0) return nullptr;
-    ModelObjectPtrs &objs = wxGetApp().plater()->model().objects;
-    if (static_cast<int>(objs.size()) <= object_idx) return nullptr;
-    ModelObject *obj = objs[object_idx];
-    if (obj->volumes.empty()) return nullptr;
-    return obj->volumes.front();
+    const Selection::IndicesList& idxs = selection.get_volume_idxs();
+    if (idxs.empty()) return nullptr;
+    // only one selected volume
+    if (idxs.size() != 1) return nullptr;
+    const GLVolume *selected_volume = selection.get_volume(*idxs.begin());
+    if (selected_volume == nullptr) return nullptr;
+
+    const GLVolume::CompositeID &cid  = selected_volume->composite_id;
+    const ModelObjectPtrs& objs = model.objects;
+    if (cid.object_id < 0 || objs.size() <= static_cast<size_t>(cid.object_id))
+        return nullptr;
+    const ModelObject* obj = objs[cid.object_id];
+    if (cid.volume_id < 0 || obj->volumes.size() <= static_cast<size_t>(cid.volume_id))
+        return nullptr;    
+    return obj->volumes[cid.volume_id];
+}
+
+const ModelVolume *GLGizmoSimplify::get_volume(const GLVolume::CompositeID &cid, const Model &model)
+{
+    const ModelObjectPtrs &objs = model.objects;
+    if (cid.object_id < 0 || objs.size() <= static_cast<size_t>(cid.object_id))
+        return nullptr;
+    const ModelObject *obj = objs[cid.object_id];
+    if (cid.volume_id < 0 || obj->volumes.size() <= static_cast<size_t>(cid.volume_id))
+        return nullptr;
+    return obj->volumes[cid.volume_id];
 }
 
 void GLGizmoSimplify::init_wireframe()
@@ -478,13 +496,17 @@ void GLGizmoSimplify::render_wireframe() const
     // is initialized?
     if (m_wireframe_VBO_id == 0 || m_wireframe_IBO_id == 0) return;
     if (!m_show_wireframe) return;
-    ModelVolume *act_volume = get_selected_volume();
-    if (act_volume == nullptr) return;    
-    const Transform3d trafo_matrix = 
-        act_volume->get_object()->instances[m_parent.get_selection().get_instance_idx()]
-        ->get_transformation().get_matrix() *
-        act_volume->get_matrix();
 
+    const auto& selection   = m_parent.get_selection();
+    const auto& volume_idxs = selection.get_volume_idxs();
+    if (volume_idxs.empty() || volume_idxs.size() != 1) return;
+    const GLVolume *selected_volume = selection.get_volume(*volume_idxs.begin());
+    
+    // check that selected model is wireframe initialized
+    if (m_volume != get_volume(selected_volume->composite_id, *m_parent.get_model()))
+        return;
+
+    const Transform3d trafo_matrix = selected_volume->world_matrix();
     glsafe(::glPushMatrix());
     glsafe(::glMultMatrixd(trafo_matrix.data()));
 

src/slic3r/GUI/Gizmos/GLGizmoSimplify.hpp

@@ -43,7 +43,9 @@ private:
     void set_its(indexed_triangle_set &its);
     void create_gui_cfg();
     void request_rerender();
-    ModelVolume *get_selected_volume(int *object_idx = nullptr) const;
+    // move to global functions
+    static ModelVolume *get_volume(const Selection &selection, Model &model);
+    static const ModelVolume *get_volume(const GLVolume::CompositeID &cid, const Model &model);
 
     // return false when volume was deleted
     static bool exist_volume(ModelVolume *volume);

src/slic3r/GUI/ImGuiWrapper.cpp

@@ -359,7 +359,7 @@ bool ImGuiWrapper::image_button()
 
 bool ImGuiWrapper::input_double(const std::string &label, const double &value, const std::string &format)
 {
-    return ImGui::InputDouble(label.c_str(), const_cast<double*>(&value), 0.0f, 0.0f, format.c_str());
+    return ImGui::InputDouble(label.c_str(), const_cast<double*>(&value), 0.0f, 0.0f, format.c_str(), ImGuiInputTextFlags_CharsDecimal);
 }
 
 bool ImGuiWrapper::input_double(const wxString &label, const double &value, const std::string &format)

src/slic3r/GUI/MainFrame.cpp

@@ -834,7 +834,7 @@ bool MainFrame::can_save() const
 #if ENABLE_SAVE_COMMANDS_ALWAYS_ENABLED
     return (m_plater != nullptr) &&
         !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) &&
-        !m_plater->get_project_filename().empty() && m_plater->is_project_dirty();
+        m_plater->is_project_dirty();
 #else
     return (m_plater != nullptr) && !m_plater->model().objects.empty() &&
         !m_plater->canvas3D()->get_gizmos_manager().is_in_editing_mode(false) &&

src/slic3r/GUI/Plater.cpp

@@ -3087,10 +3087,13 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool
 
 	//actualizate warnings
 	if (invalidated != Print::APPLY_STATUS_UNCHANGED) {
+        if (background_process.empty())
+            process_validation_warning(std::string());
 		actualize_slicing_warnings(*this->background_process.current_print());
         actualize_object_warnings(*this->background_process.current_print());
 		show_warning_dialog = false;
 		process_completed_with_error = false;
+        
 	}
 
     if (invalidated != Print::APPLY_STATUS_UNCHANGED && was_running && ! this->background_process.running() &&
@@ -4540,6 +4543,11 @@ bool Plater::priv::can_fix_through_netfabb() const
     std::vector<int> obj_idxs, vol_idxs;
     sidebar->obj_list()->get_selection_indexes(obj_idxs, vol_idxs);
 
+#if FIX_THROUGH_NETFABB_ALWAYS
+    // Fixing always.
+    return ! obj_idxs.empty() || ! vol_idxs.empty();
+#else // FIX_THROUGH_NETFABB_ALWAYS
+    // Fixing only if the model is not manifold.
     if (vol_idxs.empty()) {
         for (auto obj_idx : obj_idxs)
             if (model.objects[obj_idx]->get_mesh_errors_count() > 0)
@@ -4551,11 +4559,10 @@ bool Plater::priv::can_fix_through_netfabb() const
     for (auto vol_idx : vol_idxs)
         if (model.objects[obj_idx]->get_mesh_errors_count(vol_idx) > 0)
             return true;
-
     return false;
+#endif // FIX_THROUGH_NETFABB_ALWAYS
 }
 
-
 bool Plater::priv::can_simplify() const
 {
     // is object for simplification selected

src/slic3r/GUI/Tab.cpp

@@ -3236,7 +3236,7 @@ void Tab::select_preset(std::string preset_name, bool delete_current /*=false*/,
 		const PresetWithVendorProfile new_printer_preset_with_vendor_profile = m_presets->get_preset_with_vendor_profile(new_printer_preset);
         PrinterTechnology    old_printer_technology = m_presets->get_edited_preset().printer_technology();
         PrinterTechnology    new_printer_technology = new_printer_preset.printer_technology();
-        if (new_printer_technology == ptSLA && old_printer_technology == ptFFF && !may_switch_to_SLA_preset())
+        if (new_printer_technology == ptSLA && old_printer_technology == ptFFF && !wxGetApp().may_switch_to_SLA_preset(_L("New printer preset is selecting")))
             canceled = true;
         else {
             struct PresetUpdate {
@@ -3409,21 +3409,6 @@ bool Tab::may_discard_current_dirty_preset(PresetCollection* presets /*= nullptr
     return true;
 }
 
-// If we are switching from the FFF-preset to the SLA, we should to control the printed objects if they have a part(s).
-// Because of we can't to print the multi-part objects with SLA technology.
-bool Tab::may_switch_to_SLA_preset()
-{
-    if (model_has_multi_part_objects(wxGetApp().model()))
-    {
-        show_info( parent(),
-                    _(L("It's impossible to print multi-part object(s) with SLA technology.")) + "\n\n" +
-                    _(L("Please check your object list before preset changing.")),
-                    _(L("Attention!")) );
-        return false;
-    }
-    return true;
-}
-
 void Tab::clear_pages()
 {
     // invalidated highlighter, if any exists

src/slic3r/GUI/Tab.hpp

@@ -282,7 +282,6 @@ public:
     // Select a new preset, possibly delete the current one.
 	void		select_preset(std::string preset_name = "", bool delete_current = false, const std::string& last_selected_ph_printer_name = "");
 	bool		may_discard_current_dirty_preset(PresetCollection* presets = nullptr, const std::string& new_printer_name = "");
-    bool        may_switch_to_SLA_preset();
 
     virtual void    clear_pages();
     virtual void    update_description_lines();