juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-20 11:53:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:fixed the issue of AMS not updating location

Browse Source 
jira:[STUDIO-9182 STUDIO-9216]

Change-Id: I42e57b47abf357cdc99f71e1739ab9fc3a122d85
(cherry picked from commit 43083f1e4834163c11a961e743db1fb7ece52348)
This commit is contained in:
tao wang
2024-12-20 16:44:11 +08:00
committed by Noisyfox
parent 741d8d60da
commit c1c862d2c3
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4187,6 +4187,11 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
// new ams added event // new ams added event
curr_ams = new_ams; curr_ams = new_ams;
} else { } else {
if (nozzle_id != ams_it->second->nozzle) {
ams_it->second->nozzle = nozzle_id;
}
curr_ams = ams_it->second; curr_ams = ams_it->second;
} }
if (!curr_ams) continue; if (!curr_ams) continue;

6
src/slic3r/GUI/Widgets/AMSControl.cpp
View File

@@ -1009,11 +1009,17 @@ void AMSControl::UpdateAms(std::vector<AMSinfo> ams_info, std::vector<AMSinfo>ex
if (!test){ if (!test){
// update item // update item
bool fresh = false; bool fresh = false;
// basic check
if (m_ams_info.size() == ams_info.size() && m_extder_data.total_extder_count == data.total_extder_count && m_dev_id == dev_id){ if (m_ams_info.size() == ams_info.size() && m_extder_data.total_extder_count == data.total_extder_count && m_dev_id == dev_id){
for (int i = 0; i < m_ams_info.size(); i++){ for (int i = 0; i < m_ams_info.size(); i++){
if (m_ams_info[i].ams_id != ams_info[i].ams_id){ if (m_ams_info[i].ams_id != ams_info[i].ams_id){
fresh = true; fresh = true;
} }
if (m_ams_info[i].nozzle_id != ams_info[i].nozzle_id) {
fresh = true;
}
} }
} }
else{ else{