Skip to content

[Optimization] Generate only required pieces #8

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Optimization] Generate only required pieces #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 22 additions & 22 deletions lib/QRCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,34 +80,34 @@ export default class QRCode extends Component {
var logoY = ((this.props.size/2)-(this.props.logoSize/2));
var logoSize = this.props.logoSize;

var pieces = [];
var nonPieces = [];

//Add the SVG element of each piece in the body of the QR Code
for (var y = 0; y < length; y++) {
for (var x = 0; x < length; x++) {
var module = modules[x][y];
var px = (x * xsize + this.props.padding * xsize);
var py = (y * ysize + this.props.padding * ysize);
var makePieces = (params) => {
var invert = Boolean(params && params.invert);
var result = [];

//TODO: Add function to compute if pieces overlap with circular logos (more complex. Must see if tl or br is inside the radius from the centre of the circle (pythagoras theorem?))
var overlapsWithLogo = (
for (var y = 0; y < length; y++) {
for (var x = 0; x < length; x++) {
var module = Boolean(modules[x][y]);
var px = (x * xsize + this.props.padding * xsize);
var py = (y * ysize + this.props.padding * ysize);

px>logoX && px<(logoX+logoSize) && py>logoY && py<(logoY+logoSize) ||//Piece's top left is inside the logo area
(px+xsize)>logoX && (px+xsize)<(logoX+logoSize) && (py+ysize)>logoY && (py+ysize)<(logoY+logoSize)//Piece's bottom right is inside the logo area
//TODO: Add function to compute if pieces overlap with circular logos (more complex. Must see if tl or br is inside the radius from the centre of the circle (pythagoras theorem?))
var overlapsWithLogo = (

);
px>logoX && px<(logoX+logoSize) && py>logoY && py<(logoY+logoSize) ||//Piece's top left is inside the logo area
(px+xsize)>logoX && (px+xsize)<(logoX+logoSize) && (py+ysize)>logoY && (py+ysize)<(logoY+logoSize)//Piece's bottom right is inside the logo area

if(!this.props.logo || (this.props.logo && !overlapsWithLogo)){
);

if (module) {
pieces.push(this.getPiece(x,y,modules));
}
else{
nonPieces.push(this.getPiece(x,y,modules));
if(!this.props.logo || (this.props.logo && !overlapsWithLogo)){

if (module !== invert) {
result.push(this.getPiece(x,y,modules));
}
}
}
}
return result;
}

if(this.props.backgroundImage){
Expand All @@ -118,7 +118,7 @@ export default class QRCode extends Component {
<Svg style={{backgroundColor:'transparent',height:this.props.size,width:this.props.size}}>
<Defs>
<ClipPath id="clip">
{nonPieces}
{makePieces({invert: true})}
</ClipPath>
</Defs>
<Rect clipPath="url(#clip)" fill='white' x={0} y={0} height='100%' width='100%'/>
Expand All @@ -132,7 +132,7 @@ export default class QRCode extends Component {
<Svg style={{backgroundColor:this.props.backgroundColor,height:this.props.size,width:this.props.size}}>
<Defs>
<ClipPath id="clip">
{pieces}
{makePieces()}
</ClipPath>
<LinearGradient id="grad" x1={this.props.gradientDirection[0]} y1={this.props.gradientDirection[1]} x2={this.props.gradientDirection[2]} y2={this.props.gradientDirection[3]}>
<Stop offset="0" stopColor={this.props.linearGradient[0]} stopOpacity="1" />
Expand All @@ -151,7 +151,7 @@ export default class QRCode extends Component {
<Svg style={{backgroundColor:this.props.backgroundColor,height:this.props.size,width:this.props.size}}>
<Defs>
<ClipPath id="clip">
{pieces}
{makePieces()}
</ClipPath>
</Defs>
<Rect clipPath="url(#clip)" fill='white' x={0} y={0} height='100%' width='100%' fill={this.props.color}/>
Expand Down