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: display unload filament button when use_ams is false

Browse source 
Change-Id: I4dc7cc17c33e5f92543934c3d003c34fea94b0cb
Signed-off-by: Stone Li <stone.li@bambulab.com>
This commit is contained in:
Stone Li 2022-12-09 15:38:54 +08:00 • committed by Lane.Wei
parent 761bf07c44
commit a9938d7676
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/DeviceManager.cpp
View file

@ -490,6 +490,18 @@ void MachineObject::_parse_ams_status(int ams_status)
BOOST_LOG_TRIVIAL(trace) << "ams_debug: main = " << ams_status_main_int << ", sub = " << ams_status_sub; BOOST_LOG_TRIVIAL(trace) << "ams_debug: main = " << ams_status_main_int << ", sub = " << ams_status_sub;
} }
bool MachineObject::can_unload_filament()
{
bool result = false;
if (!has_ams())
return true;
if (ams_status_main == AMS_STATUS_MAIN_IDLE && hw_switch_state == 1 && m_tray_now == "255") {
return true;
}
return result;
}
bool MachineObject::is_U0_firmware() bool MachineObject::is_U0_firmware()
{ {
auto ota_ver_it = module_vers.find("ota"); auto ota_ver_it = module_vers.find("ota");

1
src/slic3r/GUI/DeviceManager.hpp
View file

@ -439,6 +439,7 @@ public:
// parse amsStatusMain and ams_status_sub // parse amsStatusMain and ams_status_sub
void _parse_ams_status(int ams_status); void _parse_ams_status(int ams_status);
bool has_ams() { return ams_exist_bits != 0; } bool has_ams() { return ams_exist_bits != 0; }
bool can_unload_filament();
bool is_U0_firmware(); bool is_U0_firmware();
bool is_support_ams_mapping(); bool is_support_ams_mapping();
bool is_only_support_cloud_print(); bool is_only_support_cloud_print();

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

@ -1633,17 +1633,16 @@ void StatusPanel::update_misc_ctrl(MachineObject *obj)
{ {
if (!obj) return; if (!obj) return;
if (obj->has_ams()) { if (obj->can_unload_filament()) {
if (m_button_unload->IsShown()) {
m_button_unload->Hide();
m_button_unload->GetParent()->Layout();
}
} else {
if (!m_button_unload->IsShown()) { if (!m_button_unload->IsShown()) {
m_button_unload->Show(); m_button_unload->Show();
m_button_unload->GetParent()->Layout(); m_button_unload->GetParent()->Layout();
} }
} else {
if (m_button_unload->IsShown()) {
m_button_unload->Hide();
m_button_unload->GetParent()->Layout();
}
} }
// update extruder icon // update extruder icon