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

GCodeProcessor::process_binary_file() modified to process File Metadata Block set as optional

Browse Source
This commit is contained in:
enricoturri1966 2023-09-08 09:10:40 +02:00
parent 3b57a124bd
commit bc3a8b037a
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/libslic3r/GCode/GCodeProcessor.cpp
View File

@ -1161,29 +1161,35 @@ void GCodeProcessor::process_binary_file(const std::string& filename, std::funct
throw Slic3r::RuntimeError(format("File %1% does not contain a valid binary gcode\nError: %2%", filename, throw Slic3r::RuntimeError(format("File %1% does not contain a valid binary gcode\nError: %2%", filename,
std::string(translate_result(res)))); std::string(translate_result(res))));
// read file metadata block // read file metadata block, if present
BlockHeader block_header; BlockHeader block_header;
std::vector<uint8_t> cs_buffer(65536); std::vector<uint8_t> cs_buffer(65536);
res = read_next_block_header(*file.f, file_header, block_header, cs_buffer.data(), cs_buffer.size()); res = read_next_block_header(*file.f, file_header, block_header, cs_buffer.data(), cs_buffer.size());
if (res != EResult::Success) if (res != EResult::Success)
throw Slic3r::RuntimeError(format("Error reading file %1%: %2%", filename, std::string(translate_result(res)))); throw Slic3r::RuntimeError(format("Error reading file %1%: %2%", filename, std::string(translate_result(res))));
if ((EBlockType)block_header.type != EBlockType::FileMetadata) if ((EBlockType)block_header.type != EBlockType::FileMetadata &&
(EBlockType)block_header.type != EBlockType::PrinterMetadata)
throw Slic3r::RuntimeError(format("Unable to find file metadata block in file %1%", filename)); throw Slic3r::RuntimeError(format("Unable to find file metadata block in file %1%", filename));
FileMetadataBlock file_metadata_block; if ((EBlockType)block_header.type == EBlockType::FileMetadata) {
res = file_metadata_block.read_data(*file.f, file_header, block_header); FileMetadataBlock file_metadata_block;
if (res != EResult::Success) res = file_metadata_block.read_data(*file.f, file_header, block_header);
throw Slic3r::RuntimeError(format("Error reading file %1%: %2%", filename, std::string(translate_result(res)))); if (res != EResult::Success)
auto producer_it = std::find_if(file_metadata_block.raw_data.begin(), file_metadata_block.raw_data.end(), throw Slic3r::RuntimeError(format("Error reading file %1%: %2%", filename, std::string(translate_result(res))));
[](const std::pair<std::string, std::string>& item) { return item.first == "Producer"; }); auto producer_it = std::find_if(file_metadata_block.raw_data.begin(), file_metadata_block.raw_data.end(),
if (producer_it != file_metadata_block.raw_data.end() && boost::starts_with(producer_it->second, std::string(SLIC3R_APP_NAME))) [](const std::pair<std::string, std::string>& item) { return item.first == "Producer"; });
m_producer = EProducer::PrusaSlicer; if (producer_it != file_metadata_block.raw_data.end() && boost::starts_with(producer_it->second, std::string(SLIC3R_APP_NAME)))
else m_producer = EProducer::PrusaSlicer;
else
m_producer = EProducer::Unknown;
res = read_next_block_header(*file.f, file_header, block_header, cs_buffer.data(), cs_buffer.size());
if (res != EResult::Success)
throw Slic3r::RuntimeError(format("Error reading file %1%: %2%", filename, std::string(translate_result(res))));
}
else {
m_producer = EProducer::Unknown; m_producer = EProducer::Unknown;
}
// read printer metadata block // read printer metadata block
res = read_next_block_header(*file.f, file_header, block_header, cs_buffer.data(), cs_buffer.size());
if (res != EResult::Success)
throw Slic3r::RuntimeError(format("Error reading file %1%: %2%", filename, std::string(translate_result(res))));
if ((EBlockType)block_header.type != EBlockType::PrinterMetadata) if ((EBlockType)block_header.type != EBlockType::PrinterMetadata)
throw Slic3r::RuntimeError(format("Unable to find printer metadata block in file %1%", filename)); throw Slic3r::RuntimeError(format("Unable to find printer metadata block in file %1%", filename));
PrinterMetadataBlock printer_metadata_block; PrinterMetadataBlock printer_metadata_block;
@ -3701,7 +3707,7 @@ void GCodeProcessor::post_process()
const bgcode::core::EResult res = m_binarizer.initialize(*out.f, s_binarizer_config); const bgcode::core::EResult res = m_binarizer.initialize(*out.f, s_binarizer_config);
if (res != bgcode::core::EResult::Success) if (res != bgcode::core::EResult::Success)
throw Slic3r::RuntimeError(std::string("Unable to initialize the gcode binarizer.")); throw Slic3r::RuntimeError(format("Unable to initialize the gcode binarizer.\nError: %1%", bgcode::core::translate_result(res)));
} }
auto time_in_minutes = [](float time_in_seconds) { auto time_in_minutes = [](float time_in_seconds) {