geckon01/php-qrcode
1
0
Fork 0
mirror of https://github.com/chillerlan/php-qrcode.git synced 2026-08-18 03:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

🚿

Browse Source
This commit is contained in:
smiley
2022-07-10 17:35:37 +02:00
parent 303458a74c
commit a8819139a8
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/svgRandomColoredDots.php
+2 -2
View File
@@ -1,12 +1,12 @@
<?php <?php
/** /**
* @see https://github.com/chillerlan/php-qrcode/discussions/136
*
* @created 09.07.2022 * @created 09.07.2022
* @author Smiley <smiley@chillerlan.net> * @author Smiley <smiley@chillerlan.net>
* @copyright 2022 Smiley * @copyright 2022 Smiley
* @license MIT * @license MIT
* *
* @see https://github.com/chillerlan/php-qrcode/discussions/136
*
* @noinspection PhpIllegalPsrClassPathInspection * @noinspection PhpIllegalPsrClassPathInspection
*/ */
examples/svgRoundQuietzone.php
+15 -12
View File
@@ -1,13 +1,13 @@
<?php <?php
/** /**
* svgRoundQuietzone.php * @see https://github.com/chillerlan/php-qrcode/discussions/137
* *
* @created 09.07.2022 * @created 09.07.2022
* @author smiley <smiley@chillerlan.net> * @author smiley <smiley@chillerlan.net>
* @copyright 2022 smiley * @copyright 2022 smiley
* @license MIT * @license MIT
* *
* @see https://github.com/chillerlan/php-qrcode/discussions/137 * @noinspection PhpIllegalPsrClassPathInspection
*/ */
use chillerlan\QRCode\Common\EccLevel; use chillerlan\QRCode\Common\EccLevel;
@@ -69,6 +69,8 @@ class RoundQuietzoneSVGoutput extends QRMarkupSVG{
protected function colorQuietzone(int $quietzoneSize, float $radius):void{ protected function colorQuietzone(int $quietzoneSize, float $radius):void{
$l1 = $quietzoneSize - 1; $l1 = $quietzoneSize - 1;
$l2 = $this->moduleCount - $quietzoneSize; $l2 = $this->moduleCount - $quietzoneSize;
// substract 1/2 stroke width and module radius from the circle radius to not cut off modules
$r = $radius - $this->options->circleRadius * 2;
foreach($this->matrix->matrix() as $y => $row){ foreach($this->matrix->matrix() as $y => $row){
foreach($row as $x => $value){ foreach($row as $x => $value){
@@ -82,13 +84,15 @@ class RoundQuietzoneSVGoutput extends QRMarkupSVG{
if( if(
($x === $l1 && $y >= $l1 && $y <= $l2) ($x === $l1 && $y >= $l1 && $y <= $l2)
|| ($x === $l2 && $y >= $l1 && $y <= $l2) || ($x === $l2 && $y >= $l1 && $y <= $l2)
|| ($y === $l1 && $x > $l1 && $x < $l2) || ($y === $l1 && $x >= $l1 && $x <= $l2)
|| ($y === $l2 && $x > $l1 && $x < $l2) || ($y === $l2 && $x >= $l1 && $x <= $l2)
){ ){
continue; continue;
} }
if($this->checkIfInsideCircle($x, $y, $radius)){ // we need to add 0.5 units to the check values since we're calculating the element centers
// ($x/$y is the element's assumed top left corner)
if($this->checkIfInsideCircle($x + 0.5, $y + 0.5, $r)){
$this->matrix->set($x, $y, (bool)rand(0, 1), QRMatrix::M_QUIETZONE); $this->matrix->set($x, $y, (bool)rand(0, 1), QRMatrix::M_QUIETZONE);
} }
} }
@@ -99,11 +103,9 @@ class RoundQuietzoneSVGoutput extends QRMarkupSVG{
/** /**
* @see https://stackoverflow.com/a/7227057 * @see https://stackoverflow.com/a/7227057
*/ */
protected function checkIfInsideCircle(int $x, int $y, float $radius):bool{ protected function checkIfInsideCircle(float $x, float $y, float $radius):bool{
// we need to add 0.5 units since we're calculating the element centers ($x/$y is the element's assumed top left corner) $dx = abs($x - $this->moduleCount / 2);
$dx = abs($x + 0.5 - $this->moduleCount / 2); $dy = abs($y - $this->moduleCount / 2);
$dy = abs($y + 0.5 - $this->moduleCount / 2);
$radius -= $this->options->circleRadius * 2;
if($dx + $dy <= $radius){ if($dx + $dy <= $radius){
return true; return true;
@@ -125,10 +127,11 @@ class RoundQuietzoneSVGoutput extends QRMarkupSVG{
*/ */
protected function addCircle(float $radius):string{ protected function addCircle(float $radius):string{
return sprintf( return sprintf(
'<circle id="circle" cx="%1$s" cy="%1$s" r="%2$s" stroke-width="%3$s"/>', '%4$s<circle id="circle" cx="%1$s" cy="%1$s" r="%2$s" stroke-width="%3$s"/>',
$this->moduleCount / 2, $this->moduleCount / 2,
round($radius, 5), round($radius, 5),
2 * $this->options->circleRadius $this->options->circleRadius * 2,
$this->options->eol
); );
} }