Merge branch 'et_gizmos_tooltip' of https://github.com/Prusa3d/PrusaSlicer into et_gizmos_tooltip

src/libnest2d/include/libnest2d/selections/selection_boilerplate.hpp

@@ -43,7 +43,10 @@ protected:
 
             Placer p{bin};
             p.configure(pcfg);
-            if (itm.area() <= 0 || !p.pack(cpy)) it = c.erase(it);
+            if (itm.area() <= 0 || !p.pack(cpy)) {
+                static_cast<Item&>(*it).binId(BIN_ID_UNSET);
+                it = c.erase(it);
+            }
             else it++;
         }
     }

src/libslic3r/Arrange.cpp

@@ -577,7 +577,7 @@ void _arrange(
         std::function<bool()>         stopfn)
 {
     // Integer ceiling the min distance from the bed perimeters
-    coord_t md = minobjd - 2 * scaled(0.1 + EPSILON);
+    coord_t md = minobjd;
     md = (md % 2) ? md / 2 + 1 : md / 2;
     
     auto corrected_bin = bin;

src/libslic3r/GCode.cpp

@@ -2880,11 +2880,12 @@ std::string GCode::extrude_path(ExtrusionPath path, std::string description, dou
 std::string GCode::extrude_perimeters(const Print &print, const std::vector<ObjectByExtruder::Island::Region> &by_region, std::unique_ptr<EdgeGrid::Grid> &lower_layer_edge_grid)
 {
     std::string gcode;
-    for (const ObjectByExtruder::Island::Region &region : by_region) {
-        m_config.apply(print.regions()[&region - &by_region.front()]->config());
-        for (const ExtrusionEntity *ee : region.perimeters)
-            gcode += this->extrude_entity(*ee, "perimeter", -1., &lower_layer_edge_grid);
-    }
+    for (const ObjectByExtruder::Island::Region &region : by_region)
+        if (! region.perimeters.empty()) {
+            m_config.apply(print.regions()[&region - &by_region.front()]->config());
+            for (const ExtrusionEntity *ee : region.perimeters)
+                gcode += this->extrude_entity(*ee, "perimeter", -1., &lower_layer_edge_grid);
+        }
     return gcode;
 }
 
@@ -2892,19 +2893,20 @@ std::string GCode::extrude_perimeters(const Print &print, const std::vector<Obje
 std::string GCode::extrude_infill(const Print &print, const std::vector<ObjectByExtruder::Island::Region> &by_region)
 {
     std::string gcode;
-    for (const ObjectByExtruder::Island::Region &region : by_region) {
-        m_config.apply(print.regions()[&region - &by_region.front()]->config());
-		ExtrusionEntitiesPtr extrusions { region.infills };
-		chain_and_reorder_extrusion_entities(extrusions, &m_last_pos);
-        for (const ExtrusionEntity *fill : extrusions) {
-            auto *eec = dynamic_cast<const ExtrusionEntityCollection*>(fill);
-            if (eec) {
-				for (ExtrusionEntity *ee : eec->chained_path_from(m_last_pos).entities)
-                    gcode += this->extrude_entity(*ee, "infill");
-            } else
-                gcode += this->extrude_entity(*fill, "infill");
+    for (const ObjectByExtruder::Island::Region &region : by_region)
+        if (! region.infills.empty()) {
+            m_config.apply(print.regions()[&region - &by_region.front()]->config());
+		    ExtrusionEntitiesPtr extrusions { region.infills };
+		    chain_and_reorder_extrusion_entities(extrusions, &m_last_pos);
+            for (const ExtrusionEntity *fill : extrusions) {
+                auto *eec = dynamic_cast<const ExtrusionEntityCollection*>(fill);
+                if (eec) {
+				    for (ExtrusionEntity *ee : eec->chained_path_from(m_last_pos).entities)
+                        gcode += this->extrude_entity(*ee, "infill");
+                } else
+                    gcode += this->extrude_entity(*fill, "infill");
+            }
         }
-    }
     return gcode;
 }
 
@@ -3370,17 +3372,18 @@ const std::vector<GCode::ObjectByExtruder::Island::Region>& GCode::ObjectByExtru
     		has_overrides = true;
     		break;
     	}
+
+	// Data is cleared, but the memory is not.
+    by_region_per_copy_cache.clear();
+
     if (! has_overrides)
     	// Simple case. No need to copy the regions.
-    	return this->by_region;
+    	return wiping_entities ? by_region_per_copy_cache : this->by_region;
 
     // Complex case. Some of the extrusions of some object instances are to be printed first - those are the wiping extrusions.
     // Some of the extrusions of some object instances are printed later - those are the clean print extrusions.
     // Filter out the extrusions based on the infill_overrides / perimeter_overrides:
 
-	// Data is cleared, but the memory is not.
-    by_region_per_copy_cache.clear();
-
     for (const auto& reg : by_region) {
         by_region_per_copy_cache.emplace_back(); // creates a region in the newly created Island
 
@@ -3441,15 +3444,17 @@ void GCode::ObjectByExtruder::Island::Region::append(const Type type, const Extr
 
     // First we append the entities, there are eec->entities.size() of them:
     size_t old_size = perimeters_or_infills->size();
-    perimeters_or_infills->reserve(perimeters_or_infills->size() + eec->entities.size());
+    size_t new_size = old_size + eec->entities.size();
+    perimeters_or_infills->reserve(new_size);
     for (auto* ee : eec->entities)
         perimeters_or_infills->emplace_back(ee);
 
     if (copies_extruder != nullptr) {
-    	perimeters_or_infills_overrides->reserve(old_size + eec->entities.size());
-    	perimeters_or_infills_overrides->resize(old_size, nullptr);
-	    for (unsigned int i = 0; i < eec->entities.size(); ++ i)
-	        perimeters_or_infills_overrides->emplace_back(copies_extruder);
+    	// Don't reallocate overrides if not needed.
+    	// Missing overrides are implicitely considered non-overridden.
+        perimeters_or_infills_overrides->reserve(new_size);
+        perimeters_or_infills_overrides->resize(old_size, nullptr);
+        perimeters_or_infills_overrides->resize(new_size, copies_extruder);
 	}
 }
 

src/libslic3r/GCode/PreviewData.cpp

@@ -241,6 +241,7 @@ void GCodePreviewData::reset()
     ranges.width.reset();
     ranges.height.reset();
     ranges.feedrate.reset();
+    ranges.fan_speed.reset();
     ranges.volumetric_rate.reset();
     extrusion.layers.clear();
     travel.polylines.clear();

src/libslic3r/Technologies.hpp

@@ -68,6 +68,7 @@
 
 // Enable tooltips for GLCanvas3D using ImGUI
 #define ENABLE_CANVAS_TOOLTIP_USING_IMGUI (1 && ENABLE_2_2_0_FINAL)
+#define ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI (1 && ENABLE_2_2_0_FINAL)
 #define ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI (1 && ENABLE_CANVAS_TOOLTIP_USING_IMGUI)
 
 

src/slic3r/GUI/GLCanvas3D.cpp

@@ -1394,6 +1394,17 @@ void GLCanvas3D::Tooltip::render(const Vec2d& mouse_position, GLCanvas3D& canvas
 void GLCanvas3D::Tooltip::render(const Vec2d& mouse_position) const
 #endif // ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI
 {
+#if ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI
+    static ImVec2 size(0.0f, 0.0f);
+
+    auto validate_position = [](const Vec2d& position, const GLCanvas3D& canvas, const ImVec2& wnd_size) {
+        Size cnv_size = canvas.get_canvas_size();
+        float x = std::clamp((float)position(0), 0.0f, (float)cnv_size.get_width() - wnd_size.x);
+        float y = std::clamp((float)position(1) + 16, 0.0f, (float)cnv_size.get_height() - wnd_size.y);
+        return Vec2f(x, y);
+    };
+#endif // ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI
+
 #if ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI
     if (m_text.empty())
         return;
@@ -1405,16 +1416,24 @@ void GLCanvas3D::Tooltip::render(const Vec2d& mouse_position) const
         return;
 #endif // ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI
 
+#if ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI
+    Vec2f position = validate_position(mouse_position, canvas, size);
+#endif // ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI
+
     ImGuiWrapper& imgui = *wxGetApp().imgui();
     ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
 #if ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI
     ImGui::PushStyleVar(ImGuiStyleVar_Alpha, alpha);
 #endif // ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI
+#if ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI
+    imgui.set_next_window_pos(position(0), position(1), ImGuiCond_Always, 0.0f, 0.0f);
+#else
     imgui.set_next_window_pos(mouse_position(0), mouse_position(1) + 16, ImGuiCond_Always, 0.0f, 0.0f);
+#endif // ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI
 
     imgui.begin(_(L("canvas_tooltip")), ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMouseInputs | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoFocusOnAppearing);
     ImGui::BringWindowToDisplayFront(ImGui::GetCurrentWindow());
-    imgui.text(m_text);
+    ImGui::TextUnformatted(m_text.c_str());
 
 #if ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI
     // force re-render while the windows gets to its final size (it may take several frames) or while hidden
@@ -1422,6 +1441,10 @@ void GLCanvas3D::Tooltip::render(const Vec2d& mouse_position) const
         canvas.request_extra_frame();
 #endif // ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI
 
+#if ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI
+    size = ImGui::GetWindowSize();
+#endif // ENABLE_CANVAS_CONSTRAINED_TOOLTIP_USING_IMGUI
+
     imgui.end();
 #if ENABLE_CANVAS_DELAYED_TOOLTIP_USING_IMGUI
     ImGui::PopStyleVar(2);
@@ -3788,7 +3811,7 @@ void GLCanvas3D::set_tooltip(const std::string& tooltip) const
     if (m_canvas != nullptr)
     {
 #if ENABLE_CANVAS_TOOLTIP_USING_IMGUI
-        m_tooltip.set_text(std::string((_(L(tooltip))).ToUTF8()));
+        m_tooltip.set_text(tooltip);
 #else
         wxString txt = wxString::FromUTF8(tooltip.data());
         if (m_canvas->GetToolTipText() != txt)

src/slic3r/GUI/GUI_ObjectList.cpp

@@ -124,7 +124,14 @@ ObjectList::ObjectList(wxWindow* parent) :
         // On Windows and Linux, forces a kill focus emulation on the object manipulator fields because this event handler is called
         // before the kill focus event handler on the object manipulator when changing selection in the list, invalidating the object
         // manipulator cache with the following call to selection_changed()
-        wxGetApp().obj_manipul()->emulate_kill_focus();
+//        wxGetApp().obj_manipul()->emulate_kill_focus(); // It's not necessury anymore #ys_FIXME delete after testing
+
+        // On Windows and Linux:
+        // It's not invoked KillFocus event for "temporary" panels (like "Manipulation panel", "Settings", "Layer ranges"),
+        // if we change selection in object list.
+        // see https://github.com/prusa3d/PrusaSlicer/issues/3303
+        // But, if we call SetFocus() for ObjectList it will cause an invoking of a KillFocus event for "temporary" panels  
+        this->SetFocus();
 #else
         // To avoid selection update from SetSelection() and UnselectAll() under osx
         if (m_prevent_list_events)
@@ -3041,7 +3048,10 @@ void ObjectList::add_layer_item(const t_layer_height_range& range,
 
 bool ObjectList::edit_layer_range(const t_layer_height_range& range, coordf_t layer_height)
 {
-    const int obj_idx = get_selected_obj_idx();
+    // Use m_selected_object_id instead of get_selected_obj_idx()
+    // because of get_selected_obj_idx() return obj_idx for currently selected item.
+    // But edit_layer_range(...) function can be called, when Selection in ObjectList could be changed
+    const int obj_idx = m_selected_object_id ; 
     if (obj_idx < 0) 
         return false;
 
@@ -3064,7 +3074,10 @@ bool ObjectList::edit_layer_range(const t_layer_height_range& range, coordf_t la
 
 bool ObjectList::edit_layer_range(const t_layer_height_range& range, const t_layer_height_range& new_range, bool dont_update_ui)
 {
-    const int obj_idx = get_selected_obj_idx();
+    // Use m_selected_object_id instead of get_selected_obj_idx()
+    // because of get_selected_obj_idx() return obj_idx for currently selected item.
+    // But edit_layer_range(...) function can be called, when Selection in ObjectList could be changed
+    const int obj_idx = m_selected_object_id;
     if (obj_idx < 0) return false;
 
     take_snapshot(_(L("Edit Height Range")));
@@ -3091,10 +3104,13 @@ bool ObjectList::edit_layer_range(const t_layer_height_range& range, const t_lay
             add_layer_item(r.first, root_item);
     }
 
-    if (!dont_update_ui)
+    // if this function was invoked from wxEVT_CHANGE_SELECTION selected item could be other than itLayer or itLayerRoot      
+    if (!dont_update_ui && (sel_type & (itLayer | itLayerRoot)))
         select_item(sel_type&itLayer ? m_objects_model->GetItemByLayerRange(obj_idx, new_range) : root_item);
 
     Expand(root_item);
+
+    m_prevent_list_events = false;
     return true;
 }
 

src/slic3r/GUI/Gizmos/GLGizmoBase.hpp

@@ -100,6 +100,7 @@ protected:
     mutable std::vector<Grabber> m_grabbers;
     ImGuiWrapper* m_imgui;
     bool m_first_input_window_render;
+    mutable std::string m_tooltip;
 
 public:
     GLGizmoBase(GLCanvas3D& parent,
@@ -145,7 +146,7 @@ public:
 
     void update(const UpdateData& data);
 
-    void render() const { on_render(); }
+    void render() const { m_tooltip.clear(); on_render(); }
     void render_for_picking() const { on_render_for_picking(); }
     void render_input_window(float x, float y, float bottom_limit);
 

src/slic3r/GUI/Gizmos/GLGizmoCut.hpp

@@ -28,7 +28,7 @@ public:
     double get_cut_z() const { return m_cut_z; }
     void set_cut_z(double cut_z) const;
 
-    virtual std::string get_tooltip() const;
+    std::string get_tooltip() const override;
 
 protected:
     virtual bool on_init();

src/slic3r/GUI/Gizmos/GLGizmoMove.hpp

@@ -30,7 +30,7 @@ public:
 
     const Vec3d& get_displacement() const { return m_displacement; }
 
-    virtual std::string get_tooltip() const;
+    std::string get_tooltip() const override;
 
 protected:
     virtual bool on_init();

src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp

@@ -49,7 +49,7 @@ public:
     double get_angle() const { return m_angle; }
     void set_angle(double angle);
 
-    virtual std::string get_tooltip() const;
+    std::string get_tooltip() const override;
 
 protected:
     virtual bool on_init();
@@ -83,7 +83,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)); }
 
-    virtual std::string get_tooltip() const
+    std::string get_tooltip() const override
     {
         std::string tooltip = m_gizmos[X].get_tooltip();
         if (tooltip.empty())

src/slic3r/GUI/Gizmos/GLGizmoScale.hpp

@@ -42,7 +42,7 @@ public:
 
     const Vec3d& get_offset() const { return m_offset; }
 
-    virtual std::string get_tooltip() const;
+    std::string get_tooltip() const override;
 
 protected:
     virtual bool on_init();