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

FIX:fixed hiding AMS when backup is not supported

Browse source 
Change-Id: I5d8c05361c31caa7962ac9559fd3fa1478cfafaf
This commit is contained in:
tao wang 2023-07-03 14:58:20 +08:00 • committed by Lane.Wei
parent b2a2636785
commit 61acd01657
2 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2902,14 +2902,16 @@ void SelectMachineDialog::on_timer(wxTimerEvent &event)
if (!obj_ if (!obj_
|| obj_->amsList.empty() || obj_->amsList.empty()
|| obj_->ams_exist_bits == 0 || obj_->ams_exist_bits == 0
|| !obj_->m_is_support_show_bak
|| !obj_->ams_support_auto_switch_filament_flag
|| !obj_->ams_auto_switch_filament_flag || !obj_->ams_auto_switch_filament_flag
|| !obj_->is_function_supported(PrinterFunction::FUNC_FILAMENT_BACKUP) || !obj_->is_function_supported(PrinterFunction::FUNC_FILAMENT_BACKUP)
|| !m_checkbox_list["use_ams"]->GetValue() ) { || !m_checkbox_list["use_ams"]->GetValue() ) {
if (m_ams_backup_tip->IsShown()) { if (m_ams_backup_tip->IsShown()) {
m_ams_backup_tip->Hide(); m_ams_backup_tip->Hide();
img_ams_backup->Hide(); img_ams_backup->Hide();
Layout(); Layout();
Fit(); Fit();
} }
} }
else { else {

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

@ -2015,9 +2015,6 @@ void StatusPanel::update_ams(MachineObject *obj)
if (!obj if (!obj
|| !obj->is_connected() || !obj->is_connected()
|| obj->amsList.empty() || obj->amsList.empty()
|| !is_support_filament_backup
|| !obj->ams_auto_switch_filament_flag
|| !obj->m_is_support_show_bak
|| obj->ams_exist_bits == 0) { || obj->ams_exist_bits == 0) {
if (!obj || !obj->is_connected()) { if (!obj || !obj->is_connected()) {
last_tray_exist_bits = -1; last_tray_exist_bits = -1;
@ -2034,7 +2031,13 @@ void StatusPanel::update_ams(MachineObject *obj)
} }
else { else {
show_ams_group(true, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), is_support_extrusion_cali, obj->is_support_filament_edit_virtual_tray); show_ams_group(true, obj->is_function_supported(PrinterFunction::FUNC_VIRTUAL_TYAY), is_support_extrusion_cali, obj->is_support_filament_edit_virtual_tray);
m_ams_control->show_auto_refill(true);
if (!obj->m_is_support_show_bak || !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);
}
} }