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

FIX:Fix the issue of extruder matching errors

Browse source 
jira:[for nozzle match]

Change-Id: I6965500bfb7feef6d18d28bea8a53a3c477f5e36
(cherry picked from commit 7bcf4b6cc5bc38e723bfd8dcd495c60a55134490)
This commit is contained in:
tao wang 2024-11-06 22:09:33 +08:00 • committed by Noisyfox
parent 7c5dee1eda
commit b0872aaba9
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -585,7 +585,6 @@ MachineObject::MachineObject(NetworkAgent* agent, std::string name, std::string
is_ams_need_update = false;
ams_insert_flag = false;
ams_power_on_flag = false;
ams_support_use_ams = false;
ams_calibrate_remain_flag = false;
ams_humidity = 5;
@ -3919,7 +3918,6 @@ int MachineObject::parse_json(std::string payload, bool key_field_only)
}
if (jj["ams"].contains("tray_reading_bits")) {
tray_reading_bits = stol(jj["ams"]["tray_reading_bits"].get<std::string>(), nullptr, 16);
ams_support_use_ams = true;
}
if (jj["ams"].contains("tray_is_bbl_bits")) {
tray_is_bbl_bits = stol(jj["ams"]["tray_is_bbl_bits"].get<std::string>(), nullptr, 16);

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

@ -530,7 +530,6 @@ public:
bool ams_calibrate_remain_flag { false };
bool ams_auto_switch_filament_flag { false };
bool ams_air_print_status { false };
bool ams_support_use_ams { false };
bool ams_support_virtual_tray { true };
int ams_humidity;
int ams_user_setting_hold_count = 0;

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

@ -3519,7 +3519,7 @@ void SelectMachineDialog::update_flow_cali_check(MachineObject* obj)
void SelectMachineDialog::update_ams_check(MachineObject* obj)
{
if (obj && obj->ams_support_use_ams && obj->has_ams()) {
if (obj && obj->has_ams()) {
select_use_ams->Show();
if (obj->get_printer_ams_type() == "generic") {
img_use_ams_tip->Show();
@ -3611,13 +3611,11 @@ void SelectMachineDialog::update_show_status()
// do ams mapping if no ams result
bool clean_ams_mapping = false;
if (obj_->has_ams() && m_ams_mapping_result.empty()) {
if (obj_->ams_support_use_ams) {
if (m_checkbox_list["use_ams"]->GetValue()) {
do_ams_mapping(obj_);
} else {
clean_ams_mapping = true;
}
if (m_ams_mapping_result.empty()) {
if (m_checkbox_list["use_ams"]->GetValue()) {
do_ams_mapping(obj_);
} else {
clean_ams_mapping = true;
}
}
@ -3685,20 +3683,17 @@ void SelectMachineDialog::update_show_status()
return;
}
if (obj_->ams_support_use_ams) {
if (!m_checkbox_list["use_ams"]->GetValue()) {
m_ams_mapping_result.clear();
sync_ams_mapping_result(m_ams_mapping_result);
if (!m_checkbox_list["use_ams"]->GetValue()) {
m_ams_mapping_result.clear();
sync_ams_mapping_result(m_ams_mapping_result);
if (has_timelapse_warning()) {
show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
}
else {
show_status(PrintDialogStatus::PrintStatusDisableAms);
}
return;
if (has_timelapse_warning()) {
show_status(PrintDialogStatus::PrintStatusTimelapseWarning);
} else {
show_status(PrintDialogStatus::PrintStatusDisableAms);
}
return;
}