GitHub-Proxy/BambuStudio
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/bambulab/BambuStudio.git synced 2025-08-20 02:29:10 +08:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

FIX:fixed incorrect layout without AMS

Browse Source 
jira:[none ]

Change-Id: I7cda157a149b89820b7936eb058a7ad8058d9e4b
(cherry picked from commit 5550b96305086684084cf538656e9bfada14f164)
This commit is contained in:
tao wang 2024-12-11 17:13:17 +08:00 committed by lane.wei
parent d4187d91e7
commit d1932d8c98
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/StatusPanel.cpp
View File

@ -3049,10 +3049,6 @@ void StatusPanel::update_ams(MachineObject *obj)
if (obj->is_enable_np && obj->amsList.size() > 0){ if (obj->is_enable_np && obj->amsList.size() > 0){
ams_mode = AMSModel(obj->amsList.begin()->second->type); 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()) { if (!obj || !obj->is_connected()) {
last_tray_exist_bits = -1; last_tray_exist_bits = -1;
last_ams_exist_bits = -1; last_ams_exist_bits = -1;
@ -3061,7 +3057,6 @@ void StatusPanel::update_ams(MachineObject *obj)
last_reading_bits = -1; last_reading_bits = -1;
last_ams_version = -1; last_ams_version = -1;
BOOST_LOG_TRIVIAL(trace) << "machine object" << obj->dev_name << " was disconnected, set show_ams_group is false"; 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); m_ams_control->SetAmsModel(AMSModel::EXT_AMS, ams_mode);
show_ams_group(false); show_ams_group(false);
@ -3073,7 +3068,14 @@ void StatusPanel::update_ams(MachineObject *obj)
m_filament_step->SetAmsModel(ams_mode, ams_mode); m_filament_step->SetAmsModel(ams_mode, ams_mode);
show_ams_group(true); show_ams_group(true);
show_filament_load_group(true); show_filament_load_group(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->show_auto_refill(true);
m_ams_control->enable_ams_setting(true);
}
} }

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

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

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

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