3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-12-27 09:59:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

FIX:fixed incorrect layout without AMS

Browse source 
jira:[none ]

Change-Id: I7cda157a149b89820b7936eb058a7ad8058d9e4b
(cherry picked from commit 5550b96305086684084cf538656e9bfada14f164)
(cherry picked from commit d1932d8c982c54fe8796d097464b0805db241a13)
This commit is contained in:
tao wang 2024-12-11 17:13:17 +08:00 • committed by Noisyfox
parent 5be8b62cd4
commit 44e09c2fea
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3074,19 +3074,14 @@ void StatusPanel::update_ams(MachineObject *obj)
obj->check_ams_filament_valid();
}
if (obj->is_enable_np && obj->amsList.size() > 0) { ams_mode = AMSModel(obj->amsList.begin()->second->type); }
if (!obj
|| !obj->is_connected()
|| obj->amsList.empty()
|| obj->ams_exist_bits == 0) {
if (!obj || !obj->is_connected()) {
last_tray_exist_bits = -1;
last_ams_exist_bits = -1;
last_tray_is_bbl_bits = -1;
last_read_done_bits = -1;
last_reading_bits = -1;
last_ams_version = -1;
BOOST_LOG_TRIVIAL(trace) << "machine object" << obj->dev_name << " was disconnected, set show_ams_group is false";
}
if (!obj || !obj->is_connected()) {
last_tray_exist_bits = -1;
last_ams_exist_bits = -1;
last_tray_is_bbl_bits = -1;
last_read_done_bits = -1;
last_reading_bits = -1;
last_ams_version = -1;
BOOST_LOG_TRIVIAL(trace) << "machine object" << obj->dev_name << " was disconnected, set show_ams_group is false";
m_ams_control->SetAmsModel(AMSModel::EXT_AMS, ams_mode);
show_ams_group(false);
@ -3098,7 +3093,14 @@ void StatusPanel::update_ams(MachineObject *obj)
m_filament_step->SetAmsModel(ams_mode, ams_mode);
show_ams_group(true);
show_filament_load_group(true);
m_ams_control->show_auto_refill(true);
if (obj->amsList.empty() || obj->ams_exist_bits == 0) {
m_ams_control->show_auto_refill(false);
m_ams_control->enable_ams_setting(false);
} else {
m_ams_control->show_auto_refill(true);
m_ams_control->enable_ams_setting(true);
}
}

5
src/slic3r/GUI/Widgets/AMSControl.cpp
View file

@ -996,6 +996,11 @@ void AMSControl::show_auto_refill(bool show)
m_amswin->Fit();
}
void AMSControl::enable_ams_setting(bool en)
{
m_button_ams_setting->Enable(en);
}
void AMSControl::show_vams(bool show)
{
m_panel_virtual->Show(show);

1
src/slic3r/GUI/Widgets/AMSControl.hpp
View file

@ -155,6 +155,7 @@ public:
void show_noams_mode();
void show_auto_refill(bool show);
void enable_ams_setting(bool en);
void show_vams(bool show);
void show_vams_kn_value(bool show);
void update_vams_kn_value(AmsTray tray, MachineObject* obj);