viewit/OrcaSlicer-KX
5
4
Fork 1
Code Issues 2 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

FIX: the extruder_id of cali is incorrect with N3S

Browse Source 
jira: STUDIO-9888
Change-Id: I25c4a436e322923a247d1c6d3c3de9f0319bb420
(cherry picked from commit 13355ca669229839e8c8943f80cc50533256d0d7)
This commit is contained in:
zhimin.zeng
2025-01-16 10:46:29 +08:00
committed by Noisyfox
parent da941fc787
commit 7d76f3a6d9
5 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/slic3r/GUI/CalibrationWizardPresetPage.cpp
View File

@@ -1390,6 +1390,11 @@ bool CalibrationPresetPage::is_filaments_compatiable(const std::map<int, Preset*
bool CalibrationPresetPage::is_filament_in_blacklist(int tray_id, Preset* preset, std::string& error_tips)
{
int ams_id;
int slot_id;
int out_tray_id;
get_tray_ams_and_slot_id(curr_obj, tray_id, ams_id, slot_id, out_tray_id);
if (!m_ext_spool_radiobox->GetValue() && wxGetApp().app_config->get("skip_ams_blacklist_check") != "true") {
bool in_blacklist = false;
std::string action;
@@ -1400,7 +1405,7 @@ bool CalibrationPresetPage::is_filament_in_blacklist(int tray_id, Preset* preset
auto vendor = dynamic_cast<ConfigOptionStrings*> (preset->config.option("filament_vendor"));
if (vendor && (vendor->values.size() > 0)) {
std::string vendor_name = vendor->values[0];
DeviceManager::check_filaments_in_blacklist(vendor_name, filamnt_type, tray_id, in_blacklist, action, info);
DeviceManager::check_filaments_in_blacklist(vendor_name, filamnt_type, ams_id, in_blacklist, action, info);
}
if (in_blacklist) {