From 6d1b7b8d806530c80e72f266c733e0207e7ac27a Mon Sep 17 00:00:00 2001
From: tao wang <tao.wang@bambulab.com>
Date: Tue, 15 Apr 2025 12:53:36 +0800
Subject: [PATCH] FIX:fixed the issue of incorrect display of calibration
 information

jira:[STUDIO-11515]

Change-Id: I4cd62b06ead3fc43917cee7fbc68b2575a0d8133
---
 src/slic3r/GUI/DeviceManager.cpp | 6 ++++--
 src/slic3r/GUI/DeviceManager.hpp | 1 +
 src/slic3r/GUI/StatusPanel.cpp   | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/DeviceManager.cpp b/src/slic3r/GUI/DeviceManager.cpp
index 838f839b1..1c4ce7bde 100644
--- a/src/slic3r/GUI/DeviceManager.cpp
+++ b/src/slic3r/GUI/DeviceManager.cpp
@@ -1538,8 +1538,6 @@ bool MachineObject::is_in_calibration()
     return false;
 }
 
-
-
 bool MachineObject::is_calibration_done()
 {
     return calibration_done;
@@ -5546,6 +5544,10 @@ void MachineObject::set_modeltask(BBLModelTask* task)
     model_task = task;
 }
 
+void MachineObject::set_slice_info(BBLSliceInfo *info) {
+    slice_info = info;
+}
+
 void MachineObject::update_model_task()
 {
     if (request_model_result > 10) return;
diff --git a/src/slic3r/GUI/DeviceManager.hpp b/src/slic3r/GUI/DeviceManager.hpp
index e9bd21967..cd4327cea 100644
--- a/src/slic3r/GUI/DeviceManager.hpp
+++ b/src/slic3r/GUI/DeviceManager.hpp
@@ -1301,6 +1301,7 @@ public:
     BBLSubTask* get_subtask();
     BBLModelTask* get_modeltask();
     void set_modeltask(BBLModelTask* task);
+    void set_slice_info(BBLSliceInfo *info);
     void update_model_task();
     void update_slice_info(std::string project_id, std::string profile_id, std::string subtask_id, int plate_idx);
 
diff --git a/src/slic3r/GUI/StatusPanel.cpp b/src/slic3r/GUI/StatusPanel.cpp
index 9d05b8dbe..28fc325ac 100644
--- a/src/slic3r/GUI/StatusPanel.cpp
+++ b/src/slic3r/GUI/StatusPanel.cpp
@@ -3668,8 +3668,7 @@ void StatusPanel::update_subtask(MachineObject *obj)
 
     update_model_info();
 
-    if (obj->is_system_printing()
-        || obj->is_in_calibration()) {
+    if (obj->is_system_printing() || obj->is_in_calibration()) {
         reset_printing_values();
     } else if (obj->is_in_printing() || obj->print_status == "FINISH") {
 
@@ -3809,6 +3808,7 @@ void StatusPanel::update_cloud_subtask(MachineObject *obj)
 
     if (is_task_changed(obj)) {
         obj->set_modeltask(nullptr);
+        obj->set_slice_info(nullptr);
         reset_printing_values();
         BOOST_LOG_TRIVIAL(info) << "monitor: change to sub task id = " << obj->subtask_->task_id;
         if (web_request.IsOk() && web_request.GetState() == wxWebRequest::State_Active) {