From 7b67686528e1f46dbb81cf4c63aef131bf0e9937 Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Thu, 7 Sep 2023 18:15:37 +0800 Subject: [PATCH] FIX: pa calibration default save value issue should not use last input value as default saving value Jira: STUDIO-3648 Change-Id: I8ea5bac66ef723c668c09ffb40b141a489e7d637 --- src/slic3r/GUI/CalibrationWizardSavePage.cpp | 10 ++++++++++ src/slic3r/GUI/CalibrationWizardSavePage.hpp | 2 ++ 2 files changed, 12 insertions(+) diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index 58fc0f6db..ee2d24236 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -593,6 +593,8 @@ bool CaliPASaveManualPanel::Show(bool show) { if (!m_obj->selected_cali_preset.empty()) { wxString default_name = get_default_name(m_obj->selected_cali_preset[0].name, CalibMode::Calib_PA_Line); set_default_name(default_name); + m_k_val->GetTextCtrl()->SetLabel(""); + m_n_val->GetTextCtrl()->SetLabel(""); } } else { @@ -703,6 +705,14 @@ bool CaliPASaveP1PPanel::get_result(float* out_k, float* out_n){ return true; } +bool CaliPASaveP1PPanel::Show(bool show) { + if (show) { + m_k_val->GetTextCtrl()->SetLabel(""); + m_n_val->GetTextCtrl()->SetLabel(""); + } + return wxPanel::Show(show); +} + CaliSavePresetValuePanel::CaliSavePresetValuePanel( wxWindow *parent, wxWindowID id, diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.hpp b/src/slic3r/GUI/CalibrationWizardSavePage.hpp index 6396d12e7..0cb0de787 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.hpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.hpp @@ -155,6 +155,8 @@ public: bool get_result(float* out_k, float* out_n); + virtual bool Show(bool show = true) override; + protected: wxBoxSizer* m_top_sizer; Label * m_complete_text;