From f08d40b42a8193123bdba559cb8eade5ff062b4a Mon Sep 17 00:00:00 2001 From: tao wang Date: Mon, 4 Nov 2024 21:54:33 +0800 Subject: [PATCH] FIX:Fix the display issue of uncalibrated AMS jira:[for uncalibrated ams] Change-Id: I02e3f3548750fd0bd61d64e36a535a0f83371e98 --- src/slic3r/GUI/DeviceManager.cpp | 6 ++++++ src/slic3r/GUI/SelectMachine.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp index 2b85c0e67..af79e62a9 100644 --- a/src/slic3r/GUI/DeviceManager.cpp +++ b/src/slic3r/GUI/DeviceManager.cpp @@ -4143,6 +4143,7 @@ int MachineObject::parse_json(std::string payload, bool key_field_only) for (auto it = amsList.begin(); it != amsList.end(); it++) { ams_id_set.insert(it->first); } + for (auto it = j_ams.begin(); it != j_ams.end(); it++) { if (!it->contains("id")) continue; std::string ams_id = (*it)["id"].get(); @@ -4158,6 +4159,11 @@ int MachineObject::parse_json(std::string payload, bool key_field_only) type_id = (*it)["type"].get(); } + /*AMS without initialization*/ + if (nozzle_id == 0x0E) { + continue; + } + ams_id_set.erase(ams_id); Ams* curr_ams = nullptr; auto ams_it = amsList.find(ams_id); diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp index 6047e91fb..6bd81712b 100644 --- a/src/slic3r/GUI/SelectMachine.cpp +++ b/src/slic3r/GUI/SelectMachine.cpp @@ -1521,7 +1521,7 @@ SelectMachineDialog::SelectMachineDialog(Plater *plater) m_sizer_main->Add(m_statictext_ams_msg, 0, wxALIGN_CENTER|wxLEFT|wxRIGHT, FromDIP(15)); 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(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(m_simplebook, 0, wxALIGN_CENTER_HORIZONTAL, 0); m_sizer_main->Add(m_sw_print_failed_info, 0, wxALIGN_CENTER, 0);