JoeKung/Progetto-m152-Angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed qr displaing wrong url

Browse Source
This commit is contained in:
tito
2023-04-26 19:42:39 +02:00
parent fcd9b91fff
commit 4764de7e86
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/detail/detail.component.ts
View File

@@ -76,7 +76,7 @@ export class DetailComponent implements OnInit {
} }
} }
addSvgToImage(imageUrl: string, svgString: string): Promise<string> { addSvgToImage(imageUrl: string, svgString: string): Promise<string> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const image = new Image(); const image = new Image();
image.src = imageUrl; image.src = imageUrl;
@@ -97,7 +97,9 @@ export class DetailComponent implements OnInit {
svgImage.onload = () => { svgImage.onload = () => {
if (ctx && svgImage) { if (ctx && svgImage) {
ctx.drawImage(svgImage, image.width - svgImage.width, image.height - svgImage.height); const x = image.width - (svgImage.width * 0.5 + 5);
const y = image.height - (svgImage.height * 0.5 + 5);
ctx.drawImage(svgImage, x, y, svgImage.width * 0.5, svgImage.height * 0.5);
const outputImageUrl = canvas.toDataURL('image/png'); const outputImageUrl = canvas.toDataURL('image/png');
resolve(outputImageUrl); resolve(outputImageUrl);
} else { } else {
@@ -121,9 +123,12 @@ export class DetailComponent implements OnInit {
async generateQR() { async generateQR() {
console.log("generating QR code"); console.log("generating QR code");
let url = `http://localhost:4200/location/${this.URLParams.location}/${this.URLParams.id}`; console.log(this.URLParams.value);
let url = `http://localhost:4200/location/${this.URLParams.value.location}/${this.URLParams.value.id}`;
let qrCode = await this.generateQRCode(url); let qrCode = await this.generateQRCode(url);