FIX: not need check nozzle type for X/P/A
2. modify the ams color jira: STUDIO-9643 STUDIO-9572 Change-Id: I75ddffc6aa18d9b88df823170c44cfe6af905d03
This commit is contained in:
parent
98b7354a23
commit
f4bcbfaf4a
|
@ -995,7 +995,7 @@ void ExtruderGroup::update_ams()
|
|||
ams_info.ams_type = AMSModel::GENERIC_AMS;
|
||||
for (size_t i = 0; i < 4; ++i) {
|
||||
Caninfo can_info;
|
||||
can_info.material_colour = colors[i];
|
||||
//can_info.material_colour = colors[i];
|
||||
ams_info.cans.push_back(can_info);
|
||||
}
|
||||
ams[i]->Update(ams_info);
|
||||
|
@ -1014,7 +1014,7 @@ void ExtruderGroup::update_ams()
|
|||
AMSinfo ams_info;
|
||||
ams_info.ams_type = AMSModel::N3S_AMS;
|
||||
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[i]->Update(ams_info);
|
||||
ams[i]->Refresh();
|
||||
|
@ -12965,9 +12965,11 @@ bool check_printer_initialized(MachineObject *obj)
|
|||
|
||||
bool has_been_initialized = true;
|
||||
for (const Extder& extruder : obj->m_extder_data.extders) {
|
||||
if (extruder.current_nozzle_flow_type == NozzleFlowType::NONE_FLOWTYPE) {
|
||||
has_been_initialized = false;
|
||||
break;
|
||||
if (obj->is_multi_extruders()) {
|
||||
if (extruder.current_nozzle_flow_type == NozzleFlowType::NONE_FLOWTYPE) {
|
||||
has_been_initialized = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (extruder.current_nozzle_type == NozzleType::ntUndefine) {
|
||||
has_been_initialized = false;
|
||||
|
|
Loading…
Reference in New Issue