3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-20 13:17:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

FIX:Replace non-UTF8 characters in STEP model names with IDs on import

Browse source 
jira: STUDIO-8055
Change-Id: I9255a7a871ebc9920ec683d1a2a80cd53ada0f10
(cherry picked from commit 89be3166e286346254a08c8efc188e0cea83f2a4)
This commit is contained in:
Mack 2024-10-29 16:17:08 +08:00 • committed by Noisyfox
parent 61ebddf9b8
commit e1477e642c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/Format/STEP.cpp
View file

@ -182,7 +182,7 @@ static void getNamedSolids(const TopLoc_Location& location, const std::string& p
if (referredLabel.FindAttribute(TDataStd_Name::GetID(), shapeName)) if (referredLabel.FindAttribute(TDataStd_Name::GetID(), shapeName))
name = TCollection_AsciiString(shapeName->Get()).ToCString(); name = TCollection_AsciiString(shapeName->Get()).ToCString();
if (name == "") if (name == "" || !StepPreProcessor::isUtf8(name))
name = std::to_string(id++); name = std::to_string(id++);
std::string fullName{name}; std::string fullName{name};

2
src/libslic3r/Format/STEP.hpp
View file

@ -42,8 +42,8 @@ class StepPreProcessor {
public: public:
bool preprocess(const char* path, std::string &output_path); bool preprocess(const char* path, std::string &output_path);
static bool isUtf8File(const char* path); static bool isUtf8File(const char* path);
private:
static bool isUtf8(const std::string str); static bool isUtf8(const std::string str);
private:
static bool isGBK(const std::string str); static bool isGBK(const std::string str);
static int preNum(const unsigned char byte); static int preNum(const unsigned char byte);
//BBS: default is UTF8 for most step file. //BBS: default is UTF8 for most step file.