mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-20 11:53:48 +00:00
ENH: 3mf: fix save fullpath issue
jira: no-jira Change-Id: I3077cceae2dfadc2882b4eb1de2234c5c445f342 (cherry picked from commit 5776d8e3fc4f8578b9ed397bd0afe0f9668cd634)
This commit is contained in:
@@ -5592,7 +5592,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||||||
typedef std::vector<BuildItem> BuildItemsList;
|
typedef std::vector<BuildItem> BuildItemsList;
|
||||||
typedef std::map<ModelObject const *, ObjectData> ObjectToObjectDataMap;
|
typedef std::map<ModelObject const *, ObjectData> ObjectToObjectDataMap;
|
||||||
|
|
||||||
bool m_fullpath_sources{ true };
|
bool m_fullpath_sources{ false };
|
||||||
bool m_zip64 { true };
|
bool m_zip64 { true };
|
||||||
bool m_production_ext { false }; // save with Production Extention
|
bool m_production_ext { false }; // save with Production Extention
|
||||||
bool m_skip_static{ false }; // not save mesh and other big static contents
|
bool m_skip_static{ false }; // not save mesh and other big static contents
|
||||||
@@ -7592,7 +7592,16 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result)
|
|||||||
|
|
||||||
// stores volume's source data
|
// stores volume's source data
|
||||||
{
|
{
|
||||||
std::string input_file = xml_escape(m_fullpath_sources ? volume->source.input_file : boost::filesystem::path(volume->source.input_file).filename().string());
|
#if defined(__linux__) || defined(__LINUX__) || defined(__APPLE__)
|
||||||
|
std::string translated_input = volume->source.input_file;
|
||||||
|
std::replace(translated_input.begin(), translated_input.end(), '\\', '/');
|
||||||
|
|
||||||
|
boost::filesystem::path file_path(translated_input);
|
||||||
|
#else
|
||||||
|
boost::filesystem::path file_path(volume->source.input_file);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
std::string input_file = xml_escape(m_fullpath_sources ? volume->source.input_file : file_path.filename().string());
|
||||||
//std::string prefix = std::string(" <") + METADATA_TAG + " " + KEY_ATTR + "=\"";
|
//std::string prefix = std::string(" <") + METADATA_TAG + " " + KEY_ATTR + "=\"";
|
||||||
std::string prefix = std::string(" <") + METADATA_TAG + " " + KEY_ATTR + "=\"";
|
std::string prefix = std::string(" <") + METADATA_TAG + " " + KEY_ATTR + "=\"";
|
||||||
if (! volume->source.input_file.empty()) {
|
if (! volume->source.input_file.empty()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user