From 1ebd16dc17ab2f9b8f3be585bb0226d3a6d74772 Mon Sep 17 00:00:00 2001 From: "chunmao.guo" Date: Tue, 24 Oct 2023 10:50:24 +0800 Subject: [PATCH] FIX: [STUDIO-4578] use middle thumbnail in 3mf Jira: STUDIO-4578 Change-Id: I2276477da0167218f8ea0ca39d820db38f1af22c --- src/libslic3r/Format/bbs_3mf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libslic3r/Format/bbs_3mf.cpp b/src/libslic3r/Format/bbs_3mf.cpp index 304d31ff5..083145e48 100644 --- a/src/libslic3r/Format/bbs_3mf.cpp +++ b/src/libslic3r/Format/bbs_3mf.cpp @@ -1282,9 +1282,9 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result) // BBS: load relationships if (!_extract_xml_from_archive(archive, RELATIONSHIPS_FILE, _handle_start_relationships_element, _handle_end_relationships_element)) return false; - if (m_thumbnail_small.empty()) m_thumbnail_small = m_thumbnail_path; - if (!m_thumbnail_small.empty()) { - return _extract_from_archive(archive, m_thumbnail_small, [&data](auto &archive, auto const &stat) -> bool { + if (m_thumbnail_middle.empty()) m_thumbnail_middle = m_thumbnail_path; + if (!m_thumbnail_middle.empty()) { + return _extract_from_archive(archive, m_thumbnail_middle, [&data](auto &archive, auto const &stat) -> bool { data.resize(stat.m_uncomp_size); return mz_zip_reader_extract_to_mem(&archive, stat.m_file_index, data.data(), data.size(), 0); }); @@ -1368,7 +1368,7 @@ void PlateData::parse_filament_info(GCodeProcessorResult *result) m_thumbnail_small.erase(m_thumbnail_small.begin()); if (!m_thumbnail_middle.empty() && m_thumbnail_middle.front() == '/') m_thumbnail_middle.erase(m_thumbnail_middle.begin()); - m_model->model_info->metadata_items.emplace("Thumbnail", m_thumbnail_small); + m_model->model_info->metadata_items.emplace("Thumbnail", m_thumbnail_middle); m_model->model_info->metadata_items.emplace("Poster", m_thumbnail_middle); // we then loop again the entries to read other files stored in the archive