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

Thumbnails: Fix for SPE-1895 : SLA crash when export .sl1 / .sl1s files

Browse Source
This commit is contained in:
YuSanka 2023-09-20 09:53:09 +02:00
parent 38a4c341d5
commit efa2547a4f
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/slic3r/GUI/BackgroundSlicingProcess.cpp
View File

@ -9,6 +9,7 @@
#include "GUI.hpp"
#include "MainFrame.hpp"
#include "format.hpp"
#include "libslic3r/GCode/Thumbnails.hpp"
#include <wx/app.h>
#include <wx/panel.h>
@ -181,10 +182,22 @@ void BackgroundSlicingProcess::process_sla()
const std::string export_path = m_sla_print->print_statistics().finalize_output_path(m_export_path);
ThumbnailsList thumbnails = this->render_thumbnails(
ThumbnailsParams{current_print()->full_print_config().option<ConfigOptionPoints>("thumbnails")->values, true, true, true, true});
auto [thumbnails_list, errors] = GCodeThumbnails::make_and_check_thumbnail_list(current_print()->full_print_config());
m_sla_print->export_print(export_path, thumbnails);
if (errors != enum_bitmask<ThumbnailError>()) {
std::string error_str = format("Invalid thumbnails value:");
error_str += GCodeThumbnails::get_error_string(errors);
throw Slic3r::ExportError(error_str);
}
Vec2ds sizes;
if (!thumbnails_list.empty()) {
sizes.reserve(thumbnails_list.size());
for (const auto& [format, size] : thumbnails_list)
sizes.emplace_back(size);
}
ThumbnailsList thumbnails = this->render_thumbnails(ThumbnailsParams{sizes, true, true, true, true });
m_sla_print->export_print(export_path, thumbnails);
m_print->set_status(100, GUI::format(_L("Masked SLA file exported to %1%"), export_path));
} else if (! m_upload_job.empty()) {
@ -735,9 +748,22 @@ void BackgroundSlicingProcess::prepare_upload()
m_upload_job.upload_data.upload_path = output_name_str;
} else {
m_upload_job.upload_data.upload_path = m_sla_print->print_statistics().finalize_output_path(m_upload_job.upload_data.upload_path.string());
ThumbnailsList thumbnails = this->render_thumbnails(
ThumbnailsParams{current_print()->full_print_config().option<ConfigOptionPoints>("thumbnails")->values, true, true, true, true});
auto [thumbnails_list, errors] = GCodeThumbnails::make_and_check_thumbnail_list(current_print()->full_print_config());
if (errors != enum_bitmask<ThumbnailError>()) {
std::string error_str = format("Invalid thumbnails value:");
error_str += GCodeThumbnails::get_error_string(errors);
throw Slic3r::ExportError(error_str);
}
Vec2ds sizes;
if (!thumbnails_list.empty()) {
sizes.reserve(thumbnails_list.size());
for (const auto& [format, size] : thumbnails_list)
sizes.emplace_back(size);
}
ThumbnailsList thumbnails = this->render_thumbnails(ThumbnailsParams{ sizes, true, true, true, true });
m_sla_print->export_print(source_path.string(),thumbnails, m_upload_job.upload_data.upload_path.filename().string());
}

2
src/slic3r/GUI/GUI.cpp
View File

@ -209,7 +209,7 @@ void change_opt_value(DynamicPrintConfig& config, const t_config_option_key& opt
}
break;
case coPoints:{
if (opt_key == "bed_shape" || opt_key == "thumbnails") {
if (opt_key == "bed_shape") {
config.option<ConfigOptionPoints>(opt_key)->values = boost::any_cast<std::vector<Vec2d>>(value);
break;
}