juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 03:13:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: not need check nozzle type for X/P/A

Browse Source 
2. modify the ams color
jira: STUDIO-9643  STUDIO-9572

Change-Id: I75ddffc6aa18d9b88df823170c44cfe6af905d03
(cherry picked from commit f4bcbfaf4a8594f30f2809cf1c7109824f581f1c)
This commit is contained in:
zhimin.zeng
2025-01-09 10:57:05 +08:00
committed by Noisyfox
parent 950bb297f9
commit 29f9b4e9a7
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1018,7 +1018,7 @@ void ExtruderGroup::update_ams()
ams_info.ams_type = AMSModel::GENERIC_AMS; ams_info.ams_type = AMSModel::GENERIC_AMS;
for (size_t i = 0; i < 4; ++i) { for (size_t i = 0; i < 4; ++i) {
Caninfo can_info; Caninfo can_info;
can_info.material_colour = colors[i]; //can_info.material_colour = colors[i];
ams_info.cans.push_back(can_info); ams_info.cans.push_back(can_info);
} }
ams[i]->Update(ams_info); ams[i]->Update(ams_info);
@@ -1037,7 +1037,7 @@ void ExtruderGroup::update_ams()
AMSinfo ams_info; AMSinfo ams_info;
ams_info.ams_type = AMSModel::N3S_AMS; ams_info.ams_type = AMSModel::N3S_AMS;
Caninfo can_info; Caninfo can_info;
can_info.material_colour = wxColour(255, 110, 100); //can_info.material_colour = wxColour(255, 110, 100);
ams_info.cans.push_back(can_info); ams_info.cans.push_back(can_info);
ams[i]->Update(ams_info); ams[i]->Update(ams_info);
ams[i]->Refresh(); ams[i]->Refresh();
@@ -12948,9 +12948,11 @@ bool check_printer_initialized(MachineObject *obj)
bool has_been_initialized = true; bool has_been_initialized = true;
for (const Extder& extruder : obj->m_extder_data.extders) { for (const Extder& extruder : obj->m_extder_data.extders) {
if (extruder.current_nozzle_flow_type == NozzleFlowType::NONE_FLOWTYPE) { if (obj->is_multi_extruders()) {
has_been_initialized = false; if (extruder.current_nozzle_flow_type == NozzleFlowType::NONE_FLOWTYPE) {
break; has_been_initialized = false;
break;
}
} }
if (extruder.current_nozzle_type == NozzleType::ntUndefine) { if (extruder.current_nozzle_type == NozzleType::ntUndefine) {
has_been_initialized = false; has_been_initialized = false;