From fe5312af462b32600cb3bcbb7344928a1e1afd8c Mon Sep 17 00:00:00 2001
From: "zhimin.zeng" <zhimin.zeng@bambulab.com>
Date: Wed, 5 Jul 2023 16:58:55 +0800
Subject: [PATCH] FIX: fix flow ratio fine cali bug

Change-Id: Ice774521bb1ea8ebf37791125f4ba6a04f7ddca2
---
 src/slic3r/GUI/CalibrationWizard.cpp          | 22 +++++++++++++++----
 src/slic3r/GUI/CalibrationWizard.hpp          |  4 +++-
 .../GUI/CalibrationWizardPresetPage.hpp       |  5 +++++
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/slic3r/GUI/CalibrationWizard.cpp b/src/slic3r/GUI/CalibrationWizard.cpp
index 4fe3faaa6..ee0c33067 100644
--- a/src/slic3r/GUI/CalibrationWizard.cpp
+++ b/src/slic3r/GUI/CalibrationWizard.cpp
@@ -624,7 +624,7 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt)
             CaliPresetStage stage = CaliPresetStage::CALI_MANULA_STAGE_NONE;
             float cali_value = 0.0f;
             static_cast<CalibrationPresetPage*>(preset_step->page)->get_cali_stage(stage, cali_value);
-            on_cali_start(stage, cali_value);
+            on_cali_start(stage, cali_value, FlowRatioCaliSource::FROM_PRESET_PAGE);
             if (stage == CaliPresetStage::CALI_MANUAL_STAGE_2) {
                 // set next step page
                 m_curr_step->chain(cali_fine_step);
@@ -644,7 +644,7 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt)
             if (!coarse_save_page->get_result(&new_flow_ratio, &temp_name)) {
                 return;
             }
-            on_cali_start(CaliPresetStage::CALI_MANUAL_STAGE_2, new_flow_ratio);
+            on_cali_start(CaliPresetStage::CALI_MANUAL_STAGE_2, new_flow_ratio, FlowRatioCaliSource::FROM_COARSE_PAGE);
             // automatically jump to next step when print job is sending finished.
         }
     }
@@ -665,7 +665,7 @@ void FlowRateWizard::on_cali_action(wxCommandEvent& evt)
     }
 }
 
-void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value)
+void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value, FlowRatioCaliSource from_page)
 {
     if (!curr_obj) return;
 
@@ -682,7 +682,10 @@ void FlowRateWizard::on_cali_start(CaliPresetStage stage, float cali_value)
 
     std::map<int, Preset*> selected_filaments = preset_page->get_selected_filaments();
 
-    CalibrationWizard::cache_preset_info(curr_obj, nozzle_dia);
+    if (from_page == FlowRatioCaliSource::FROM_PRESET_PAGE)
+        CalibrationWizard::cache_preset_info(curr_obj, nozzle_dia);
+    else if (from_page == FlowRatioCaliSource::FROM_COARSE_PAGE)
+        cache_coarse_info(curr_obj);
 
     if (m_cali_method == CalibrationMethod::CALI_METHOD_AUTO) {
         X1CCalibInfos calib_infos;
@@ -942,6 +945,17 @@ void FlowRateWizard::on_cali_job_finished(wxString evt_data)
     static_cast<CalibrationPresetPage*>(preset_step->page)->on_cali_finished_job();
 }
 
+void FlowRateWizard::cache_coarse_info(MachineObject *obj)
+{
+    if (!obj) return;
+
+    CalibrationFlowCoarseSavePage *coarse_page = (static_cast<CalibrationFlowCoarseSavePage *>(coarse_save_step->page));
+    if (!coarse_page)
+        return;
+
+    wxString out_name;
+    coarse_page->get_result(&obj->cache_flow_ratio, &out_name);
+}
 
 MaxVolumetricSpeedWizard::MaxVolumetricSpeedWizard(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)
     : CalibrationWizard(parent, CalibMode::Calib_Vol_speed_Tower, id, pos, size, style)
diff --git a/src/slic3r/GUI/CalibrationWizard.hpp b/src/slic3r/GUI/CalibrationWizard.hpp
index 975060803..1e6f2ddbe 100644
--- a/src/slic3r/GUI/CalibrationWizard.hpp
+++ b/src/slic3r/GUI/CalibrationWizard.hpp
@@ -125,12 +125,14 @@ public:
 
     void on_cali_job_finished(wxString evt_data) override;
 
+    void cache_coarse_info(MachineObject *obj);
+
 protected:
     void create_pages();
 
     void on_cali_action(wxCommandEvent& evt);
 
-    void on_cali_start(CaliPresetStage stage = CaliPresetStage::CALI_MANULA_STAGE_NONE, float cali_value = 0.0f);
+    void on_cali_start(CaliPresetStage stage = CaliPresetStage::CALI_MANULA_STAGE_NONE, float cali_value = 0.0f, FlowRatioCaliSource from_page = FlowRatioCaliSource::FROM_PRESET_PAGE);
 
     void on_cali_save();
 
diff --git a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp
index 964ac0574..9bb66d93c 100644
--- a/src/slic3r/GUI/CalibrationWizardPresetPage.hpp
+++ b/src/slic3r/GUI/CalibrationWizardPresetPage.hpp
@@ -11,6 +11,11 @@ enum CaliPresetStage {
     CALI_MANUAL_STAGE_2,
 };
 
+enum FlowRatioCaliSource {
+    FROM_PRESET_PAGE = 0,
+    FROM_COARSE_PAGE,
+};
+
 class CaliPresetCaliStagePanel : public wxPanel
 {
 public: