From ce9561c6f8bac64cd12192ff68a4733b3f67a5c4 Mon Sep 17 00:00:00 2001
From: "liz.li" <liz.li@bambulab.com>
Date: Tue, 4 Jul 2023 10:56:37 +0800
Subject: [PATCH] ENH: modify naming rule

Change-Id: I6baa5f72c3da4772c34940ce820ee2e84e3ccf0f
(cherry picked from commit 6c833991eff638294d4136c26b4286b49a4a2af6)
---
 src/slic3r/GUI/CalibrationWizardSavePage.cpp | 24 ++++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp
index 6d71ac04b..9b3451327 100644
--- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp
+++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp
@@ -7,26 +7,36 @@
 namespace Slic3r { namespace GUI {
 
 
-static wxString get_default_name(wxString filament_type, CalibMode mode){
+static wxString get_default_name(wxString filament_name, CalibMode mode){
+    PresetBundle* preset_bundle = wxGetApp().preset_bundle;
+    for (auto it = preset_bundle->filaments.begin(); it != preset_bundle->filaments.end(); it++) {
+        if (filament_name.compare(it->name) == 0) {
+            if (!it->alias.empty())
+                filament_name = it->alias;
+            else
+                filament_name = it->name;
+        }
+    }
+
     switch (mode)
     {
     case Slic3r::CalibMode::Calib_None:
         break;
     case Slic3r::CalibMode::Calib_PA_Line:
-        if (filament_type.StartsWith("Generic")) {
-            filament_type.Replace("Generic", "Brand", true);
+        if (filament_name.StartsWith("Generic")) {
+            filament_name.Replace("Generic", "Brand", false);
         }
         break;
     case Slic3r::CalibMode::Calib_PA_Tower:
         break;
     case Slic3r::CalibMode::Calib_Flow_Rate:
-        filament_type += "Flow_Rate_Calibrated";
+        filament_name += " Flow Rate Calibrated";
         break;
     case Slic3r::CalibMode::Calib_Temp_Tower:
-        filament_type += "Temperature_Calibrated";
+        filament_name += " Temperature Calibrated";
         break;
     case Slic3r::CalibMode::Calib_Vol_speed_Tower:
-        filament_type += "Max_Volumetric_Speed_Calibrated";
+        filament_name += " Max Vol Speed Calibrated";
         break;
     case Slic3r::CalibMode::Calib_VFA_Tower:
         break;
@@ -35,7 +45,7 @@ static wxString get_default_name(wxString filament_type, CalibMode mode){
     default:
         break;
     }
-    return filament_type;
+    return filament_name;
 }
 
 CalibrationCommonSavePage::CalibrationCommonSavePage(wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style)