3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-08 07:27:41 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ENH:update text in auto refill

Browse source 
jira:[STUDIO-4344]

Change-Id: Ieb1f40e03fd4a266b768f8b97e28328858fe63cc
(cherry picked from commit 621d4319760cea15e224a9927768bb643b852139)
This commit is contained in:
tao wang 2023-09-11 20:06:33 +08:00 • committed by Lane.Wei
parent 6e646878e5
commit fa71b9600b
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/slic3r/GUI/AmsMappingPopup.cpp
View file

@ -1163,6 +1163,7 @@ void MappingContainer::doRender(wxDC& dc)
AmsReplaceMaterialDialog::AmsReplaceMaterialDialog(wxWindow* parent) AmsReplaceMaterialDialog::AmsReplaceMaterialDialog(wxWindow* parent)
: DPIDialog(parent, wxID_ANY, _L("Auto Refill"), wxDefaultPosition, wxDefaultSize, wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX) : DPIDialog(parent, wxID_ANY, _L("Auto Refill"), wxDefaultPosition, wxDefaultSize, wxSYSTEM_MENU | wxCAPTION | wxCLOSE_BOX)
{ {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
SetDoubleBuffered(true); SetDoubleBuffered(true);
#endif //__WINDOWS__ #endif //__WINDOWS__
@ -1331,8 +1332,18 @@ void AmsReplaceMaterialDialog::update_machine_obj(MachineObject* obj)
m_scrollview_groups->SetMinSize(wxSize(FromDIP(400), height)); m_scrollview_groups->SetMinSize(wxSize(FromDIP(400), height));
m_scrollview_groups->SetMaxSize(wxSize(FromDIP(400), height)); m_scrollview_groups->SetMaxSize(wxSize(FromDIP(400), height));
} else { } else {
if (label_txt) if (!obj->is_function_supported(PrinterFunction::FUNC_FILAMENT_BACKUP)) {
label_txt->SetLabelText(_L("There are currently no identical spare consumables available, and automatic replenishment is currently not possible. \n(Currently supporting automatic supply of consumables with the same brand, material type, and color)")); label_txt->SetLabel(_L("The printer does not currently support auto refill."));
}
else if (!obj->ams_auto_switch_filament_flag) {
label_txt->SetLabelText(_L("AMS filament backup is not enabled, please enable it in the AMS settings."));
}
else {
label_txt->SetLabelText(_L("If there are two identical filaments in AMS, AMS filament backup will be enabled. \n(Currently supporting automatic supply of consumables with the same brand, material type, and color)"));
}
label_txt->SetMinSize(wxSize(FromDIP(380), -1));
label_txt->SetMaxSize(wxSize(FromDIP(380), -1));
label_txt->Wrap(FromDIP(380)); label_txt->Wrap(FromDIP(380));
} }

6
src/slic3r/GUI/StatusPanel.cpp
View file

@ -2412,14 +2412,8 @@ void StatusPanel::update_ams(MachineObject *obj)
m_ams_control->SetAmsModel(ams_mode, ams_mode); m_ams_control->SetAmsModel(ams_mode, ams_mode);
show_ams_group(true); show_ams_group(true);
if (!is_support_filament_backup || !obj->ams_support_auto_switch_filament_flag) {
m_ams_control->show_auto_refill(false);
}
else {
m_ams_control->show_auto_refill(true); m_ams_control->show_auto_refill(true);
} }
}
if (is_support_virtual_tray) m_ams_control->update_vams_kn_value(obj->vt_tray, obj); if (is_support_virtual_tray) m_ams_control->update_vams_kn_value(obj->vt_tray, obj);