From e190fba4726109935ce93cd8b39dd2a709b4dc03 Mon Sep 17 00:00:00 2001 From: wangzemei Date: Thu, 5 Sep 2024 15:49:58 +0800 Subject: [PATCH] * [task#127424] use getCanvasSize of think3c widget. --- lib/zin/wg/think3c/js/v1.js | 38 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/lib/zin/wg/think3c/js/v1.js b/lib/zin/wg/think3c/js/v1.js index 506c4fd41b..4d9cc702f2 100644 --- a/lib/zin/wg/think3c/js/v1.js +++ b/lib/zin/wg/think3c/js/v1.js @@ -1,39 +1,21 @@ $(document).ready(function() { - const canvas = $('#canvas')[0]; - const ctx = canvas.getContext('2d'); - const image = new Image(); - const maxWidth = $('.think-model-content').width() || 500; - const maxHeight = maxWidth; + const canvas = $('#canvas')[0]; + const ctx = canvas.getContext('2d'); + const image = new Image(); + image.src = modelImg; image.onload = function() { - let width = image.width; - let height = image.height; + const size = getCanvasSize(image.width, image.height); + canvas.width = size.width; + canvas.height = size.height; + ctx.drawImage(image, 0, 0, size.width, size.height); - if(width > maxWidth || height > maxHeight) - { - if(width > height) - { - height *= maxWidth / width; - width = maxWidth; - } - else - { - width *= maxHeight / height; - height = maxHeight; - } - } - - canvas.width = width; - canvas.height = height; - ctx.drawImage(image, 0, 0, width, height); - - const imageData = ctx.getImageData(0, 0, width, height); - const pixels = binarizeImage(imageData); + const imageData = ctx.getImageData(0, 0, size.width, size.height); + const pixels = binarizeImage(imageData); ctx.putImageData(pixels, 0, 0); }; - image.src = modelImg; /* 检查图片是否已加载完成,如未完成,手动触发处理逻辑。*/ /* Check if the image has been loaded completely. If not, manually trigger the processing logic. */