GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 14:15:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix prusa-compliant settings for 3mf export when an object-modifier setting is set

Browse Source
This commit is contained in:
supermerill 2021-08-06 17:57:33 +02:00
parent c019e648c7
commit 60a38c394c
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/libslic3r/Format/3mf.cpp
View File

@ -2806,8 +2806,18 @@ namespace Slic3r {
} }
// stores object's config data // stores object's config data
for (const std::string& key : obj->config.keys()) { if (file_path == MODEL_PRUSA_CONFIG_FILE) {
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << OBJECT_TYPE << "\" " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << obj->config.opt_serialize(key) << "\"/>\n"; for (std::string key : obj->config.keys()) {
// convert to prusa config
std::string value = obj->config.opt_serialize(key);
obj->config.to_prusa(key, value);
if (!key.empty())
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << OBJECT_TYPE << "\" " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << value << "\"/>\n";
}
} else {
for (const std::string& key : obj->config.keys()) {
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << OBJECT_TYPE << "\" " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << obj->config.opt_serialize(key) << "\"/>\n";
}
} }
for (const ModelVolume* volume : obj_metadata.second.object->volumes) for (const ModelVolume* volume : obj_metadata.second.object->volumes)
@ -2868,18 +2878,17 @@ namespace Slic3r {
} }
// stores volume's config data // stores volume's config data
for (std::string key : volume->config.keys()) if (file_path == MODEL_PRUSA_CONFIG_FILE) {
{ for (std::string key : volume->config.keys()) {
// config
if (file_path == MODEL_PRUSA_CONFIG_FILE) {
// convert to prusa config // convert to prusa config
std::string value = volume->config.opt_serialize(key); std::string value = volume->config.opt_serialize(key);
volume->config.to_prusa(key, value); volume->config.to_prusa(key, value);
if (!key.empty()) if (!key.empty())
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << value << "\"/>\n"; stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << value << "\"/>\n";
} else {
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << volume->config.opt_serialize(key) << "\"/>\n";
} }
} else {
for (const std::string& key : volume->config.keys())
stream << " <" << METADATA_TAG << " " << TYPE_ATTR << "=\"" << VOLUME_TYPE << "\" " << KEY_ATTR << "=\"" << key << "\" " << VALUE_ATTR << "=\"" << volume->config.opt_serialize(key) << "\"/>\n";
} }
stream << " </" << VOLUME_TAG << ">\n"; stream << " </" << VOLUME_TAG << ">\n";