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

Follow-up of 8ebb2e2a29 -> GCodeViewer: automatically select view type in dependence of gcode content for first loaded gcode file

Browse Source
This commit is contained in:
enricoturri1966 2021-07-26 11:01:37 +02:00
parent 9154ebb165
commit 06e2835f83
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/GUI_Preview.cpp
View File

@ -966,9 +966,18 @@ void Preview::load_print_as_fff(bool keep_z_range)
unsigned int number_extruders = (unsigned int)print->extruders().size(); unsigned int number_extruders = (unsigned int)print->extruders().size();
if (!m_keep_current_preview_type) { if (!m_keep_current_preview_type) {
#if ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
std::vector<Item> gcodes = wxGetApp().is_editor() ?
wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes :
m_canvas->get_custom_gcode_per_print_z();
const wxString choice = !gcodes.empty() ?
_L("Color Print") :
(number_extruders > 1) ? _L("Tool") : _L("Feature type");
#else
const wxString choice = !wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes.empty() ? const wxString choice = !wxGetApp().plater()->model().custom_gcode_per_print_z.gcodes.empty() ?
_L("Color Print") : _L("Color Print") :
(number_extruders > 1) ? _L("Tool") : _L("Feature type"); (number_extruders > 1) ? _L("Tool") : _L("Feature type");
#endif // ENABLE_FIX_IMPORTING_COLOR_PRINT_VIEW_INTO_GCODEVIEWER
int type = m_choice_view_type->FindString(choice); int type = m_choice_view_type->FindString(choice);
if (m_choice_view_type->GetSelection() != type) { if (m_choice_view_type->GetSelection() != type) {