From 97e5cd6639d8a4a233e552f533f33bd8dbcb72b7 Mon Sep 17 00:00:00 2001 From: Thomas Peterson Date: Tue, 1 Apr 2025 11:41:56 +0200 Subject: [PATCH] Fix Calc --- src/Option/Parser/Select.php | 4 +++- src/Option/Type/Select/ColorOpt.php | 30 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/Option/Parser/Select.php b/src/Option/Parser/Select.php index d640cda..36650e5 100644 --- a/src/Option/Parser/Select.php +++ b/src/Option/Parser/Select.php @@ -112,7 +112,9 @@ class Select extends Base foreach ($system->getAllColors() as $color) { $optColor = new \PSC\Library\Calc\Option\Type\Select\ColorOpt(); $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->setColorCMYK((string)$color->getCMYK()); $optColor->setColorRGB((string)$color->getRGB()); diff --git a/src/Option/Type/Select/ColorOpt.php b/src/Option/Type/Select/ColorOpt.php index 7d55f58..8fb998d 100644 --- a/src/Option/Type/Select/ColorOpt.php +++ b/src/Option/Type/Select/ColorOpt.php @@ -13,6 +13,10 @@ class ColorOpt extends Opt protected $colorHex = null; protected $colorCMYK = null; protected $colorRGB = null; + + protected $prefix = null; + + protected $suffix = null; private string $value = ""; public function setValue(string $value) @@ -54,4 +58,30 @@ class ColorOpt extends Opt { $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; + } } \ No newline at end of file