From ec81c5dd3a36eda161860874e1540fdfee93e08d Mon Sep 17 00:00:00 2001 From: Anders Gustafsson <34234789+anders-photowall@users.noreply.github.com> Date: Wed, 2 Mar 2022 14:37:06 +0100 Subject: [PATCH] fix frame size (#10) --- dist/image-editor.js | 7 +++---- src/FrameHandler.js | 5 ++--- src/ImageEditor.js | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dist/image-editor.js b/dist/image-editor.js index 65778f0..a5f460d 100644 --- a/dist/image-editor.js +++ b/dist/image-editor.js @@ -964,6 +964,7 @@ var config = require('./config'); function FrameHandler(viewport) { var _frames; var _frameType = viewport.canvas.__canvasFrameType; + var _realFrameSizeCm = viewport.canvas.__canvasFrameSize; var _frameSize; function getFramesAsArray() { @@ -1047,10 +1048,8 @@ function FrameHandler(viewport) { }); var vpData = viewport.getData(); - var realFrameSize = 20; // Actual real life frame size width in mm. - - _frameSize = vpData.ppmm * realFrameSize * viewport.canvas.getImage().scaleX; + _frameSize = vpData.ppmm * _realFrameSizeCm * 10 * viewport.canvas.getImage().scaleX; _frames.top.height = _frames.bottom.height = @@ -1281,7 +1280,7 @@ function ImageEditor(canvasId, args) { type: 'wallpaper', // canvasFrameType defaults to image on frame canvasFrameType: 'image', - canvasFrameSize: 2.9, + canvasFrameSize: 2, //cm // Default texts on the buttons texts: { showThreeD: '3d', diff --git a/src/FrameHandler.js b/src/FrameHandler.js index 8fcf461..331ccbe 100644 --- a/src/FrameHandler.js +++ b/src/FrameHandler.js @@ -6,6 +6,7 @@ var config = require('./config'); function FrameHandler(viewport) { var _frames; var _frameType = viewport.canvas.__canvasFrameType; + var _realFrameSizeCm = viewport.canvas.__canvasFrameSize; var _frameSize; function getFramesAsArray() { @@ -89,10 +90,8 @@ function FrameHandler(viewport) { }); var vpData = viewport.getData(); - var realFrameSize = 20; // Actual real life frame size width in mm. - - _frameSize = vpData.ppmm * realFrameSize * viewport.canvas.getImage().scaleX; + _frameSize = vpData.ppmm * _realFrameSizeCm * 10 * viewport.canvas.getImage().scaleX; _frames.top.height = _frames.bottom.height = diff --git a/src/ImageEditor.js b/src/ImageEditor.js index 3a4a058..41b8b3a 100644 --- a/src/ImageEditor.js +++ b/src/ImageEditor.js @@ -12,7 +12,7 @@ function ImageEditor(canvasId, args) { type: 'wallpaper', // canvasFrameType defaults to image on frame canvasFrameType: 'image', - canvasFrameSize: 2.9, + canvasFrameSize: 2, //cm // Default texts on the buttons texts: { showThreeD: '3d',