juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-14 09:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: the encoding of filament check_ams_filament_valid

Browse Source 
jira: [STUDIO-12251]
Change-Id: Idc3d23dce67d3e835f15c47984fdd68041371d61
(cherry picked from commit 42b15b4d41a099c5f1aca9dd59ac592aafba0b43)
This commit is contained in:
xin.zhang
2025-05-23 17:53:16 +08:00
committed by Noisyfox
parent 2d69d58ce9
commit 4b6b3cc7bd
5 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/DeviceManager.cpp
View File

@@ -283,7 +283,7 @@ PrinterArch get_printer_arch_by_str(std::string arch_str)
return PrinterArch::ARCH_CORE_XY;
}
void check_filaments_for_vt_slot(const std::string &tag_vendor, const std::string &tag_type, int ams_id, bool &in_blacklist, std::string &ac, std::string &info)
void check_filaments_for_vt_slot(const std::string &tag_vendor, const std::string &tag_type, int ams_id, bool &in_blacklist, std::string &ac, wxString &info)
{
DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev)
@@ -301,12 +301,12 @@ void check_filaments_for_vt_slot(const std::string &tag_vendor, const std::strin
wxString info_str = wxString::Format(_L("TPU is not supported by %s extruder for this printer."), extruder_name);
ac = "prohibition";
info = info_str.ToUTF8().data();
info = info_str;
in_blacklist = true;
}
}
bool check_filaments_printable(const std::string &tag_vendor, const std::string &tag_type, const std::string& filament_id, int ams_id, bool &in_blacklist, std::string &ac, std::string &info)
bool check_filaments_printable(const std::string &tag_vendor, const std::string &tag_type, const std::string& filament_id, int ams_id, bool &in_blacklist, std::string &ac, wxString &info)
{
DeviceManager *dev = Slic3r::GUI::wxGetApp().getDeviceManager();
if (!dev) {
@@ -7882,7 +7882,7 @@ void check_filaments_for_ams_slot(std::string model_id,
std::string tag_name,
bool& in_blacklist,
std::string& ac,
std::string& info)
wxString& info)
{
if (tag_name.empty())
{
@@ -7949,7 +7949,7 @@ void check_filaments_for_ams_slot(std::string model_id,
in_blacklist = true;
ac = action;
info = blacklist_prompt[description].ToStdString();
info = blacklist_prompt[description];
return;
}
}
@@ -7966,7 +7966,7 @@ void DeviceManager::check_filaments_in_blacklist(std::string model_id,
std::string tag_name,
bool &in_blacklist,
std::string &ac,
std::string &info)
wxString &info)
{
if (ams_id < 0 || slot_id < 0) {
return;