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

FIX: [STUDIO-3571] not skip auxiliary for send gcode

Browse source 
Change-Id: I2dd1e36c571261c93ac899db5bbd3ad38fc40bc9
This commit is contained in:
chunmao.guo 2023-07-05 15:09:15 +08:00 • committed by Lane.Wei
parent d48101887e
commit a4b3a5c000
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libslic3r/Format/bbs_3mf.cpp
View file

@ -7453,7 +7453,8 @@ bool _BBS_3MF_Exporter::_add_auxiliary_dir_to_archive(mz_zip_archive &archive, c
data._3mf_thumbnail = dst_in_3mf; data._3mf_thumbnail = dst_in_3mf;
} else if (m_thumbnail_small.compare(1, m_thumbnail_small.length() - 1, dst_in_3mf) == 0) { } else if (m_thumbnail_small.compare(1, m_thumbnail_small.length() - 1, dst_in_3mf) == 0) {
data._3mf_printer_thumbnail_small = dst_in_3mf; data._3mf_printer_thumbnail_small = dst_in_3mf;
} else if (m_thumbnail_middle.compare(1, m_thumbnail_small.length() - 1, dst_in_3mf) == 0) { if (m_thumbnail_middle == m_thumbnail_small) data._3mf_printer_thumbnail_middle = dst_in_3mf;
} else if (m_thumbnail_middle.compare(1, m_thumbnail_middle.length() - 1, dst_in_3mf) == 0) {
data._3mf_printer_thumbnail_middle = dst_in_3mf; data._3mf_printer_thumbnail_middle = dst_in_3mf;
} }
result &= _add_file_to_archive(archive, dst_in_3mf, src_file); result &= _add_file_to_archive(archive, dst_in_3mf, src_file);

2
src/slic3r/GUI/Plater.cpp
View file

@ -10805,7 +10805,7 @@ int Plater::send_gcode(int plate_idx, Export3mfProgressFn proFn)
return -1; return -1;
} }
SaveStrategy strategy = SaveStrategy::Silence | SaveStrategy::SkipModel | SaveStrategy::WithGcode | SaveStrategy::SkipAuxiliary; SaveStrategy strategy = SaveStrategy::Silence | SaveStrategy::SkipModel | SaveStrategy::WithGcode;
#if !BBL_RELEASE_TO_PUBLIC #if !BBL_RELEASE_TO_PUBLIC
//only save model in QA environment //only save model in QA environment
std::string sel = get_app_config()->get("iot_environment"); std::string sel = get_app_config()->get("iot_environment");

1
src/slic3r/GUI/Printer/PrinterFileSystem.cpp
View file

@ -866,6 +866,7 @@ void PrinterFileSystem::UpdateFocusThumbnail2(std::shared_ptr<std::vector<File>>
size = iter->local_path.size(); size = iter->local_path.size();
} }
wxMemoryInputStream mis(data, size); wxMemoryInputStream mis(data, size);
mimetype.Replace("jpg", "jpeg");
file.thumbnail = wxImage(mis, mimetype); file.thumbnail = wxImage(mis, mimetype);
} }
file.name = thumbnail; file.name = thumbnail;