FIX: update the extruder panel when object changed
jira: [STUDIO-10050] Change-Id: I4eb12f3cdecf2a099a9b0773c73a48a8aa3713b6
This commit is contained in:
parent
851dd67082
commit
ca85009945
|
@ -2824,19 +2824,24 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*current*/
|
/*current*/
|
||||||
if (obj->flag_update_nozzle) {
|
/*update when extder position changed or the machine changed*/
|
||||||
|
if (obj->flag_update_nozzle || (m_nozzle_btn_panel->GetClientData() != obj))
|
||||||
|
{
|
||||||
if (obj->m_extder_data.current_extder_id == 0xf) {
|
if (obj->m_extder_data.current_extder_id == 0xf) {
|
||||||
m_extruderImage[select_index]->setExtruderUsed("");
|
m_extruderImage[select_index]->setExtruderUsed("");
|
||||||
m_nozzle_btn_panel->updateState("");
|
m_nozzle_btn_panel->updateState("");
|
||||||
} else if (obj->m_extder_data.current_extder_id == MAIN_NOZZLE_ID) {
|
}
|
||||||
|
else if (obj->m_extder_data.current_extder_id == MAIN_NOZZLE_ID) {
|
||||||
m_extruderImage[select_index]->setExtruderUsed("right");
|
m_extruderImage[select_index]->setExtruderUsed("right");
|
||||||
m_nozzle_btn_panel->updateState("right");
|
m_nozzle_btn_panel->updateState("right");
|
||||||
} else if (obj->m_extder_data.current_extder_id == DEPUTY_NOZZLE_ID) {
|
}
|
||||||
|
else if (obj->m_extder_data.current_extder_id == DEPUTY_NOZZLE_ID) {
|
||||||
m_extruderImage[select_index]->setExtruderUsed("left");
|
m_extruderImage[select_index]->setExtruderUsed("left");
|
||||||
m_nozzle_btn_panel->updateState("left");
|
m_nozzle_btn_panel->updateState("left");
|
||||||
}
|
}
|
||||||
|
|
||||||
obj->flag_update_nozzle = false;
|
obj->flag_update_nozzle = false;
|
||||||
|
m_nozzle_btn_panel->SetClientData(obj);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*enable status*/
|
/*enable status*/
|
||||||
|
|
|
@ -57,11 +57,16 @@ public:
|
||||||
bool switch_right{false};
|
bool switch_right{false};
|
||||||
bool is_enable {true};
|
bool is_enable {true};
|
||||||
|
|
||||||
|
void* client_data = nullptr;/*MachineObject* in StatusPanel*/
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void Enable();
|
void Enable();
|
||||||
void Disable();
|
void Disable();
|
||||||
bool IsEnabled(){return is_enable;};
|
bool IsEnabled(){return is_enable;};
|
||||||
|
|
||||||
|
void SetClientData(void* data) { client_data = data; };
|
||||||
|
void* GetClientData() { return client_data; };
|
||||||
|
|
||||||
void SetAutoDisableWhenSwitch() { auto_disable_when_switch = true; };
|
void SetAutoDisableWhenSwitch() { auto_disable_when_switch = true; };
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
Loading…
Reference in New Issue