fix frame size (#10)

This commit is contained in:
Anders Gustafsson
2022-03-02 14:37:06 +01:00
committed by GitHub
parent b88b4c7993
commit ec81c5dd3a
3 changed files with 6 additions and 8 deletions
+3 -4
View File
@@ -964,6 +964,7 @@ var config = require('./config');
function FrameHandler(viewport) { function FrameHandler(viewport) {
var _frames; var _frames;
var _frameType = viewport.canvas.__canvasFrameType; var _frameType = viewport.canvas.__canvasFrameType;
var _realFrameSizeCm = viewport.canvas.__canvasFrameSize;
var _frameSize; var _frameSize;
function getFramesAsArray() { function getFramesAsArray() {
@@ -1047,10 +1048,8 @@ function FrameHandler(viewport) {
}); });
var vpData = viewport.getData(); var vpData = viewport.getData();
var realFrameSize = 20; // Actual real life frame size width in mm.
_frameSize = vpData.ppmm * _realFrameSizeCm * 10 * viewport.canvas.getImage().scaleX;
_frameSize = vpData.ppmm * realFrameSize * viewport.canvas.getImage().scaleX;
_frames.top.height = _frames.top.height =
_frames.bottom.height = _frames.bottom.height =
@@ -1281,7 +1280,7 @@ function ImageEditor(canvasId, args) {
type: 'wallpaper', type: 'wallpaper',
// canvasFrameType defaults to image on frame // canvasFrameType defaults to image on frame
canvasFrameType: 'image', canvasFrameType: 'image',
canvasFrameSize: 2.9, canvasFrameSize: 2, //cm
// Default texts on the buttons // Default texts on the buttons
texts: { texts: {
showThreeD: '3d', showThreeD: '3d',
+2 -3
View File
@@ -6,6 +6,7 @@ var config = require('./config');
function FrameHandler(viewport) { function FrameHandler(viewport) {
var _frames; var _frames;
var _frameType = viewport.canvas.__canvasFrameType; var _frameType = viewport.canvas.__canvasFrameType;
var _realFrameSizeCm = viewport.canvas.__canvasFrameSize;
var _frameSize; var _frameSize;
function getFramesAsArray() { function getFramesAsArray() {
@@ -89,10 +90,8 @@ function FrameHandler(viewport) {
}); });
var vpData = viewport.getData(); var vpData = viewport.getData();
var realFrameSize = 20; // Actual real life frame size width in mm.
_frameSize = vpData.ppmm * _realFrameSizeCm * 10 * viewport.canvas.getImage().scaleX;
_frameSize = vpData.ppmm * realFrameSize * viewport.canvas.getImage().scaleX;
_frames.top.height = _frames.top.height =
_frames.bottom.height = _frames.bottom.height =
+1 -1
View File
@@ -12,7 +12,7 @@ function ImageEditor(canvasId, args) {
type: 'wallpaper', type: 'wallpaper',
// canvasFrameType defaults to image on frame // canvasFrameType defaults to image on frame
canvasFrameType: 'image', canvasFrameType: 'image',
canvasFrameSize: 2.9, canvasFrameSize: 2, //cm
// Default texts on the buttons // Default texts on the buttons
texts: { texts: {
showThreeD: '3d', showThreeD: '3d',