Cloned2Preserve
/
qrbtf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rand rect display bug

This commit is contained in:
CPunisher 2020-05-05 10:33:20 +08:00
parent 608fc248b5
commit 6aaff4cb85
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/components/QrRendererRandRect.js
View File

@ -23,13 +23,17 @@ function listPoint(props) {
for (let i = 0; i < randArr.length; i++) {
let row = randArr[i][0];
let col = randArr[i][1];
if (qrcode.isDark(row, col)) {
let tempRand = rand(0.8, 1.3);
let tempRGB = randRGB();
let width = 0.15;
pointList.push(<rect key={id++} opacity="0.9" fill={tempRGB[1]} width={1 * tempRand + width} height={1 * tempRand + width} x={row - (tempRand - 1)/2} y={col - (tempRand - 1)/2}/>);
pointList.push(<rect key={id++} fill={tempRGB[0]} width={1 * tempRand} height={1 * tempRand} x={row - (tempRand - 1)/2} y={col - (tempRand - 1)/2}/>);
}
if (qrcode.isDark(row, col)) {
let tempRand = rand(0.8, 1.3);
let randNum = rand(50,230);
let tempRGB = [
'rgb(' + Math.floor(20 + randNum) + ',' + Math.floor(170 - randNum / 2) + ',' + Math.floor(60 + randNum * 2) + ')',
'rgb(' + Math.floor(-20 + randNum) + ',' + Math.floor(130 - randNum / 2) + ',' + Math.floor(20 + randNum * 2) + ')'
];
let width = 0.15;
pointList.push(<rect key={id++} opacity="0.9" fill={tempRGB[1]} width={1 * tempRand + width} height={1 * tempRand + width} x={row - (tempRand - 1)/2} y={col - (tempRand - 1)/2}/>);
pointList.push(<rect key={id++} fill={tempRGB[0]} width={1 * tempRand} height={1 * tempRand} x={row - (tempRand - 1)/2} y={col - (tempRand - 1)/2}/>);
}
}
return pointList;
}

12
src/utils/util.js
View File

@ -9,16 +9,8 @@ export function rand(min, max) {
return min + (seed / 233280.0) * (max - min);
}
export function randRGB() {
let randNum = rand(50,230);
let rgb = [];
rgb.push(
'rgb(' + String(20 + randNum) + ',' + String(170 - randNum / 2) + ',' + String(60 + randNum * 2) + ')'
)
rgb.push(
'rgb(' + String(-20 + randNum) + ',' + String(130 - randNum / 2) + ',' + String(20 + randNum * 2) + ')'
)
return rgb;
export function randRGB(minR, maxR, minG, maxG, minB, maxB) {
return 'rgb(' + parseInt(minR, maxR) + ',' + parseInt(minG, maxG) + ',' + parseInt(minB, maxB) + ')';
}
export function isWeiXin(){