From 2eb9dd01a76808fb68dac848d2cff4831bfc9ba9 Mon Sep 17 00:00:00 2001 From: "liz.li" Date: Fri, 4 Aug 2023 17:47:52 +0800 Subject: [PATCH] FIX: cali related encoding problem Change-Id: Ia79237d9e2f37fd8720411891fb724c3bd00b9fb --- src/slic3r/GUI/AMSMaterialsSetting.cpp | 2 +- src/slic3r/GUI/CalibrationWizardSavePage.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/slic3r/GUI/AMSMaterialsSetting.cpp b/src/slic3r/GUI/AMSMaterialsSetting.cpp index cf79b83a0b..5916b5edf2 100644 --- a/src/slic3r/GUI/AMSMaterialsSetting.cpp +++ b/src/slic3r/GUI/AMSMaterialsSetting.cpp @@ -1012,7 +1012,7 @@ void AMSMaterialsSetting::on_select_filament(wxCommandEvent &evt) std::vector cali_history = this->obj->pa_calib_tab; for (auto cali_item : cali_history) { if (cali_item.filament_id == ams_filament_id) { - items.push_back(cali_item.name); + items.push_back(from_u8(cali_item.name)); m_pa_profile_items.push_back(cali_item); } } diff --git a/src/slic3r/GUI/CalibrationWizardSavePage.cpp b/src/slic3r/GUI/CalibrationWizardSavePage.cpp index 47b92f1ca0..3f97bc07c3 100644 --- a/src/slic3r/GUI/CalibrationWizardSavePage.cpp +++ b/src/slic3r/GUI/CalibrationWizardSavePage.cpp @@ -261,7 +261,7 @@ void CaliPASaveAutoPanel::sync_cali_result(const std::vector& cal for (auto& info : m_obj->selected_cali_preset) { if (history.filament_id == info.filament_id) { filtered_results.push_back(history); - selections.push_back(history.name); + selections.push_back(from_u8(history.name)); } } } @@ -311,7 +311,7 @@ void CaliPASaveAutoPanel::sync_cali_result(const std::vector& cal for (auto& name : preset_names) { if (item.tray_id == name.first) { - comboBox_tray_name->SetValue(name.second); + comboBox_tray_name->SetValue(from_u8(name.second)); } }