From 05c49762327a0f703325a02a94ce0de80f190fd9 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Thu, 29 Aug 2019 15:38:21 +0200 Subject: [PATCH 1/2] Do not automatically start slicing when switching to gcode preview if the Slice Now button is disabled --- src/slic3r/GUI/Plater.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index c311472c7..fa7869e6a 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -3179,7 +3179,12 @@ void Plater::priv::set_current_panel(wxPanel* panel) } else if (current_panel == preview) { - this->q->reslice(); + // see: Plater::priv::object_list_changed() + // FIXME: it may be better to have a single function making this check and let it be called wherever needed + bool export_in_progress = this->background_process.is_export_scheduled(); + bool model_fits = view3D->check_volumes_outside_state() != ModelInstance::PVS_Partly_Outside; + if (!model.objects.empty() && !export_in_progress && model_fits) + this->q->reslice(); // keeps current gcode preview, if any preview->reload_print(true); preview->set_canvas_as_dirty(); From 211a38b53583908d16eb1cec49a971f1830676d4 Mon Sep 17 00:00:00 2001 From: Enrico Turri Date: Fri, 30 Aug 2019 08:32:18 +0200 Subject: [PATCH 2/2] New toolbar icons for undo and redo actions --- resources/icons/redo_toolbar.svg | 17 +++++++++-------- resources/icons/undo_toolbar.svg | 17 +++++++++-------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/resources/icons/redo_toolbar.svg b/resources/icons/redo_toolbar.svg index ad073244f..d005f8373 100644 --- a/resources/icons/redo_toolbar.svg +++ b/resources/icons/redo_toolbar.svg @@ -1,12 +1,13 @@ - + - - - - - + diff --git a/resources/icons/undo_toolbar.svg b/resources/icons/undo_toolbar.svg index 699ccd807..15778a7ba 100644 --- a/resources/icons/undo_toolbar.svg +++ b/resources/icons/undo_toolbar.svg @@ -1,12 +1,13 @@ - + - - - - - +