From 2995dbc9cb9d6755dd270ee45beb08481b7f745a Mon Sep 17 00:00:00 2001 From: sovrgn <boyan.tsolov@vereign.com> Date: Thu, 30 Nov 2023 16:30:14 +0200 Subject: [PATCH] test 123a --- dist/utils/qrCodeTemplateUtils.js | 10 ++++++---- src/utils/qrCodeTemplateUtils.ts | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dist/utils/qrCodeTemplateUtils.js b/dist/utils/qrCodeTemplateUtils.js index b0fc8bd..59e88c1 100644 --- a/dist/utils/qrCodeTemplateUtils.js +++ b/dist/utils/qrCodeTemplateUtils.js @@ -188,8 +188,10 @@ const generateNodeJSQrCode = (defaultOptions, qrCodeOptions, templateOptions) => const QRCodeNodeJS = yield Promise.resolve().then(() => __importStar(require("easyqrcodejs-nodejs"))); defaultOptions["correctLevel"] = QRCodeNodeJS.CorrectLevel[qrCodeOptions.correctionLevel]; // L, M, Q, H + console.log('===00000000====', defaultOptions); const qrcode = new QRCodeNodeJS.default(defaultOptions); const dataUrl = yield qrcode.toDataURL(); + console.log('///////////qrdata url////', dataUrl); yield new Promise((resolve) => setTimeout(resolve, 10)); return yield putQrCodeOnChromakeyTemplateNodeJS(dataUrl, templateOptions.src, templateOptions.placeholderSize, templateOptions.placeholderSize); }); @@ -224,13 +226,13 @@ const putQrCodeOnChromakeyTemplateNodeJS = (qrCodeImageBase64, templateImageBase throw new Error("NodeJS cannot load qr code image"); } const templateImage = yield loadImageNode(templateImageBase64, document); - console.log('==11==11111111====', templateImage.width); + console.log("==11==11111111====", templateImage.width); if (templateImage.width < placeholderWidth || templateImage.height < placeholderHeight) { throw new Error("Placeholder is bigger than image"); } const templateCanvas = document.createElement("canvas"); - console.log('===2222TEmplateCanvas===', templateCanvas.width); + console.log("===2222TEmplateCanvas===", templateCanvas.width); templateCanvas.width = templateImage.width; templateCanvas.height = templateImage.height; const templateCtx = templateCanvas.getContext("2d"); @@ -238,7 +240,7 @@ const putQrCodeOnChromakeyTemplateNodeJS = (qrCodeImageBase64, templateImageBase const templateImgData = templateCtx.getImageData(0, 0, templateCanvas.width, templateCanvas.height); const placeholderCoordinates = findChromakeyBoundaries(templateImage.width, templateImage.height, templateImgData, placeholderWidth, placeholderHeight); // -2 is for QR to slightly cover borders. To avoid green mask bulging out - console.log('====33333333====qrCodeImage===', qrCodeImage.width); + console.log("====33333333====qrCodeImage===", qrCodeImage.width); const scaleX = ((qrCodeImage.width - 2) / placeholderWidth) * scale; const scaleY = ((qrCodeImage.height - 2) / placeholderHeight) * scale; qrCodeImage.width *= scale; @@ -246,7 +248,7 @@ const putQrCodeOnChromakeyTemplateNodeJS = (qrCodeImageBase64, templateImageBase const bannerCanvas = document.createElement("canvas"); const scaledTemplateW = Math.floor(templateImage.width * scaleX); const scaledTemplateH = Math.floor(templateImage.height * scaleY); - console.log('=====4444=====BannerCanvas==', bannerCanvas.width); + console.log("=====4444=====BannerCanvas==", bannerCanvas.width); bannerCanvas.width = scaledTemplateW; bannerCanvas.height = scaledTemplateH; const bannerCtx = bannerCanvas.getContext("2d"); diff --git a/src/utils/qrCodeTemplateUtils.ts b/src/utils/qrCodeTemplateUtils.ts index 88007ae..5735801 100644 --- a/src/utils/qrCodeTemplateUtils.ts +++ b/src/utils/qrCodeTemplateUtils.ts @@ -225,9 +225,14 @@ const generateNodeJSQrCode = async ( defaultOptions["correctLevel"] = QRCodeNodeJS.CorrectLevel[qrCodeOptions.correctionLevel]; // L, M, Q, H + console.log("===00000000====", defaultOptions); + const qrcode = new QRCodeNodeJS.default(defaultOptions); + const dataUrl = await qrcode.toDataURL(); + console.log("///////////qrdata url////", dataUrl); + await new Promise((resolve) => setTimeout(resolve, 10)); return await putQrCodeOnChromakeyTemplateNodeJS( -- GitLab