Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-12 14:58:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better dimension handling

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-12-05 22:48:14 +01:00
parent cae11dd4f6
commit 3164e78032
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
Utils/Barcode/C128Abstract.php
View File

@ -70,14 +70,6 @@ abstract class C128Abstract
*/ */
protected $orientation = 0; protected $orientation = 0;
/**
* Barcode height.
*
* @var int
* @since 1.0.0
*/
protected $size = 0;
/** /**
* Barcode dimension. * Barcode dimension.
* *
@ -140,28 +132,34 @@ abstract class C128Abstract
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn * @author Dennis Eichhorn
*/ */
public function __construct(string $content = '', int $size = 20, int $orientation = OrientationType::HORIZONTAL) public function __construct(string $content = '', int $width = 20, int $height = 20, int $orientation = OrientationType::HORIZONTAL)
{ {
$this->content = $content; $this->content = $content;
$this->setSize($size); $this->setDimension($width, $height);
$this->setOrientation($orientation); $this->setOrientation($orientation);
} }
/** /**
* Set barcode height * Set barcode dimensions
* *
* @param int $size Barcode height * @param int $width Barcode width
* @param int $height Barcode height
* *
* @since 1.0.0 * @since 1.0.0
* @author Dennis Eichhorn * @author Dennis Eichhorn
*/ */
public function setSize(int $size) /* : void */ public function setDimension(int $width, int $height) /* : void */
{ {
if ($size < 0) { if ($width < 0) {
throw new \OutOfBoundsException($size); throw new \OutOfBoundsException($width);
} }
$this->size = $size; if ($height < 0) {
throw new \OutOfBoundsException($height);
}
$this->dimension['width'] = $width;
$this->dimension['height'] = $height;
} }
/** /**
@ -268,11 +266,11 @@ abstract class C128Abstract
} }
if ($this->orientation === OrientationType::HORIZONTAL) { if ($this->orientation === OrientationType::HORIZONTAL) {
$imgWidth = $codeLength; $imgWidth = max($codeLength, $this->dimension['width']);
$imgHeight = $this->size; $imgHeight = $this->dimension['height'];
} else { } else {
$imgWidth = $this->size; $imgWidth = $this->dimension['width'];
$imgHeight = $codeLength; $imgHeight = max($codeLength, $this->dimension['height']);
} }
$image = imagecreate($imgWidth, $imgHeight); $image = imagecreate($imgWidth, $imgHeight);