From 99f0e3506911f09e52100f22155b0da9f510dc46 Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Wed, 16 Oct 2024 11:58:25 +0800
Subject: [PATCH] FIX:fix some new ui issues

jira:[new ui]

Change-Id: I1283de641d4f2e4acfd5bef91716f9029665c465
(cherry picked from commit 65e8b4ee7e816cc313e8d7a33f06c6f1638dceef)
---
 src/slic3r/GUI/SelectMachine.cpp | 11 +++++------
 src/slic3r/GUI/StatusPanel.cpp   |  6 ++++++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index f35dc5d5c5..13533cd55c 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -2819,19 +2819,18 @@ void SelectMachineDialog::update_flow_cali_check(MachineObject* obj)
     set_flow_calibration_state(true, show_cali_tips);
 }
 
-void SelectMachineDialog::update_ams_check(MachineObject* obj)
+void SelectMachineDialog::update_ams_check(MachineObject *obj)
 {
-    if (obj && obj->has_ams()) {
+    if (obj && obj->has_ams() && !obj->is_enable_np) {
         select_use_ams->Show();
         if (obj->get_printer_ams_type() == "generic") {
             img_use_ams_tip->Show();
-        }
-        else {
+        } else {
             img_use_ams_tip->Hide();
         }
-    } else {
-        select_use_ams->Hide();
     }
+
+    if (obj->is_enable_np) { m_checkbox_list["use_ams"]->SetValue(true); }
 }
 
 void SelectMachineDialog::update_show_status()
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index b27e80d676..7e985a0ebe 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -3832,6 +3832,8 @@ void StatusPanel::on_start_unload(wxCommandEvent &event)
 
 void StatusPanel::on_set_bed_temp()
 {
+    if (!obj) {return;}
+
     wxString str = m_tempCtrl_bed->GetTextCtrl()->GetValue();
     try {
         long bed_temp;
@@ -3853,6 +3855,8 @@ void StatusPanel::on_set_bed_temp()
 
 void StatusPanel::on_set_nozzle_temp()
 {
+    if (!obj) {return;}
+
     wxString str = m_tempCtrl_nozzle->GetTextCtrl()->GetValue();
     wxString str_deputy;
     int nozzle_num = obj->m_extder_data.total_extder_count;
@@ -3884,6 +3888,8 @@ void StatusPanel::on_set_nozzle_temp()
 
 void StatusPanel::on_set_chamber_temp()
 {
+    if (!obj) {return;}
+
     wxString str = m_tempCtrl_chamber->GetTextCtrl()->GetValue();
     try {
         long chamber_temp;