geckon01/php-qrcode
1
0
Fork 0
mirror of https://github.com/chillerlan/php-qrcode.git synced 2026-08-29 19:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

:octocat: move mask pattern parameter

Browse Source
This commit is contained in:
smiley
2023-04-04 20:21:04 +02:00
parent 9bc23a2161
commit 50179a97ef
6 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Data/QRData.php
+3 -2
View File
@@ -123,10 +123,11 @@ final class QRData{
* returns a fresh matrix object with the data written and masked with the given $maskPattern
*/
public function writeMatrix(MaskPattern $maskPattern):QRMatrix{
return (new QRMatrix($this->version, $this->eccLevel, $maskPattern))
return (new QRMatrix($this->version, $this->eccLevel))
->initFunctionalPatterns()
->writeCodewords($this->bitBuffer)
->mask()
->setFormatInfo($maskPattern)
->mask($maskPattern)
;
}
src/Data/QRMatrix.php
+20 -12
View File
@@ -83,19 +83,23 @@ class QRMatrix{
];
/**
* the used mask pattern, set via QRMatrix::mask()
* the matrix version - always set in QRMatrix, may be null in BitMatrix
*/
protected ?MaskPattern $maskPattern = null;
protected ?Version $version = null;
/**
* the current ECC level
* the current ECC level - always set in QRMatrix, may be null in BitMatrix
*/
protected ?EccLevel $eccLevel = null;
/**
* a Version instance
* the mask pattern that was used in the most recent operation, set via:
*
* - QRMatrix::setFormatInfo()
* - QRMatrix::mask()
* - BitMatrix::readFormatInformation()
*/
protected ?Version $version = null;
protected ?MaskPattern $maskPattern = null;
/**
* the size (side length) of the matrix, including quiet zone (if created)
@@ -112,10 +116,9 @@ class QRMatrix{
/**
* QRMatrix constructor.
*/
public function __construct(Version $version, EccLevel $eccLevel, MaskPattern $maskPattern){
public function __construct(Version $version, EccLevel $eccLevel){
$this->version = $version;
$this->eccLevel = $eccLevel;
$this->maskPattern = $maskPattern;
$this->moduleCount = $this->version->getDimension();
$this->matrix = $this->createMatrix($this->moduleCount, $this::M_NULL);
}
@@ -502,12 +505,16 @@ class QRMatrix{
}
/**
* Draws the format info along the finder patterns
* Draws the format info along the finder patterns. If no $maskPattern, all format info modules will be set to false.
*
* ISO/IEC 18004:2000 Section 8.9
*/
public function setFormatInfo():self{
$bits = $this->eccLevel->getformatPattern($this->maskPattern);
public function setFormatInfo(MaskPattern $maskPattern = null):self{
$this->maskPattern = $maskPattern;
$bits = ($this->maskPattern instanceof MaskPattern)
? $this->eccLevel->getformatPattern($this->maskPattern)
: 0; // sets all format fields to false (test mode)
for($i = 0; $i < 15; $i++){
$v = (($bits >> $i) & 1) === 1;
@@ -703,8 +710,9 @@ class QRMatrix{
*
* ISO/IEC 18004:2000 Section 8.8.1
*/
public function mask():self{
$mask = $this->maskPattern->getMask();
public function mask(MaskPattern $maskPattern):self{
$this->maskPattern = $maskPattern;
$mask = $this->maskPattern->getMask();
foreach($this->matrix as $y => $row){
foreach($row as $x => $val){