3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-21 13:47:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Another follow-up of 8ebb2e2a29 -> GCodeViewer: Ensure that the view is properly updated after automatic selection of view type introduced with 06e2835f83

Browse source
This commit is contained in:
enricoturri1966 2021-07-26 13:59:36 +02:00
parent ca67d880ec
commit 4a9602b073
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -910,6 +910,7 @@ void Preview::load_print_as_fff(bool keep_z_range)
GCodeViewer::EViewType gcode_view_type = m_canvas->get_gcode_view_preview_type(); GCodeViewer::EViewType gcode_view_type = m_canvas->get_gcode_view_preview_type();
bool gcode_preview_data_valid = !m_gcode_result->moves.empty(); bool gcode_preview_data_valid = !m_gcode_result->moves.empty();
// Collect colors per extruder. // Collect colors per extruder.
std::vector<std::string> colors; std::vector<std::string> colors;
std::vector<CustomGCode::Item> color_print_values = {}; std::vector<CustomGCode::Item> color_print_values = {};
@ -963,9 +964,8 @@ void Preview::load_print_as_fff(bool keep_z_range)
update_layers_slider(zs, keep_z_range); update_layers_slider(zs, keep_z_range);
} }
unsigned int number_extruders = (unsigned int)print->extruders().size();
if (!m_keep_current_preview_type) { if (!m_keep_current_preview_type) {
unsigned int number_extruders = (unsigned int)print->extruders().size();
#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER #if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
std::vector<Item> gcodes = wxGetApp().is_editor() ? std::vector<Item> gcodes = wxGetApp().is_editor() ?
wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes : wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes :
@ -984,6 +984,12 @@ void Preview::load_print_as_fff(bool keep_z_range)
if (0 <= type && type < static_cast<int>(GCodeViewer::EViewType::Count)) { if (0 <= type && type < static_cast<int>(GCodeViewer::EViewType::Count)) {
m_choice_view_type->SetSelection(type); m_choice_view_type->SetSelection(type);
m_canvas->set_gcode_view_preview_type(static_cast<GCodeViewer::EViewType>(type)); m_canvas->set_gcode_view_preview_type(static_cast<GCodeViewer::EViewType>(type));
#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
if (wxGetApp().is_gcode_viewer()) {
m_keep_current_preview_type = true;
refresh_print();
}
#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
} }
} }
} }