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

klipper object exclusion name fix

Browse source
This commit is contained in:
SoftFever 2023-09-08 00:01:12 +08:00
parent 75328a2de8
commit 5cef22ee66
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/libslic3r/GCode.cpp
View file

@ -28,6 +28,7 @@
#include <utility> #include <utility>
#include <string_view> #include <string_view>
#include <regex>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/find.hpp> #include <boost/algorithm/string/find.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
@ -2957,12 +2958,25 @@ namespace Skirt {
} // namespace Skirt } // namespace Skirt
inline std::string get_instance_name(const PrintObject *object, size_t inst_id) { // Orca: Klipper can't parse object names with spaces and other spetical characters
auto obj_name = object->model_object()->name; std::string sanitize_instance_name(const std::string& name) {
// replace space in obj_name with '-' // Replace sequences of non-word characters with an underscore
std::replace(obj_name.begin(), obj_name.end(), ' ', '_'); std::string result = std::regex_replace(name, std::regex("[ !@#$%^&*()=+\\[\\]{};:\",']+"), "_");
// Remove leading and trailing underscores
if (!result.empty() && result.front() == '_') {
result.erase(result.begin());
}
if (!result.empty() && result.back() == '_') {
result.erase(result.end() - 1);
}
return (boost::format("%1%_id_%2%_copy_%3%") % obj_name % object->get_id() % inst_id).str(); return result;
}
inline std::string get_instance_name(const PrintObject *object, size_t inst_id) {
auto obj_name = sanitize_instance_name(object->model_object()->name);
auto name = (boost::format("%1%_id_%2%_copy_%3%") % obj_name % object->get_id() % inst_id).str();
return sanitize_instance_name(name);
} }
inline std::string get_instance_name(const PrintObject *object, const PrintInstance &inst) { inline std::string get_instance_name(const PrintObject *object, const PrintInstance &inst) {