From 39be95f0f6d66a2a8a2b09c372890de3d76e1757 Mon Sep 17 00:00:00 2001 From: YuSanka Date: Fri, 10 May 2019 11:05:54 +0200 Subject: [PATCH] Fixed SPE-913 (Slicer do not display all extruders when it is started with SLA profile) + Updated POT-file --- resources/localization/Slic3rPE.pot | 14 ++++++++++++-- src/slic3r/GUI/Tab.cpp | 15 ++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/resources/localization/Slic3rPE.pot b/resources/localization/Slic3rPE.pot index e2f4a6ec2..7e31401c4 100644 --- a/resources/localization/Slic3rPE.pot +++ b/resources/localization/Slic3rPE.pot @@ -2161,8 +2161,13 @@ msgid "Iso View" msgstr "" #. TRN To be shown in the main menu View->Top +#: src/slic3r/GUI/MainFrame.cpp:527 +msgctxt "Layers" +msgid "Top" +msgstr "" + #. TRN To be shown in Print Settings "Top solid layers" -#: src/slic3r/GUI/MainFrame.cpp:527 src/libslic3r/PrintConfig.cpp:2068 +#: src/libslic3r/PrintConfig.cpp:2068 msgid "Top" msgstr "" @@ -2171,8 +2176,13 @@ msgid "Top View" msgstr "" #. TRN To be shown in the main menu View->Bottom +#: src/slic3r/GUI/MainFrame.cpp:529 +msgid "Bottom" +msgstr "" + #. TRN To be shown in Print Settings "Bottom solid layers" -#: src/slic3r/GUI/MainFrame.cpp:529 src/libslic3r/PrintConfig.cpp:150 +#: src/libslic3r/PrintConfig.cpp:150 +msgctxt "Layers" msgid "Bottom" msgstr "" diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 3a1b5d37d..4e2403914 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -2333,7 +2333,20 @@ void TabPrinter::update_pages() // set m_pages_(technology after changing) to m_pages // m_printer_technology will be set by Tab::load_current_preset() if (new_printer_technology == ptFFF) - m_pages_fff.empty() ? build_fff() : m_pages.swap(m_pages_fff); + { + if (m_pages_fff.empty()) + { + build_fff(); + if (m_extruders_count > 1) + { + m_preset_bundle->update_multi_material_filament_presets(); + on_value_change("extruders_count", m_extruders_count); + wxGetApp().sidebar().update_objects_list_extruder_column(m_extruders_count); + } + } + else + m_pages.swap(m_pages_fff); + } else m_pages_sla.empty() ? build_sla() : m_pages.swap(m_pages_sla);