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

ENH:rescale thumbnail_3mf cover

Browse source 
Change-Id: I1e0192a66f36898f925adc033457d6f42d3ca999
This commit is contained in:
liz.li 2022-08-22 15:51:59 +08:00 • committed by Lane.Wei
parent 9c55893954
commit 460374d6b2
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/slic3r/GUI/Auxiliary.cpp
View file

@ -378,14 +378,15 @@ void AuFile::on_set_cover()
} }
bool result = true; bool result = true;
wxImage thumbnail_img;; wxImage thumbnail_img;
result = generate_image(m_file_path.string(), thumbnail_img, _3MF_COVER_SIZE); result = generate_image(m_file_path.string(), thumbnail_img, _3MF_COVER_SIZE);
if (result) { if (result) {
auto cover_img_path = dir_path.string() + "/thumbnail_3mf.png"; auto cover_img_path = dir_path.string() + "/thumbnail_3mf.png";
thumbnail_img.SaveFile(encode_path(cover_img_path.c_str())); thumbnail_img.SaveFile(encode_path(cover_img_path.c_str()));
} }
result = generate_image(m_file_path.string(), thumbnail_img, PRINTER_THUMBNAIL_SMALL_SIZE, GERNERATE_IMAGE_CROP_VERTICAL); result = generate_image(m_file_path.string(), thumbnail_img, PRINTER_THUMBNAIL_SMALL_SIZE);
if (result) { if (result) {
auto small_img_path = dir_path.string() + "/thumbnail_small.png"; auto small_img_path = dir_path.string() + "/thumbnail_small.png";
thumbnail_img.SaveFile(encode_path(small_img_path.c_str())); thumbnail_img.SaveFile(encode_path(small_img_path.c_str()));

4
src/slic3r/GUI/GUI_Utils.cpp
View file

@ -450,7 +450,7 @@ bool generate_image(const std::string &filename, wxImage &image, wxSize img_size
if (method == GERNERATE_IMAGE_RESIZE) { if (method == GERNERATE_IMAGE_RESIZE) {
float h_factor = img.GetHeight() / (float) image.GetHeight(); float h_factor = img.GetHeight() / (float) image.GetHeight();
float w_factor = img.GetWidth() / (float) image.GetWidth(); float w_factor = img.GetWidth() / (float) image.GetWidth();
float factor = std::max(h_factor, w_factor); float factor = std::min(h_factor, w_factor);
int tar_height = (int) ((float) img.GetHeight() / factor); int tar_height = (int) ((float) img.GetHeight() / factor);
int tar_width = (int) ((float) img.GetWidth() / factor); int tar_width = (int) ((float) img.GetWidth() / factor);
img = img.Rescale(tar_width, tar_height); img = img.Rescale(tar_width, tar_height);
@ -465,7 +465,7 @@ bool generate_image(const std::string &filename, wxImage &image, wxSize img_size
return false; return false;
} }
image.ConvertAlphaToMask(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue()); //image.ConvertAlphaToMask(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue());
return true; return true;
} }