diff --git a/xs/src/slic3r/GUI/GUI.cpp b/xs/src/slic3r/GUI/GUI.cpp index 161da5267f..9e28de04a5 100644 --- a/xs/src/slic3r/GUI/GUI.cpp +++ b/xs/src/slic3r/GUI/GUI.cpp @@ -1111,8 +1111,10 @@ void show_buttons(bool show) TabPrinter *tab = dynamic_cast(g_wxTabPanel->GetPage(i)); if (!tab) continue; - g_btn_print->Show(show && !tab->m_config->opt_string("serial_port").empty()); - g_btn_send_gcode->Show(show && !tab->m_config->opt_string("print_host").empty()); + if (g_PresetBundle->printers.get_selected_preset().printer_technology() == ptFFF) { + g_btn_print->Show(show && !tab->m_config->opt_string("serial_port").empty()); + g_btn_send_gcode->Show(show && !tab->m_config->opt_string("print_host").empty()); + } break; } } diff --git a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp b/xs/src/slic3r/GUI/GUI_ObjectParts.cpp index bb5a414238..50b1a1f5a3 100644 --- a/xs/src/slic3r/GUI/GUI_ObjectParts.cpp +++ b/xs/src/slic3r/GUI/GUI_ObjectParts.cpp @@ -101,7 +101,8 @@ void get_options_menu(settings_menu_hierarchy& settings_menu, bool is_part) { auto options = get_options(is_part); - auto extruders_cnt = get_preset_bundle()->printers.get_edited_preset().config.option("nozzle_diameter")->values.size(); + auto extruders_cnt = get_preset_bundle()->printers.get_selected_preset().printer_technology() == ptSLA ? 1 : + get_preset_bundle()->printers.get_edited_preset().config.option("nozzle_diameter")->values.size(); DynamicPrintConfig config; for (auto& option : options) @@ -855,7 +856,8 @@ void update_settings_list() if (opt_keys.size() == 1 && opt_keys[0] == "extruder") return; - auto extruders_cnt = get_preset_bundle()->printers.get_edited_preset().config.option("nozzle_diameter")->values.size(); + auto extruders_cnt = get_preset_bundle()->printers.get_selected_preset().printer_technology() == ptSLA ? 1 : + get_preset_bundle()->printers.get_edited_preset().config.option("nozzle_diameter")->values.size(); for (auto& opt_key : opt_keys) { auto category = (*m_config)->def()->get(opt_key)->category; @@ -1625,8 +1627,11 @@ void on_drop(wxDataViewEvent &event) g_prevent_list_events = false; } -void update_objects_list_extruder_column(const int extruders_count) +void update_objects_list_extruder_column(int extruders_count) { + if (get_preset_bundle()->printers.get_selected_preset().printer_technology() == ptSLA) + extruders_count = 1; + // delete old 3rd column m_objects_ctrl->DeleteColumn(m_objects_ctrl->GetColumn(3)); // insert new created 3rd column diff --git a/xs/src/slic3r/GUI/GUI_ObjectParts.hpp b/xs/src/slic3r/GUI/GUI_ObjectParts.hpp index 8c6bd2ed05..40dfb92797 100644 --- a/xs/src/slic3r/GUI/GUI_ObjectParts.hpp +++ b/xs/src/slic3r/GUI/GUI_ObjectParts.hpp @@ -119,7 +119,7 @@ void on_drop_possible(wxDataViewEvent &event); void on_drop(wxDataViewEvent &event); // update extruder column for objects_ctrl according to extruders count -void update_objects_list_extruder_column(const int extruders_count); +void update_objects_list_extruder_column(int extruders_count); } //namespace GUI } //namespace Slic3r