From b2a752110eb1acaed7e31b7d4d813ef1556eb5c4 Mon Sep 17 00:00:00 2001 From: Stone Li Date: Mon, 16 Jan 2023 10:02:33 +0800 Subject: [PATCH] FIX: fix display error in virtual tray refine description for ams not connected Change-Id: Ic4c01e69cfd9385548a497af5c5c3071614067a2 Signed-off-by: Stone Li (cherry picked from commit 4158f1e06ed20fa5dd4c3ef412d4c8fab76054a8) --- src/slic3r/GUI/ExtrusionCalibration.cpp | 2 ++ src/slic3r/GUI/StatusPanel.cpp | 4 ++++ src/slic3r/GUI/Widgets/AMSControl.cpp | 6 +++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/ExtrusionCalibration.cpp b/src/slic3r/GUI/ExtrusionCalibration.cpp index 38eb00597..a91e8d3b8 100644 --- a/src/slic3r/GUI/ExtrusionCalibration.cpp +++ b/src/slic3r/GUI/ExtrusionCalibration.cpp @@ -423,6 +423,7 @@ void ExtrusionCalibration::update() show_info(true, true, tips); } else { + get_bed_type_incompatible(true); show_info(true, false, _L("Calibration completed")); } m_cali_cancel->Hide(); @@ -433,6 +434,7 @@ void ExtrusionCalibration::update() wxString tips = get_bed_type_incompatible(false); show_info(true, true, tips); } else { + get_bed_type_incompatible(true); show_info(true, false, wxEmptyString); } m_cali_cancel->Hide(); diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp index 2cadea6a1..635e6749e 100644 --- a/src/slic3r/GUI/StatusPanel.cpp +++ b/src/slic3r/GUI/StatusPanel.cpp @@ -1901,6 +1901,10 @@ void StatusPanel::update_ams(MachineObject *obj) last_ams_version = -1; BOOST_LOG_TRIVIAL(trace) << "machine object" << obj->dev_name << " was disconnected, set show_ams_group is false"; } + bool is_support_extrusion_cali = obj->is_function_supported(PrinterFunction::FUNC_EXTRUSION_CALI); + if (is_support_extrusion_cali) { + m_ams_control->update_vams_kn_value(obj->vt_tray); + } show_ams_group(false, obj->is_function_supported(PrinterFunction::FUNC_EXTRUSION_CALI)); return; } diff --git a/src/slic3r/GUI/Widgets/AMSControl.cpp b/src/slic3r/GUI/Widgets/AMSControl.cpp index 2d1918322..6cc265ffb 100644 --- a/src/slic3r/GUI/Widgets/AMSControl.cpp +++ b/src/slic3r/GUI/Widgets/AMSControl.cpp @@ -599,8 +599,8 @@ void AMSLib::render(wxDC &dc) //draw k&n if (m_show_kn) { - wxString str_k = wxString::Format("k %1.3f", m_info.k); - wxString str_n = wxString::Format("n %1.3f", m_info.n); + wxString str_k = wxString::Format("K %1.3f", m_info.k); + wxString str_n = wxString::Format("N %1.3f", m_info.n); dc.SetFont(::Label::Body_11); auto tsize = dc.GetMultiLineTextExtent(str_k); auto pot_k = wxPoint((libsize.x - tsize.x) / 2, (libsize.y - tsize.y) / 2 - FromDIP(9) + tsize.y); @@ -1585,7 +1585,7 @@ AMSControl::AMSControl(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons m_none_ams_panel->SetBackgroundColour(AMS_CONTROL_DEF_BLOCK_BK_COLOUR); //m_none_ams_panel->SetDoubleBuffered(true); - auto m_tip_none_ams = new wxStaticText(m_none_ams_panel, wxID_ANY, _L("NO AMS"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); + auto m_tip_none_ams = new wxStaticText(m_none_ams_panel, wxID_ANY, _L("AMS not connected"), wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER_HORIZONTAL); m_tip_none_ams->SetMinSize(wxSize(AMS_CANS_SIZE.x - FromDIP(20), -1)); m_tip_none_ams->SetFont(::Label::Head_16); m_tip_none_ams->SetForegroundColour(AMS_CONTROL_DISABLE_COLOUR);