P5-2895 - Fix and sanitize cropping numbers

This commit is contained in:
Anders Gustafsson
2018-06-19 14:44:01 +02:00
parent 37481d2fcd
commit 1e4a05bffa
3 changed files with 24 additions and 8 deletions
+12 -4
View File
@@ -1193,9 +1193,17 @@ function ImageDataHandler(img) {
var dragAxis = img.canvas.getViewport().getData().axis;
var leftDiff = viewportBounds.left - img.left;
var topDiff = viewportBounds.top - img.top;
// Robustness measure to handle the extreme precision of shape positioning in canvas.
var countAsZeroLimit = 1e-5;
leftDiff = Math.abs(leftDiff) < countAsZeroLimit ? 0 : leftDiff;
topDiff = Math.abs(topDiff) < countAsZeroLimit ? 0 : topDiff;
_cropData = {
x: dragAxis === 'x' ? (viewportBounds.left - img.left) / (img.width * img.scaleX) : 0,
y: dragAxis === 'y' ? (viewportBounds.top - img.top) / (img.height * img.scaleY) : 0,
x: dragAxis === 'x' ? (leftDiff) / (img.width * img.scaleX) : 0,
y: dragAxis === 'y' ? (topDiff) / (img.height * img.scaleY) : 0,
viewportWidth: viewportBounds.width,
viewportHeight: viewportBounds.height,
};
@@ -1792,8 +1800,8 @@ function Viewport(canvas) {
fill: 'transparent',
width: _data.width,
height: _data.height,
stroke: '#fff',
strokeWidth: canvas.__type === 'canvas' ? 0 : _borderWidth
stroke: canvas.__type === 'canvas' ? 'transparent' : '#fff',
strokeWidth: _borderWidth,
});
_rect.width += _borderWidth;
+10 -2
View File
@@ -21,9 +21,17 @@ function ImageDataHandler(img) {
var dragAxis = img.canvas.getViewport().getData().axis;
var leftDiff = viewportBounds.left - img.left;
var topDiff = viewportBounds.top - img.top;
// Robustness measure to handle the extreme precision of shape positioning in canvas.
var countAsZeroLimit = 1e-5;
leftDiff = Math.abs(leftDiff) < countAsZeroLimit ? 0 : leftDiff;
topDiff = Math.abs(topDiff) < countAsZeroLimit ? 0 : topDiff;
_cropData = {
x: dragAxis === 'x' ? (viewportBounds.left - img.left) / (img.width * img.scaleX) : 0,
y: dragAxis === 'y' ? (viewportBounds.top - img.top) / (img.height * img.scaleY) : 0,
x: dragAxis === 'x' ? (leftDiff) / (img.width * img.scaleX) : 0,
y: dragAxis === 'y' ? (topDiff) / (img.height * img.scaleY) : 0,
viewportWidth: viewportBounds.width,
viewportHeight: viewportBounds.height,
};
+2 -2
View File
@@ -75,8 +75,8 @@ function Viewport(canvas) {
fill: 'transparent',
width: _data.width,
height: _data.height,
stroke: '#fff',
strokeWidth: canvas.__type === 'canvas' ? 0 : _borderWidth
stroke: canvas.__type === 'canvas' ? 'transparent' : '#fff',
strokeWidth: _borderWidth,
});
_rect.width += _borderWidth;