mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2026-03-10 05:17:02 -06:00
FIX: move the state record to higher coding level
jira: [STUDIO-10050] Change-Id: I1e0721c80492688c66e700979461ac0bdd396ef4 (cherry picked from commit 371ef9c554dff57e0685519b1c0931c8999c5841)
This commit is contained in:
parent
054162a192
commit
4887de8cbe
4 changed files with 13 additions and 7 deletions
|
|
@ -2859,7 +2859,6 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
|
|||
m_nozzle_btn_panel->updateState("left");
|
||||
}
|
||||
|
||||
targ_nozzle_id_from_pc = INVALID_NOZZLE_ID;// the switching is finished
|
||||
obj->flag_update_nozzle = false;
|
||||
}
|
||||
|
||||
|
|
@ -2867,7 +2866,7 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
|
|||
/* Can do switch while printing pause STUDIO-9789*/
|
||||
if ((obj->is_in_printing() && !obj->is_in_printing_pause()) ||
|
||||
obj->ams_status_main == AMS_STATUS_MAIN_FILAMENT_CHANGE ||
|
||||
targ_nozzle_id_from_pc != INVALID_NOZZLE_ID)
|
||||
obj->targ_nozzle_id_from_pc != INVALID_NOZZLE_ID)
|
||||
{
|
||||
m_nozzle_btn_panel->Disable();
|
||||
}
|
||||
|
|
@ -4776,9 +4775,8 @@ void StatusPanel::on_nozzle_selected(wxCommandEvent &event)
|
|||
}
|
||||
|
||||
auto nozzle_id = event.GetInt();
|
||||
if(obj->command_select_extruder(nozzle_id) == 0)
|
||||
if (obj->command_select_extruder(nozzle_id) == 0)
|
||||
{
|
||||
targ_nozzle_id_from_pc = nozzle_id;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue