From 4d4883953d5e61077ee12f489588a730e293640c Mon Sep 17 00:00:00 2001
From: "qing.zhang" <qing.zhang@bambulab.com>
Date: Tue, 5 Nov 2024 18:48:28 +0800
Subject: [PATCH] FIX: adjust plate type eume

Jira: none

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If5bab050cc4d243d1ac414b91d1b6e10fa95dad2
---
 src/libslic3r/PrintConfig.cpp    | 10 +++++-----
 src/libslic3r/PrintConfig.hpp    |  2 +-
 src/slic3r/GUI/SelectMachine.cpp | 10 +++++-----
 src/slic3r/Utils/CalibUtils.cpp  |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/libslic3r/PrintConfig.cpp b/src/libslic3r/PrintConfig.cpp
index 9eb8ed085..4d7c6f776 100644
--- a/src/libslic3r/PrintConfig.cpp
+++ b/src/libslic3r/PrintConfig.cpp
@@ -322,11 +322,11 @@ CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(OverhangThresholdParticipatingCooling)
 // BBS
 static const t_config_enum_values s_keys_map_BedType = {
     { "Default Plate",      btDefault },
-    { "Supertack Plate",    btSuperTack },
     { "Cool Plate",         btPC },
     { "Engineering Plate",  btEP  },
     { "High Temp Plate",    btPEI  },
-    { "Textured PEI Plate", btPTE }
+    { "Textured PEI Plate", btPTE },
+    {"Supertack Plate",     btSuperTack}
 };
 CONFIG_OPTION_ENUM_DEFINE_STATIC_MAPS(BedType)
 
@@ -691,16 +691,16 @@ void PrintConfigDef::init_fff_params()
     def->tooltip = L("Bed types supported by the printer");
     def->mode = comSimple;
     def->enum_keys_map = &s_keys_map_BedType;
-    def->enum_values.emplace_back("Supertack Plate");
     def->enum_values.emplace_back("Cool Plate");
     def->enum_values.emplace_back("Engineering Plate");
     def->enum_values.emplace_back("High Temp Plate");
     def->enum_values.emplace_back("Textured PEI Plate");
-    def->enum_labels.emplace_back(L("Bambu Cool Plate SuperTack"));
-    def->enum_labels.emplace_back(L("Cool Plate / PLA Plate"));
+    def->enum_values.emplace_back("Supertack Plate");
+    def->enum_labels.emplace_back(L("Cool Plate"));
     def->enum_labels.emplace_back(L("Engineering Plate"));
     def->enum_labels.emplace_back(L("Smooth PEI Plate / High Temp Plate"));
     def->enum_labels.emplace_back(L("Textured PEI Plate"));
+    def->enum_labels.emplace_back(L("Bambu Cool Plate SuperTack"));
     def->set_default_value(new ConfigOptionEnum<BedType>(btPC));
 
     // BBS
diff --git a/src/libslic3r/PrintConfig.hpp b/src/libslic3r/PrintConfig.hpp
index f9155aa60..228154e22 100644
--- a/src/libslic3r/PrintConfig.hpp
+++ b/src/libslic3r/PrintConfig.hpp
@@ -226,11 +226,11 @@ enum OverhangThresholdParticipatingCooling {
 // BBS
 enum BedType {
     btDefault = 0,
-    btSuperTack,
     btPC,
     btEP,
     btPEI,
     btPTE,
+    btSuperTack,
     btCount
 };
 
diff --git a/src/slic3r/GUI/SelectMachine.cpp b/src/slic3r/GUI/SelectMachine.cpp
index 99071b454..d021358c8 100644
--- a/src/slic3r/GUI/SelectMachine.cpp
+++ b/src/slic3r/GUI/SelectMachine.cpp
@@ -897,20 +897,20 @@ void SelectMachinePopup::OnLeftUp(wxMouseEvent &event)
 
 static wxString MACHINE_BED_TYPE_STRING[BED_TYPE_COUNT] = {
     //_L("Auto"),
-    _L("Bambu Cool Plate SuperTack"),
-    _L("Bambu Cool Plate") + " / " + _L("PLA Plate"),
+    _L("Bambu Cool Plate"),
     _L("Bamabu Engineering Plate"),
     _L("Bamabu Smooth PEI Plate") + "/" + _L("High temperature Plate"),
-    _L("Bamabu Textured PEI Plate")
+    _L("Bamabu Textured PEI Plate"),
+    _L("Bambu Cool Plate SuperTack")
 };
 
 static std::string MachineBedTypeString[BED_TYPE_COUNT] = {
     //"auto",
-    "suprtack",
     "pc",
     "pe",
     "pei",
-    "pte"
+    "pte",
+    "suprtack"
 };
 
 void SelectMachineDialog::stripWhiteSpace(std::string& str)
diff --git a/src/slic3r/Utils/CalibUtils.cpp b/src/slic3r/Utils/CalibUtils.cpp
index c03ec6338..4a4e17c5e 100644
--- a/src/slic3r/Utils/CalibUtils.cpp
+++ b/src/slic3r/Utils/CalibUtils.cpp
@@ -23,11 +23,11 @@ static const std::string config_3mf_path = temp_dir + "/test_config.3mf";
 
 static std::string MachineBedTypeString[6] = {
     "auto",
-    "suprtack",
     "pc",
     "ep",
     "pei",
-    "pte"
+    "pte",
+    "suprtack"
 };
 
 void get_default_k_n_value(const std::string &filament_id, float &k, float &n)