diff --git a/resources/images/transparent_ams_lib.svg b/resources/images/transparent_ams_lib.svg index 404028e07..a01f42e82 100644 --- a/resources/images/transparent_ams_lib.svg +++ b/resources/images/transparent_ams_lib.svg @@ -1,4 +1,4 @@ - + diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index f671253ce..bb2bf9d98 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -629,7 +629,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event) if (obj->cali_version >= 0) { PACalibIndexInfo select_index_info; - select_index_info.tray_id = tray_id; + select_index_info.tray_id = slot_id; select_index_info.nozzle_diameter = obj->m_nozzle_data.nozzles[0].diameter; auto cali_select_id = m_comboBox_cali_result->GetSelection(); @@ -649,7 +649,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event) } } else { - int cali_tray_id = ams_id * 4 + tray_id; + int cali_tray_id = ams_id * 4 + slot_id; double k = 0.0; try { k_text.ToDouble(&k); diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 072130630..0a738fec0 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -2914,13 +2914,9 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons wxPoint img_pos = ClientToScreen(wxPoint(0, 0)); wxPoint popup_pos(img_pos.x - m_Humidity_tip_popup.GetSize().GetWidth() + FromDIP(150), img_pos.y - FromDIP(80)); m_Humidity_tip_popup.Position(popup_pos, wxSize(0, 0)); - if (m_ams_info.size() > 0) { - for (auto i = 0; i < m_ams_info.size(); i++) { - if (m_ams_info[i].ams_id == m_current_show_ams_left || m_ams_info[i].ams_id == m_current_show_ams_right) { - m_Humidity_tip_popup.set_humidity_level(m_ams_info[i].ams_humidity); - } - } - + int humidity_value = evt.GetInt(); + if (humidity_value > 0 && humidity_value <= 5) { + m_Humidity_tip_popup.set_humidity_level(humidity_value); } m_Humidity_tip_popup.Popup(); }); diff --git a/src/slic3r/GUI/Widgets/AMSItem.cpp b/src/slic3r/GUI/Widgets/AMSItem.cpp index b7d3169ee..6cb81e3ad 100644 --- a/src/slic3r/GUI/Widgets/AMSItem.cpp +++ b/src/slic3r/GUI/Widgets/AMSItem.cpp @@ -2306,8 +2306,8 @@ void AMSRoadDownPart::doRender(wxDC& dc) dc.SetPen(wxPen(AMS_CONTROL_GRAY500, 2, wxSOLID)); auto xpos = left_nozzle_pos.x; if (m_left_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_NONE || m_right_rode_mode == AMSRoadShowMode::AMS_ROAD_MODE_NONE){ - dc.DrawLine(left_nozzle_pos.x - FromDIP(55), (size.y / 2), (left_nozzle_pos.x), (size.y / 2)); - dc.DrawLine(left_nozzle_pos.x - FromDIP(55), (0), left_nozzle_pos.x - FromDIP(55), (size.y / 2)); + dc.DrawLine(left_nozzle_pos.x - FromDIP(50), (size.y / 2), (left_nozzle_pos.x), (size.y / 2)); + dc.DrawLine(left_nozzle_pos.x - FromDIP(50), (0), left_nozzle_pos.x - FromDIP(50), (size.y / 2)); } else { switch (m_left_rode_mode) @@ -2753,6 +2753,7 @@ AMSHumidity::AMSHumidity(wxWindow* parent, wxWindowID id, AMSinfo info, const wx if (mouse_pos.x > rect.x && mouse_pos.y > rect.y) { wxCommandEvent show_event(EVT_AMS_SHOW_HUMIDITY_TIPS); + show_event.SetInt(m_amsinfo.ams_humidity); wxPostEvent(GetParent()->GetParent(), show_event); #ifdef __WXMSW__