GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-09-29 08:43:13 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX: move the state record to higher coding level

Browse Source 
jira: [STUDIO-10050]
Change-Id: I1e0721c80492688c66e700979461ac0bdd396ef4
This commit is contained in:
xin.zhang 2025-01-20 14:25:19 +08:00 committed by lane.wei
parent 4c9d891700
commit 371ef9c554
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/slic3r/GUI/DeviceManager.cpp
View File

@ -1725,8 +1725,13 @@ int MachineObject::command_select_extruder(int id)
j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++); j["print"]["sequence_id"] = std::to_string(MachineObject::m_sequence_id++);
j["print"]["command"] = "select_extruder"; j["print"]["command"] = "select_extruder";
j["print"]["extruder_index"] = id; j["print"]["extruder_index"] = id;
int rtn = this->publish_json(j.dump(), 1);
if (rtn == 0)
{
targ_nozzle_id_from_pc = id;
}
return this->publish_json(j.dump(), 1); return rtn;
} }
int MachineObject::command_get_version(bool with_retry) int MachineObject::command_get_version(bool with_retry)
@ -5991,10 +5996,12 @@ void MachineObject::parse_new_info(json print)
if (m_extder_data.current_extder_id != extder_data.current_extder_id) if (m_extder_data.current_extder_id != extder_data.current_extder_id)
{ {
flag_update_nozzle = true; flag_update_nozzle = true;
targ_nozzle_id_from_pc = INVALID_NOZZLE_ID;
} }
else if (extder_data.switch_extder_state == ES_SWITCHING_FAILED) else if (extder_data.switch_extder_state == ES_SWITCHING_FAILED)
{ {
flag_update_nozzle = true; flag_update_nozzle = true;
targ_nozzle_id_from_pc = INVALID_NOZZLE_ID;
} }
extder_data.current_loading_extder_id = get_flag_bits(extruder["state"].get<int>(), 15, 4); extder_data.current_loading_extder_id = get_flag_bits(extruder["state"].get<int>(), 15, 4);

3
src/slic3r/GUI/DeviceManager.hpp
View File

@ -948,6 +948,9 @@ public:
int nozzle_selected_count = 0; int nozzle_selected_count = 0;
bool flag_update_nozzle = {true}; bool flag_update_nozzle = {true};
/*target from Studio-SwitchBoard, default to INVALID_NOZZLE_ID if no switching control from PC*/
int targ_nozzle_id_from_pc = INVALID_NOZZLE_ID;
//supported features //supported features
bool is_support_chamber_edit{false}; bool is_support_chamber_edit{false};
bool is_support_extrusion_cali{false}; bool is_support_extrusion_cali{false};

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

@ -2832,7 +2832,6 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
m_nozzle_btn_panel->updateState("left"); m_nozzle_btn_panel->updateState("left");
} }
targ_nozzle_id_from_pc = INVALID_NOZZLE_ID;// the switching is finished
obj->flag_update_nozzle = false; obj->flag_update_nozzle = false;
} }
@ -2840,7 +2839,7 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
/* Can do switch while printing pause STUDIO-9789*/ /* Can do switch while printing pause STUDIO-9789*/
if ((obj->is_in_printing() && !obj->is_in_printing_pause()) || if ((obj->is_in_printing() && !obj->is_in_printing_pause()) ||
obj->ams_status_main == AMS_STATUS_MAIN_FILAMENT_CHANGE || 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(); m_nozzle_btn_panel->Disable();
} }
@ -4691,9 +4690,8 @@ void StatusPanel::on_nozzle_selected(wxCommandEvent &event)
} }
auto nozzle_id = event.GetInt(); 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; return;
} }
} }

2
src/slic3r/GUI/StatusPanel.hpp
View File

@ -411,8 +411,6 @@ protected:
wxSimplebook* m_extruder_book; wxSimplebook* m_extruder_book;
std::vector<ExtruderImage *> m_extruderImage; std::vector<ExtruderImage *> m_extruderImage;
/*the target nozzle id from PC-SwitchBoard, default to INVALID_NOZZLE_ID if not switching*/
int targ_nozzle_id_from_pc = INVALID_NOZZLE_ID;
SwitchBoard * m_nozzle_btn_panel; SwitchBoard * m_nozzle_btn_panel;
wxStaticText * m_text_tasklist_caption; wxStaticText * m_text_tasklist_caption;