Fix Calc
This commit is contained in:
parent
a98f1749b4
commit
97e5cd6639
@ -112,7 +112,9 @@ 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 %s", $system->getColorSystemPrefix(), $color->getValue("name"), $system->getColorSystemSuffix()));
|
$optColor->setLabel($color->getValue("name"));
|
||||||
|
$optColor->setPrefix($system->getColorSystemPrefix());
|
||||||
|
$optColor->setSuffix($system->getColorSystemSuffix());
|
||||||
$optColor->setColorHex((string)$color->getHex());
|
$optColor->setColorHex((string)$color->getHex());
|
||||||
$optColor->setColorCMYK((string)$color->getCMYK());
|
$optColor->setColorCMYK((string)$color->getCMYK());
|
||||||
$optColor->setColorRGB((string)$color->getRGB());
|
$optColor->setColorRGB((string)$color->getRGB());
|
||||||
|
|||||||
@ -13,6 +13,10 @@ class ColorOpt extends Opt
|
|||||||
protected $colorHex = null;
|
protected $colorHex = null;
|
||||||
protected $colorCMYK = null;
|
protected $colorCMYK = null;
|
||||||
protected $colorRGB = null;
|
protected $colorRGB = null;
|
||||||
|
|
||||||
|
protected $prefix = null;
|
||||||
|
|
||||||
|
protected $suffix = null;
|
||||||
private string $value = "";
|
private string $value = "";
|
||||||
|
|
||||||
public function setValue(string $value)
|
public function setValue(string $value)
|
||||||
@ -54,4 +58,30 @@ class ColorOpt extends Opt
|
|||||||
{
|
{
|
||||||
$this->colorRGB = $colorRGB;
|
$this->colorRGB = $colorRGB;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return null
|
||||||
|
*/
|
||||||
|
public function getSuffix()
|
||||||
|
{
|
||||||
|
return $this->suffix;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param null $suffix
|
||||||
|
*/
|
||||||
|
public function setSuffix($suffix): void
|
||||||
|
{
|
||||||
|
$this->suffix = $suffix;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getPrefix(): ?string
|
||||||
|
{
|
||||||
|
return $this->prefix;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function setPrefix(?string $prefix): void
|
||||||
|
{
|
||||||
|
$this->prefix = $prefix;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user