photowall/image-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P5-2975 - Fix rulers with inches

Browse Source
This commit is contained in:
Anders Gustafsson
2018-08-07 14:31:56 +02:00
parent 1e4a05bffa
commit e563435ae5
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/image-editor.js
Vendored
+10 -3
View File
@@ -1482,12 +1482,19 @@ function RulerHandler(viewport) {
var bounds = viewport.getBounds(); var bounds = viewport.getBounds();
var pos = util.assertBetween(ruler[axis], bounds.min[axis], bounds.max[axis]); var pos = util.assertBetween(ruler[axis], bounds.min[axis], bounds.max[axis]);
ruler.marker[axis] = ruler[axis] = pos; ruler.marker[axis] = ruler[axis] = pos;
var dim = (ruler[axis] - bounds[axis]) / (viewport.getData().ppmm * 10 * viewport.canvas.getImage().scaleX); var posWithinBounds = ruler[axis] - bounds[axis];
var viewportData = viewport.getData();
var imageData = viewport.canvas.getImage();
var pixelsPerCm = viewportData.ppmm * 10 * imageData.scaleX;
var dim = posWithinBounds / pixelsPerCm;
var units = viewportData.dim.units;
if (units === 'inch') {
dim /= 2.54;
}
if (axis === 'top') { if (axis === 'top') {
dim = viewport.getData().dim.height - dim; dim = viewportData.dim.height - dim;
} }
var units = viewport.getData().dim.units;
var value = Math.round(dim * 100) / 100; var value = Math.round(dim * 100) / 100;
if(units === 'cm') { if(units === 'cm') {
value = Math.round(value); value = Math.round(value);
src/RulerHandler.js
+10 -3
View File
@@ -15,12 +15,19 @@ function RulerHandler(viewport) {
var bounds = viewport.getBounds(); var bounds = viewport.getBounds();
var pos = util.assertBetween(ruler[axis], bounds.min[axis], bounds.max[axis]); var pos = util.assertBetween(ruler[axis], bounds.min[axis], bounds.max[axis]);
ruler.marker[axis] = ruler[axis] = pos; ruler.marker[axis] = ruler[axis] = pos;
var dim = (ruler[axis] - bounds[axis]) / (viewport.getData().ppmm * 10 * viewport.canvas.getImage().scaleX); var posWithinBounds = ruler[axis] - bounds[axis];
var viewportData = viewport.getData();
var imageData = viewport.canvas.getImage();
var pixelsPerCm = viewportData.ppmm * 10 * imageData.scaleX;
var dim = posWithinBounds / pixelsPerCm;
var units = viewportData.dim.units;
if (units === 'inch') {
dim /= 2.54;
}
if (axis === 'top') { if (axis === 'top') {
dim = viewport.getData().dim.height - dim; dim = viewportData.dim.height - dim;
} }
var units = viewport.getData().dim.units;
var value = Math.round(dim * 100) / 100; var value = Math.round(dim * 100) / 100;
if(units === 'cm') { if(units === 'cm') {
value = Math.round(value); value = Math.round(value);