From 75274707c9fe79c927ff8332bcbb7c2a8df2ee2e Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Mon, 2 Dec 2024 09:46:10 +0100 Subject: [PATCH] SPE-2595 - Fixed update of shells in preview --- src/slic3r/GUI/GUI_Preview.cpp | 7 ++----- src/slic3r/GUI/GUI_Preview.hpp | 1 - src/slic3r/GUI/Plater.cpp | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/GUI_Preview.cpp b/src/slic3r/GUI/GUI_Preview.cpp index f5d479eea6..315dae6a68 100644 --- a/src/slic3r/GUI/GUI_Preview.cpp +++ b/src/slic3r/GUI/GUI_Preview.cpp @@ -283,11 +283,6 @@ void Preview::set_drop_target(wxDropTarget* target) SetDropTarget(target); } -void Preview::load_gcode_shells() -{ - m_canvas->load_gcode_shells(); -} - void Preview::load_print(bool keep_z_range) { PrinterTechnology tech = m_process->current_printer_technology(); @@ -944,6 +939,7 @@ void Preview::load_print_as_fff(bool keep_z_range) if (wxGetApp().is_editor() && !has_layers) { m_canvas->reset_gcode_layers_times_cache(); + m_canvas->load_gcode_shells(); hide_layers_slider(); m_moves_slider->Hide(); m_canvas_widget->Refresh(); @@ -979,6 +975,7 @@ void Preview::load_print_as_fff(bool keep_z_range) else if (is_pregcode_preview) { // Load the initial preview based on slices, not the final G-code. m_canvas->load_preview(tool_colors, color_print_colors, color_print_values); + m_canvas->load_gcode_shells(); // the view type has been changed by the call m_canvas->load_gcode_preview() if (gcode_view_type == libvgcode::EViewType::ColorPrint && !color_print_values.empty()) m_canvas->set_gcode_view_type(gcode_view_type); diff --git a/src/slic3r/GUI/GUI_Preview.hpp b/src/slic3r/GUI/GUI_Preview.hpp index 0b3179f155..50fe5759f8 100644 --- a/src/slic3r/GUI/GUI_Preview.hpp +++ b/src/slic3r/GUI/GUI_Preview.hpp @@ -131,7 +131,6 @@ public: void select_view(const std::string& direction); void set_drop_target(wxDropTarget* target); - void load_gcode_shells(); void load_print(bool keep_z_range = false); void reload_print(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 404098efc2..28c6a9ced3 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -2981,7 +2981,6 @@ void Plater::priv::set_current_panel(wxPanel* panel) bool model_fits = view3D->get_canvas3d()->check_volumes_outside_state() != ModelInstancePVS_Partly_Outside; if (s_multiple_beds.is_bed_occupied(s_multiple_beds.get_active_bed()) && !model.objects.empty() && !export_in_progress && model_fits) { preview->get_canvas3d()->init_gcode_viewer(); - preview->load_gcode_shells(); q->reslice(); } // keeps current gcode preview, if any