GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-05-28 17:17:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed post-merge compilation problem

Browse Source
This commit is contained in:
YuSanka 2018-08-24 16:56:42 +02:00
parent 02a325556d
commit d4c8bc0720
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xs/src/slic3r/GUI/GUI.cpp
View File

@ -1111,8 +1111,10 @@ void show_buttons(bool show)
TabPrinter *tab = dynamic_cast<TabPrinter*>(g_wxTabPanel->GetPage(i)); TabPrinter *tab = dynamic_cast<TabPrinter*>(g_wxTabPanel->GetPage(i));
if (!tab) if (!tab)
continue; continue;
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_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()); g_btn_send_gcode->Show(show && !tab->m_config->opt_string("print_host").empty());
}
break; break;
} }
} }

11
xs/src/slic3r/GUI/GUI_ObjectParts.cpp
View File

@ -101,7 +101,8 @@ void get_options_menu(settings_menu_hierarchy& settings_menu, bool is_part)
{ {
auto options = get_options(is_part); auto options = get_options(is_part);
auto extruders_cnt = get_preset_bundle()->printers.get_edited_preset().config.option<ConfigOptionFloats>("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<ConfigOptionFloats>("nozzle_diameter")->values.size();
DynamicPrintConfig config; DynamicPrintConfig config;
for (auto& option : options) for (auto& option : options)
@ -855,7 +856,8 @@ void update_settings_list()
if (opt_keys.size() == 1 && opt_keys[0] == "extruder") if (opt_keys.size() == 1 && opt_keys[0] == "extruder")
return; return;
auto extruders_cnt = get_preset_bundle()->printers.get_edited_preset().config.option<ConfigOptionFloats>("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<ConfigOptionFloats>("nozzle_diameter")->values.size();
for (auto& opt_key : opt_keys) { for (auto& opt_key : opt_keys) {
auto category = (*m_config)->def()->get(opt_key)->category; auto category = (*m_config)->def()->get(opt_key)->category;
@ -1625,8 +1627,11 @@ void on_drop(wxDataViewEvent &event)
g_prevent_list_events = false; 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 // delete old 3rd column
m_objects_ctrl->DeleteColumn(m_objects_ctrl->GetColumn(3)); m_objects_ctrl->DeleteColumn(m_objects_ctrl->GetColumn(3));
// insert new created 3rd column // insert new created 3rd column

2
xs/src/slic3r/GUI/GUI_ObjectParts.hpp
View File

@ -119,7 +119,7 @@ void on_drop_possible(wxDataViewEvent &event);
void on_drop(wxDataViewEvent &event); void on_drop(wxDataViewEvent &event);
// update extruder column for objects_ctrl according to extruders count // 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 GUI
} //namespace Slic3r } //namespace Slic3r