juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-16 18:12:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENH:command ams filament settings is compatible with all AMS

Browse Source 
jira:[none]

Change-Id: I622300794d1fa14826847229737b1f6f2ae490db
(cherry picked from commit c2adbe140b134b958f589ba178286e245a09adbf)
This commit is contained in:
tao wang
2025-04-02 10:51:57 +08:00
committed by Noisyfox
parent ca68aa6d2b
commit 48ec9edc51
3 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/slic3r/GUI/AMSMaterialsSetting.cpp
View File

@@ -499,25 +499,9 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
}
if (obj) {
// set filament
if (is_virtual_tray()) {
auto tar_tray = VIRTUAL_TRAY_ID;
if (!obj->is_enable_np) {
tar_tray = VIRTUAL_TRAY_ID;
}
else {
tar_tray = 0;
}
obj->command_ams_filament_settings(ams_id, tar_tray, ams_filament_id, ams_setting_id, color_str, m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
}
else if(m_is_third){
if (obj->is_enable_np) {
obj->command_ams_filament_settings(ams_id, slot_id, ams_filament_id, ams_setting_id, color_str, m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
}
else {
obj->command_ams_filament_settings(ams_id, slot_id, ams_filament_id, ams_setting_id, color_str, m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
}
if(m_is_third){
obj->command_ams_filament_settings(ams_id, slot_id, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int,
nozzle_temp_max_int);
}
// set k / n value
@@ -629,16 +613,7 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
// set filament
if (m_is_third) {
if (is_virtual_tray()) {
obj->command_ams_filament_settings(ams_id, VIRTUAL_TRAY_ID, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
}
else {
if (obj->is_enable_np) {
obj->command_ams_filament_settings(ams_id, slot_id, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
} else {
obj->command_ams_filament_settings(ams_id, slot_id, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
}
}
obj->command_ams_filament_settings(ams_id, slot_id, ams_filament_id, ams_setting_id, std::string(col_buf), m_filament_type, nozzle_temp_min_int, nozzle_temp_max_int);
}
//reset param