From 2fa364e8b6146699ae66117ba0ab8c7514b52825 Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Fri, 6 Dec 2024 15:20:56 +0800
Subject: [PATCH] ENH:optimize AMS information reset

jira:[none]

Change-Id: I09f6f5048ca3517b49665d817319d7d57c82a0c5
---
 src/slic3r/GUI/AMSMaterialsSetting.cpp | 66 ++++++++++++--------------
 src/slic3r/GUI/DeviceManager.cpp       |  1 +
 2 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp
index 0e2b9cf26..770970ebd 100644
--- a/src/slic3r/GUI/AMSMaterialsSetting.cpp
+++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -474,24 +474,24 @@ void AMSMaterialsSetting::on_select_reset(wxCommandEvent& event) {
     }
 
     if (obj) {
-        // set filament
-        if (is_virtual_tray()) {
-            auto tar_tray = VIRTUAL_TRAY_DEPUTY_ID;
-
-            if (!obj->is_enable_np) {
-                tar_tray = VIRTUAL_TRAY_DEPUTY_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(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 (is_virtual_tray()) {
+                    obj->command_ams_filament_settings(ams_id, 0, 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);
+                }
+
+            } else {
+                if (is_virtual_tray()) {
+                    obj->command_ams_filament_settings(VIRTUAL_TRAY_MAIN_ID, VIRTUAL_TRAY_DEPUTY_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);
+                }
             }
         }
 
@@ -610,25 +610,21 @@ void AMSMaterialsSetting::on_select_ok(wxCommandEvent &event)
 
     // set filament
     if (m_is_third) {
-        if (is_virtual_tray()) {
-
-            auto tar_tray = VIRTUAL_TRAY_DEPUTY_ID;
-
-            if (!obj->is_enable_np) {
-                tar_tray = VIRTUAL_TRAY_DEPUTY_ID;
-            }
-            else {
-                //todo
-                tar_tray = 0;
-            }
-
-            obj->command_ams_filament_settings(ams_id, tar_tray, 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);
+        if (obj->is_enable_np) {
+            if (is_virtual_tray()) {
+                obj->command_ams_filament_settings(ams_id, 0, 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);
+            }
+
+        } else {
+            if (is_virtual_tray()) {
+                obj->command_ams_filament_settings(VIRTUAL_TRAY_MAIN_ID, VIRTUAL_TRAY_DEPUTY_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);
             }
         }
     }
diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index c0c1f3908..a3b9990db 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -2030,6 +2030,7 @@ int MachineObject::command_ams_filament_settings(int ams_id, int tray_id, std::s
     j["print"]["command"]       = "ams_filament_setting";
     j["print"]["sequence_id"]   = std::to_string(MachineObject::m_sequence_id++);
     j["print"]["ams_id"]        = ams_id;
+    j["print"]["slot_id"]       = tray_id;
     j["print"]["tray_id"]       = tray_id;
     j["print"]["tray_info_idx"] = filament_id;
     j["print"]["setting_id"]    = setting_id;