3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Follow-up of dc6f97a6ad -> Fixed toolpaths visualization when editing config data

Browse source
This commit is contained in:
enricoturri1966 2020-06-22 15:42:27 +02:00
parent 289f7a14a0
commit ca7dce9f02
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GUI_Preview.cpp
View file

@ -510,11 +510,9 @@ void Preview::reload_print(bool keep_volumes)
!keep_volumes) !keep_volumes)
{ {
m_canvas->reset_volumes(); m_canvas->reset_volumes();
#if ENABLE_GCODE_VIEWER #if !ENABLE_GCODE_VIEWER
m_canvas->reset_gcode_toolpaths();
#else
m_canvas->reset_legend_texture(); m_canvas->reset_legend_texture();
#endif // ENABLE_GCODE_VIEWER #endif // !ENABLE_GCODE_VIEWER
m_loaded = false; m_loaded = false;
#ifdef __linux__ #ifdef __linux__
m_volumes_cleanup_required = false; m_volumes_cleanup_required = false;

10
src/slic3r/GUI/Plater.cpp
View file

@ -2861,10 +2861,20 @@ unsigned int Plater::priv::update_background_process(bool force_validation, bool
this->sidebar->show_sliced_info_sizer(false); this->sidebar->show_sliced_info_sizer(false);
// Reset preview canvases. If the print has been invalidated, the preview canvases will be cleared. // Reset preview canvases. If the print has been invalidated, the preview canvases will be cleared.
// Otherwise they will be just refreshed. // Otherwise they will be just refreshed.
#if ENABLE_GCODE_VIEWER
if (this->preview != nullptr)
{
// If the preview is not visible, the following line just invalidates the preview,
// but the G-code paths or SLA preview are calculated first once the preview is made visible.
this->preview->get_canvas3d()->reset_gcode_toolpaths();
this->preview->reload_print();
}
#else
if (this->preview != nullptr) if (this->preview != nullptr)
// If the preview is not visible, the following line just invalidates the preview, // If the preview is not visible, the following line just invalidates the preview,
// but the G-code paths or SLA preview are calculated first once the preview is made visible. // but the G-code paths or SLA preview are calculated first once the preview is made visible.
this->preview->reload_print(); this->preview->reload_print();
#endif // ENABLE_GCODE_VIEWER
// In FDM mode, we need to reload the 3D scene because of the wipe tower preview box. // In FDM mode, we need to reload the 3D scene because of the wipe tower preview box.
// In SLA mode, we need to reload the 3D scene every time to show the support structures. // In SLA mode, we need to reload the 3D scene every time to show the support structures.
if (this->printer_technology == ptSLA || (this->printer_technology == ptFFF && this->config->opt_bool("wipe_tower"))) if (this->printer_technology == ptSLA || (this->printer_technology == ptFFF && this->config->opt_bool("wipe_tower")))