mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: UI of display two nozzles 

jira: STUDIO-7785

Change-Id: I85298721191a6dbb0c93b2dfd9db85494179631d
This commit is contained in:
hang.xu 2024-08-05 17:23:46 +08:00 committed by lane.wei
parent 7bd3a5218a
commit 02a38db9c4
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/images/ext_image_right.svg Normal file
View File

@ -0,0 +1,7 @@
<svg width="99" height="101" viewBox="0 0 99 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M97.9571 19.499L51.7378 1.5293L8.64151 19.499M97.9571 19.499L51.7378 44.2847M97.9571 19.499V37.5991M51.7378 44.2847L8.64151 19.499M51.7378 44.2847V58.2103M8.64151 19.499V75.2668L51.7378 99.4329M51.7378 99.4329L97.9571 75.2668V37.5991M51.7378 99.4329V58.2103M51.7378 58.2103L97.9571 37.5991" stroke="#323A3D" stroke-width="2" stroke-linecap="round"/>
<ellipse cx="11.7105" cy="41.3303" rx="6.9975" ry="9.15057" stroke="#909090"/>
<ellipse cx="8.48089" cy="41.3303" rx="6.9975" ry="9.15057" fill="white" stroke="#909090"/>
<ellipse cx="11.7104" cy="63.3635" rx="6.9975" ry="9.15057" stroke="#00AE42"/>
<ellipse cx="8.48077" cy="63.3635" rx="6.9975" ry="9.15057" fill="white" stroke="#00AE42"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 806 B

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

@ -2647,6 +2647,7 @@ void StatusPanel::update_ams(MachineObject *obj)
ext_info.push_back(info);
}
std::string dev_id = obj->dev_id;
int nozzle_num = obj->m_nozzle_data.total_nozzle_count;
//if (obj->ams_exist_bits != last_ams_exist_bits || obj->tray_exist_bits != last_tray_exist_bits || obj->tray_is_bbl_bits != last_tray_is_bbl_bits ||
// obj->tray_read_done_bits != last_read_done_bits || obj->ams_version != last_ams_version) {
// m_ams_control->UpdateAms(ams_info, false);
@ -2661,7 +2662,7 @@ void StatusPanel::update_ams(MachineObject *obj)
//}
// must select a current can
m_ams_control->UpdateAms(ams_info, ext_info, dev_id, false);
m_ams_control->UpdateAms(ams_info, ext_info, nozzle_num, dev_id, false);
last_tray_exist_bits = obj->tray_exist_bits;
last_ams_exist_bits = obj->ams_exist_bits;

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

@ -3330,6 +3330,10 @@ void AMSControl::ClearAms() {
m_ams_item_list.clear();
m_sizer_items_right->Clear();
m_sizer_items_left->Clear();
m_left_page_index = 0;
m_right_page_index = 0;
m_item_ids = { {}, {} };
}
void AMSControl::CreateAmsNew()
@ -3783,14 +3787,9 @@ void AMSControl::ReadExtInfo(MachineObject* obj) {
}
}
void AMSControl::UpdateAms(std::vector<AMSinfo> ams_info, std::vector<AMSinfo>ext_info, std::string dev_id, bool is_reset, bool test)
void AMSControl::UpdateAms(std::vector<AMSinfo> ams_info, std::vector<AMSinfo>ext_info, int nozzle_num, std::string dev_id, bool is_reset, bool test)
{
if (!test){
/*std::string curr_ams_id = GetCurentAms();
std::string curr_can_id = GetCurrentCan(curr_ams_id);*/
int nozzle_num = ext_info.size();
// update item
bool fresh = false;
if (m_ams_info.size() == ams_info.size() && m_nozzle_num == nozzle_num && m_dev_id == dev_id){
@ -3817,15 +3816,9 @@ void AMSControl::UpdateAms(std::vector<AMSinfo> ams_info, std::vector<AMSinfo>ex
}
m_ams_preview_list.clear();
ClearAms();
m_left_page_index = 0;
m_right_page_index = 0;
if (m_nozzle_num >= 2){
CreateAmsNew();
m_ams_item_list;
}else{
/*m_panel_items_right->ClearBackground();
m_panel_items_left->ClearBackground();*/
m_item_ids = { {}, {} };
pair_id.clear();
CreateAmsSingleNozzle();

2
src/slic3r/GUI/Widgets/AMSControl.hpp
View File

@ -160,7 +160,7 @@ public:
void CreateAmsNew();
void CreateAmsSingleNozzle();
void ClearAms();
void UpdateAms(std::vector<AMSinfo> ams_info, std::vector<AMSinfo> ext_info, std::string dev_id, bool is_reset = true, bool test = false);
void UpdateAms(std::vector<AMSinfo> ams_info, std::vector<AMSinfo> ext_info, int nozzle_num, std::string dev_id, bool is_reset = true, bool test = false);
void ReadExtInfo(MachineObject* obj);
void AddAms(AMSinfo info, bool left = true);