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

FIX: cannot open saved 3mf with & in model name

Browse source 
STUDIO-3690

Change-Id: I44cbccf6692910f7cbf331a6cea4f05caa25c45a
This commit is contained in:
zhimin.zeng 2023-07-19 17:19:34 +08:00 • committed by Lane.Wei
parent 9d9673116d
commit f542b6321e
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/Format/bbs_3mf.cpp
View file

@ -3422,7 +3422,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
bool _BBS_3MF_Importer::_handle_start_component(const char** attributes, unsigned int num_attributes) bool _BBS_3MF_Importer::_handle_start_component(const char** attributes, unsigned int num_attributes)
{ {
std::string path = bbs_get_attribute_value_string(attributes, num_attributes, PPATH_ATTR); std::string path = xml_unescape(bbs_get_attribute_value_string(attributes, num_attributes, PPATH_ATTR));
int object_id = bbs_get_attribute_value_int(attributes, num_attributes, OBJECTID_ATTR); int object_id = bbs_get_attribute_value_int(attributes, num_attributes, OBJECTID_ATTR);
Transform3d transform = bbs_get_transform_from_3mf_specs_string(bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR)); Transform3d transform = bbs_get_transform_from_3mf_specs_string(bbs_get_attribute_value_string(attributes, num_attributes, TRANSFORM_ATTR));
@ -6295,7 +6295,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
if (ppath->empty()) if (ppath->empty())
stream << " <" << COMPONENT_TAG << " objectid=\"" << volume_id; // << "\"/>\n"; stream << " <" << COMPONENT_TAG << " objectid=\"" << volume_id; // << "\"/>\n";
else else
stream << " <" << COMPONENT_TAG << " p:path=\"" << *ppath << "\" objectid=\"" << volume_id; // << "\"/>\n"; stream << " <" << COMPONENT_TAG << " p:path=\"" << xml_escape(*ppath) << "\" objectid=\"" << volume_id; // << "\"/>\n";
const Transform3d &transf = volume->get_matrix(); const Transform3d &transf = volume->get_matrix();
stream << "\" " << TRANSFORM_ATTR << "=\""; stream << "\" " << TRANSFORM_ATTR << "=\"";
for (unsigned c = 0; c < 4; ++c) { for (unsigned c = 0; c < 4; ++c) {