Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add icon to qrcode #291

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

add icon to qrcode #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9897af
add icon to qrcode
leilizhang Feb 16, 2023
e5e03c5
fixed bug
leilizhang Feb 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ var qrcode = new QRCode(document.getElementById("qrcode"), {
height: 128,
colorDark : "#000000",
colorLight : "#ffffff",
correctLevel : QRCode.CorrectLevel.H
correctLevel : QRCode.CorrectLevel.H,
icon:{
src:"" //image base64,
width:25, // default 20px
height:25 // default 20px
}
});
</script>
```
Expand Down
11 changes: 9 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,20 @@
<script type="text/javascript" src="qrcode.js"></script>
</head>
<body>
<input id="text" type="text" value="http://jindo.dev.naver.com/collie" style="width:80%" /><br />
<input id="text" type="text" value="https://www.processon.com" style="width:80%" /><br />
<div id="qrcode" style="width:100px; height:100px; margin-top:15px;"></div>

<script type="text/javascript">
var qrcode = new QRCode(document.getElementById("qrcode"), {
width : 100,
height : 100
height : 100,
colorDark:"#63abf7",
icon:{
//image base64
src:'data:image/png;base64,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',
width:22, // default 20px
height:22 // default 20px
}
});

function makeCode () {
Expand Down
49 changes: 40 additions & 9 deletions qrcode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,32 @@ var QRCode;
this._el.appendChild(this._elImage);
this._bSupportDataURI = null;
};

/**
* Draw a Icon on QRCode
*
* @param {QRCode} oQRCode
*/
Drawing.prototype.drawIcon = function (oQRCode) {
var _htOption = this._htOption;
var _oContext = this._oContext;
var _canvasWidth = _htOption.width;
var _canvasHeight = _htOption.height;
//draw icon
if(_htOption.icon && _htOption.icon.src){
var _imageW = parseInt(_htOption.icon.width || 20);
var _imageH = parseInt(_htOption.icon.height || 20);
var image = new Image();
image.src = _htOption.icon.src;
image.onload = function(){
var _imageX = _canvasWidth / 2 - _imageW / 2;
var _imageY = _canvasHeight / 2 - _imageH / 2;
var _baseVal = 2;
_oContext.fillStyle = "#ffffff";
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
_oContext.fillStyle = "#ffffff";
_oContext.fillStyle = _htOption.colorLight;

_oContext.fillRect(_imageX - _baseVal, _imageY - _baseVal, _imageW + _baseVal * 2, _imageH + _baseVal * 2);
_oContext.drawImage(this, _imageX, _imageY, _imageW, _imageH);
};
}
};
/**
* Draw the QRCode
*
Expand All @@ -377,13 +402,13 @@ var QRCode;
var _elImage = this._elImage;
var _oContext = this._oContext;
var _htOption = this._htOption;

var _canvasWidth = _htOption.width;
var _canvasHeight = _htOption.height;
var nCount = oQRCode.getModuleCount();
var nWidth = _htOption.width / nCount;
var nHeight = _htOption.height / nCount;
var nWidth = _canvasWidth / nCount;
var nHeight = _canvasHeight / nCount;
var nRoundedWidth = Math.round(nWidth);
var nRoundedHeight = Math.round(nHeight);

_elImage.style.display = "none";
this.clear();

Expand Down Expand Up @@ -413,8 +438,6 @@ var QRCode;
);
}
}

this._bIsPainted = true;
};

/**
Expand Down Expand Up @@ -583,8 +606,16 @@ var QRCode;
this._oQRCode.addData(sText);
this._oQRCode.make();
this._el.title = sText;
this._oDrawing.draw(this._oQRCode);
this.makeImage();
var that = this;
var pro = new Promise(function(resolve, reject){
that._oDrawing.draw(that._oQRCode);
that._oDrawing.drawIcon(that._oQRCode);
resolve();
});
pro.then(function(){
that._bIsPainted = true;
that.makeImage();
})
};

/**
Expand Down