Skip to content
Snippets Groups Projects
Commit d94eba45 authored by Steinwender, Tamara's avatar Steinwender, Tamara
Browse files

Fix drawing lines in QR code scanner

parent 8f7f3272
No related branches found
No related tags found
No related merge requests found
Pipeline #13599 passed
...@@ -267,7 +267,6 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) { ...@@ -267,7 +267,6 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
canvasElement.width = video.videoWidth; canvasElement.width = video.videoWidth;
canvas.drawImage(video, 0, 0, canvasElement.width, canvasElement.height); canvas.drawImage(video, 0, 0, canvasElement.width, canvasElement.height);
let maskWidth = 0; let maskWidth = 0;
let maskHeight = 0; let maskHeight = 0;
let maskStartX = canvasElement.width; let maskStartX = canvasElement.width;
...@@ -289,7 +288,7 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) { ...@@ -289,7 +288,7 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
canvas.moveTo(0,0); canvas.moveTo(0,0);
canvas.lineTo(0, canvasElement.width); canvas.lineTo(0, canvasElement.width);
canvas.lineTo( canvasElement.width, canvasElement.height); canvas.lineTo( canvasElement.width, canvasElement.height);
canvas.lineTo( canvasElement.width,0); canvas.lineTo( canvasElement.height,0);
canvas.rect(maskStartX, maskStartY, maskWidth, maskHeight); canvas.rect(maskStartX, maskStartY, maskWidth, maskHeight);
canvas.fill(); canvas.fill();
...@@ -327,20 +326,26 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) { ...@@ -327,20 +326,26 @@ export class QrCodeScanner extends ScopedElementsMixin(DBPLitElement) {
} }
if (code) { if (code) {
let topLeftCorner = code.location.topLeftCorner; let topLeftCorner = {x: 0, y: 0};
let topRightCorner = code.location.topRightCorner; let topRightCorner = {x: 0, y: 0};
let bottomRightCorner = code.location.bottomRightCorner; let bottomRightCorner = {x: 0, y: 0};
let bottomLeftCorner = code.location.bottomLeftCorner; let bottomLeftCorner = {x: 0, y: 0};
if (that.clipMask) { if (that.clipMask) {
topLeftCorner.x += maskStartX; topLeftCorner.x = code.location.topLeftCorner.x + maskStartX;
topLeftCorner.y += maskStartY; topLeftCorner.y = code.location.topLeftCorner.y + maskStartY;
topRightCorner.x += maskStartX; topRightCorner.x = code.location.topRightCorner.x + maskStartX;
topRightCorner.y += maskStartY; topRightCorner.y = code.location.topRightCorner.y + maskStartY;
bottomRightCorner.x += maskStartX; bottomRightCorner.x = code.location.bottomRightCorner.x + maskStartX;
bottomRightCorner.y += maskStartY; bottomRightCorner.y = code.location.bottomRightCorner.y + maskStartY;
bottomLeftCorner.x += maskStartX; bottomLeftCorner.x = code.location.bottomLeftCorner.x + maskStartX;
bottomLeftCorner.y += maskStartY; bottomLeftCorner.y = code.location.bottomLeftCorner.y + maskStartY;
}
else {
topLeftCorner = code.location.topLeftCorner;
topRightCorner = code.location.topRightCorner;
bottomRightCorner = code.location.bottomRightCorner;
bottomLeftCorner = code.location.bottomLeftCorner;
} }
drawLine(topLeftCorner, topRightCorner, color); drawLine(topLeftCorner, topRightCorner, color);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment