From d48101887e7842a75ce5d9e1e032ec981ee404c8 Mon Sep 17 00:00:00 2001
From: "liz.li" <liz.li@bambulab.com>
Date: Wed, 5 Jul 2023 16:47:39 +0800
Subject: [PATCH] FIX: auto calibrate sync result

Change-Id: Icd3bf386d2e57b7d23517548dd539eb778ce6d20
---
 src/slic3r/GUI/CalibrationWizard.cpp         |  1 -
 src/slic3r/GUI/CalibrationWizardPage.cpp     |  1 +
 src/slic3r/GUI/CalibrationWizardSavePage.cpp | 11 ++++++++++-
 src/slic3r/GUI/CalibrationWizardSavePage.hpp |  2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp
index ee0c33067..c85cf1d90 100644
--- a/src/slic3r/GUI/CalibrationWizard.cpp
+++ b/src/slic3r/GUI/CalibrationWizard.cpp
@@ -305,7 +305,6 @@ void PressureAdvanceWizard::on_cali_action(wxCommandEvent& evt)
         show_step(m_curr_step->next);
     }
     else if (action == CaliPageActionType::CALI_ACTION_CALI_NEXT) {
-        (static_cast<CalibrationPASavePage*>(save_step->page))->sync_cali_result(curr_obj);
         show_step(m_curr_step->next);
     }
     else if (action == CaliPageActionType::CALI_ACTION_PREV) {
diff --git a/src/slic3r/GUI/CalibrationWizardPage.cpp b/src/slic3r/GUI/CalibrationWizardPage.cpp
index 039b00497..be1b25c98 100644
--- a/src/slic3r/GUI/CalibrationWizardPage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardPage.cpp
@@ -228,6 +228,7 @@ CaliPageButton::CaliPageButton(wxWindow* parent, CaliPageActionType type, wxStri
     case CaliPageActionType::CALI_ACTION_START:
     case CaliPageActionType::CALI_ACTION_NEXT:
     case CaliPageActionType::CALI_ACTION_CALI:
+    case CaliPageActionType::CALI_ACTION_CALI_NEXT:
     case CaliPageActionType::CALI_ACTION_FLOW_CALI_STAGE_2:
     case CaliPageActionType::CALI_ACTION_PA_SAVE:
     case CaliPageActionType::CALI_ACTION_FLOW_SAVE:
diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp
index 9b3451327..e2bc14320 100644
--- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp
@@ -764,8 +764,10 @@ void CalibrationPASavePage::update(MachineObject* obj)
 }
 
 bool CalibrationPASavePage::Show(bool show) {
-    if (curr_obj)
+    if (curr_obj) {
         show_panels(m_cali_method, curr_obj->printer_type);
+        sync_cali_result(curr_obj);
+    }
     return wxPanel::Show(show);
 }
 
@@ -992,6 +994,13 @@ bool CalibrationFlowX1SavePage::get_result(std::vector<std::pair<wxString, float
     }
 }
 
+bool CalibrationFlowX1SavePage::Show(bool show) {
+    if (curr_obj) {
+        sync_cali_result(curr_obj->flow_ratio_results);
+    }
+    return wxPanel::Show(show);
+}
+
 CalibrationFlowCoarseSavePage::CalibrationFlowCoarseSavePage(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
     : CalibrationCommonSavePage(parent, id, pos, size, style)
 {
diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.hpp b/src/slic3r/GUI/CalibrationWizardSavePage.hpp
index ac1ba4c51..a69b85f52 100644
--- a/src/slic3r/GUI/CalibrationWizardSavePage.hpp
+++ b/src/slic3r/GUI/CalibrationWizardSavePage.hpp
@@ -202,6 +202,8 @@ public:
     bool get_result(std::vector<std::pair<wxString, float>>& out_results);
     bool is_all_failed() { return m_is_all_failed; }
 
+    virtual bool Show(bool show = true) override;
+
 protected:
     CaliPageStepGuide* m_step_panel{ nullptr };
     wxPanel* m_complete_text_panel;