boonkerz/calc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Calc

Browse Source
This commit is contained in:
Thomas Peterson 2025-02-17 10:59:18 +01:00
parent a57786d835
commit 7d30d4d34c
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.phpunit.result.cache
View File

File diff suppressed because one or more lines are too long

6
src/Option/Parser/Select.php
View File

@ -112,8 +112,10 @@ class Select extends Base
foreach ($system->getAllColors() as $color) { foreach ($system->getAllColors() as $color) {
$optColor = new \PSC\Library\Calc\Option\Type\Select\ColorOpt(); $optColor = new \PSC\Library\Calc\Option\Type\Select\ColorOpt();
$optColor->setId($color->getName()); $optColor->setId($color->getName());
$optColor->setLabel(sprintf("%s %s", $system->getColorSystemPrefix(),$color->getValue("alias"))); $optColor->setLabel(sprintf("%s %s %s", $system->getColorSystemPrefix(), $color->getValue("name"), $system->getColorSystemSuffix()));
$optColor->setColor($color); $optColor->setColorHex($color->getHex());
$optColor->setColorCMYK($color->getCMYK());
$optColor->setColorRGB($color->getRGB());
$optColor->setValue((string)$color->getHEX()); $optColor->setValue((string)$color->getHEX());
$this->element->addOption($optColor); $this->element->addOption($optColor);
} }

35
src/Option/Type/Select/ColorOpt.php
View File

@ -1,13 +1,18 @@
<?php <?php
namespace PSC\Library\Calc\Option\Type\Select; namespace PSC\Library\Calc\Option\Type\Select;
use Color\Value\CMYK;
use Color\Value\HEX;
use Color\Value\RGB;
use Color\Value\ValueInterface; use Color\Value\ValueInterface;
use PSC\Library\Calc\General\Type\EdgeCollectionContainer; use PSC\Library\Calc\General\Type\EdgeCollectionContainer;
use PSC\Library\Calc\Option\Type\Base; use PSC\Library\Calc\Option\Type\Base;
class ColorOpt extends Opt class ColorOpt extends Opt
{ {
protected $color = null; protected $colorHex = null;
protected $colorCMYK = null;
protected $colorRGB = null;
private string $value = ""; private string $value = "";
public function setValue(string $value) public function setValue(string $value)
@ -20,13 +25,33 @@ class ColorOpt extends Opt
return $this->value; return $this->value;
} }
public function getColor(): ValueInterface|null public function getColorHex(): HEX|null
{ {
return $this->color; return $this->colorHex;
} }
public function setColor(ValueInterface $color): void public function setColorHex(Hex $colorHex): void
{ {
$this->color = $color; $this->colorHex = $colorHex;
}
public function getColorCMYK(): HEX|null
{
return $this->colorCMYK;
}
public function setColorCMYK(CMYK $colorCMYK): void
{
$this->colorCMYK = $colorCMYK;
}
public function getColorRGB(): HEX|null
{
return $this->colorRGB;
}
public function setColorRGB(RGB $colorRGB): void
{
$this->colorRGB = $colorRGB;
} }
} }