juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-22 12:45:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: disable the bed_exclude_area

Browse Source 
2. fix crash of ams item
3. fix crash in update_sync_status when ams is not calibrated
jira: STUDIO-8934

Change-Id: I4c8acd36e2f921d0750c23d2b8a1d65dfa6b241a
(cherry picked from commit 21865dc0558dd5019fa3e800b51e01a9c923fd82)
This commit is contained in:
zhimin.zeng
2024-12-24 16:37:50 +08:00
committed by Noisyfox
parent 916b94bd01
commit e5e121a036
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/slic3r/GUI/Plater.cpp
View File

@@ -1192,6 +1192,9 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj)
// 2. update extruder status // 2. update extruder status
int extruder_nums = preset_bundle->get_printer_extruder_count(); int extruder_nums = preset_bundle->get_printer_extruder_count();
if (extruder_nums != obj->m_extder_data.extders.size())
return;
std::vector<ExtruderInfo> extruder_infos(extruder_nums); std::vector<ExtruderInfo> extruder_infos(extruder_nums);
std::vector<int> nozzle_volume_types = wxGetApp().preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values; std::vector<int> nozzle_volume_types = wxGetApp().preset_bundle->project_config.option<ConfigOptionEnumsGeneric>("nozzle_volume_type")->values;
//for (size_t i = 0; i < nozzle_volume_types.size(); ++i) { //for (size_t i = 0; i < nozzle_volume_types.size(); ++i) {
@@ -1231,6 +1234,9 @@ void Sidebar::priv::update_sync_status(const MachineObject *obj)
// machine_extruder_infos[extruder.id].diameter = extruder.current_nozzle_diameter; // machine_extruder_infos[extruder.id].diameter = extruder.current_nozzle_diameter;
//} //}
for (auto &item : obj->amsList) { for (auto &item : obj->amsList) {
if (item.second->nozzle >= machine_extruder_infos.size())
continue;
if (item.second->type == 4) { // N3S if (item.second->type == 4) { // N3S
machine_extruder_infos[item.second->nozzle].ams_1++; machine_extruder_infos[item.second->nozzle].ams_1++;
} else { } else {

2
src/slic3r/GUI/Widgets/AMSItem.cpp
View File

@@ -2615,7 +2615,7 @@ void AMSPreview::doRender(wxDC &dc)
} }
//single slot //single slot
else { else if (m_amsinfo.cans.size() == 1) {
auto iter = m_amsinfo.cans[0]; auto iter = m_amsinfo.cans[0];
dc.SetPen(wxPen(*wxTRANSPARENT_PEN)); dc.SetPen(wxPen(*wxTRANSPARENT_PEN));
dc.SetBrush(StateColor::darkModeColorFor(AMS_CONTROL_DEF_BLOCK_BK_COLOUR)); dc.SetBrush(StateColor::darkModeColorFor(AMS_CONTROL_DEF_BLOCK_BK_COLOUR));