amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: apply image slice scale after slice window to avoid mask issues

Browse Source 
MSE draws masks on the slice window and expects the sizes to be equivalent. This was presenting problems with the way I was trying to do internal scale as I was applying the scale upfront as the slice window loads and would need to scale the mask to match. Instead, applying the scale only when the output is generated from the slice window.
This commit is contained in:
Brendan Hagan
2022-07-09 14:51:59 -04:00
parent 9fe75933dd
commit c5d2bcf9d0
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/image_slice_window.cpp
+6 -5
View File
@@ -61,12 +61,13 @@ void ImageSlice::centerSelection() {
}
}
Image ImageSlice::getSlice() const {
if (selection.width == target_size.GetWidth() && selection.height == target_size.GetHeight() && selection.x == 0 && selection.y == 0) {
Image ImageSlice::getSlice(double scale) const {
wxSize scaled_target_size = target_size * scale;
if (selection.width == scaled_target_size.GetWidth() && selection.height == scaled_target_size.GetHeight() && selection.x == 0 && selection.y == 0) {
// exactly the right size
return source.GetSubImage(selection);
}
Image target(target_size.GetWidth(), target_size.GetHeight(), false);
Image target(scaled_target_size.GetWidth(), scaled_target_size.GetHeight(), false);
if (sharpen && sharpen_amount > 0 && sharpen_amount <= 100) {
sharp_resample_and_clip(source, target, selection, sharpen_amount);
} else {
@@ -195,8 +196,8 @@ void ImageSliceWindow::onOk(wxCommandEvent&) {
EndModal(wxID_OK);
}
Image ImageSliceWindow::getImage() const {
return slice.getSlice();
Image ImageSliceWindow::getImage(double scale) const {
return slice.getSlice(scale);
}
// ----------------------------------------------------------------------------- : ImageSliceWindow : Controls