juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:Fix the display issue of uncalibrated AMS

Browse Source 
jira:[for uncalibrated ams]

Change-Id: I02e3f3548750fd0bd61d64e36a535a0f83371e98
(cherry picked from commit f08d40b42a8193123bdba559cb8eade5ff062b4a)
This commit is contained in:
tao wang
2024-11-04 21:54:33 +08:00
committed by Noisyfox
parent 60ac0a514e
commit 1556523ca1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4013,6 +4013,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
for (auto it = amsList.begin(); it != amsList.end(); it++) { for (auto it = amsList.begin(); it != amsList.end(); it++) {
ams_id_set.insert(it->first); ams_id_set.insert(it->first);
} }
for (auto it = j_ams.begin(); it != j_ams.end(); it++) { for (auto it = j_ams.begin(); it != j_ams.end(); it++) {
if (!it->contains("id")) continue; if (!it->contains("id")) continue;
std::string ams_id = (*it)["id"].get<std::string>(); std::string ams_id = (*it)["id"].get<std::string>();
@@ -4027,6 +4028,11 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
nozzle_id = get_flag_bits(info, 8, 3); nozzle_id = get_flag_bits(info, 8, 3);
} }
/*AMS without initialization*/
if (nozzle_id == 0x0E) {
continue;
}
ams_id_set.erase(ams_id); ams_id_set.erase(ams_id);
Ams* curr_ams = nullptr; Ams* curr_ams = nullptr;
auto ams_it = amsList.find(ams_id); auto ams_it = amsList.find(ams_id);

2
src/slic3r/GUI/SelectMachine.cpp
View File

@@ -1526,7 +1526,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater)
m_sizer_main->Add(m_statictext_ams_msg, 0, wxLEFT, 0); m_sizer_main->Add(m_statictext_ams_msg, 0, wxLEFT, 0);
m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(16)); m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(16));
m_sizer_main->Add(sizer_split_options, 1, wxEXPAND|wxLEFT|wxRIGHT, FromDIP(15)); m_sizer_main->Add(sizer_split_options, 1, wxEXPAND|wxLEFT|wxRIGHT, FromDIP(15));
m_sizer_main->Add(m_sizer_options, 0, wxALIGN_CENTER_HORIZONTAL|wxLEFT| wxRIGHT, FromDIP(15)); m_sizer_main->Add(m_sizer_options, 0, wxLEFT|wxRIGHT, FromDIP(15));
m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(10)); m_sizer_main->Add(0, 0, 0, wxTOP, FromDIP(10));
m_sizer_main->Add(m_simplebook, 0, wxALIGN_CENTER_HORIZONTAL, 0); m_sizer_main->Add(m_simplebook, 0, wxALIGN_CENTER_HORIZONTAL, 0);
m_sizer_main->Add(m_sw_print_failed_info, 0, wxALIGN_CENTER, 0); m_sizer_main->Add(m_sw_print_failed_info, 0, wxALIGN_CENTER, 0);