diff --git a/www/admin/class_test.convert.colors.php b/www/admin/class_test.convert.colors.php
index 0254ce67..a4c980cb 100644
--- a/www/admin/class_test.convert.colors.php
+++ b/www/admin/class_test.convert.colors.php
@@ -123,22 +123,16 @@ $hsl_from_hsb = Color::hsbToHsl($hsb);
print "HSL from HSB: " . DgS::printAr($hsl_from_hsb) . "
";
print "
";
-print "LEGACY
";
// A(out of bounds)
try {
print "C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: "
- . CoreLibs\Convert\Colors::rgb2hex(-1, -1, -1) . "
";
+ . (new Coordinates\RGB([-1, -1, -1]))->returnAsHex() . "
";
} catch (\LengthException $e) {
- print "*Exception: " . $e->getMessage() . "
" . $e . "
";
-}
-try {
- print "\$C::S/COLOR invalid rgb->hex (gray 125): -1, -1, -1: "
- . $color_class::rgb2hex(-1, -1, -1) . "
";
-} catch (\LengthException $e) {
- print "**Exception: " . $e->getMessage() . "
" . print_r($e, true) . "
";
+ print "*Exception: " . $e->getMessage() . "
" . print_r($e, true) . "
";
}
print "
";
+print "LEGACY
";
// B(valid)
$rgb = [50, 20, 30];
$hex = '#0a141e';
@@ -189,13 +183,16 @@ $s = rand(15, 70);
$b = 100;
$l = 50;
print "RANDOM IN: H: " . $h . ", S: " . $s . ", B/L: " . $b . "/" . $l . "
";
-print "RANDOM hsb->rgb: " . DgS::printAr(SetVarType::setArray(Colors::hsb2rgb($h, $s, $b))) . "
";
-print "RANDOM hsl->rgb: " . DgS::printAr(SetVarType::setArray(Colors::hsl2rgb($h, $s, $l))) . "
";
+print "RANDOM hsb->rgb: "
+ . DgS::printAr(SetVarType::setArray(Color::hsbToRgb(new Coordinates\HSB([$h, $s, $b])))) . "
";
+print "RANDOM hsl->rgb: "
+ . DgS::printAr(SetVarType::setArray(Color::hslToRgb(new Coordinates\HSL([$h, $s, $l])))) . "
";
print "
";
$rgb = [0, 0, 0];
-print "rgb 0,0,0: " . Dgs::printAr($rgb) . " => " . Dgs::printAr(Colors::rgb2hsb($rgb[0], $rgb[1], $rgb[2])) . "
";
+print "rgb 0,0,0: " . Dgs::printAr($rgb) . " => "
+ . Dgs::printAr(Color::rgbToHsb(new Coordinates\RGB([$rgb[0], $rgb[1], $rgb[2]]))) . "
";
print "
";
diff --git a/www/lib/CoreLibs/Basic.php b/www/lib/CoreLibs/Basic.php
index 065ec63e..db57672a 100644
--- a/www/lib/CoreLibs/Basic.php
+++ b/www/lib/CoreLibs/Basic.php
@@ -1139,118 +1139,6 @@ class Basic
// *** BETTER PASSWORD OPTIONS END ***
- // *** COLORS ***
- // [!!! DEPRECATED !!!]
- // moved to \CoreLibs\Convert\Colors
-
- /**
- * converts a hex RGB color to the int numbers
- * @param string $hexStr RGB hexstring
- * @param bool $returnAsString flag to return as string
- * @param string $seperator string seperator: default: ","
- * @return string|array|bool false on error or array with RGB or
- * a string with the seperator
- * @deprecated use \CoreLibs\Convert\Colors::hex2rgb() instead
- */
- public static function hex2rgb(string $hexStr, bool $returnAsString = false, string $seperator = ',')
- {
- trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hex2rgb()', E_USER_DEPRECATED);
- return \CoreLibs\Convert\Colors::hex2rgb($hexStr, $returnAsString, $seperator);
- }
-
- /**
- * converts the rgb values from int data to the valid rgb html hex string
- * optional can turn of leading #
- * @param int $red red 0-255
- * @param int $green green 0-255
- * @param int $blue blue 0-255
- * @param bool $hex_prefix default true, prefix with "#"
- * @return string|bool rgb in hex values with leading # if set
- * @deprecated use \CoreLibs\Convert\Colors::rgb2hex() instead
- */
- public static function rgb2hex(int $red, int $green, int $blue, bool $hex_prefix = true)
- {
- trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
- return \CoreLibs\Convert\Colors::rgb2hex($red, $green, $blue, $hex_prefix);
- }
-
- /**
- * converts and int RGB to the HTML color string in hex format
- * @param int $red red 0-255
- * @param int $green green 0-255
- * @param int $blue blue 0-255
- * @return string|bool hex rgb string
- * @deprecated use rgb2hex instead
- */
- public static function rgb2html(int $red, int $green, int $blue)
- {
- trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hex()', E_USER_DEPRECATED);
- // check that each color is between 0 and 255
- return \CoreLibs\Convert\Colors::rgb2hex($red, $green, $blue, true);
- }
-
- /**
- * converts RGB to HSB/V values
- * returns:
- * array with hue (0-360), sat (0-100%), brightness/value (0-100%)
- * @param int $red red 0-255
- * @param int $green green 0-255
- * @param int $blue blue 0-255
- * @return array|bool Hue, Sat, Brightness/Value
- * @deprecated use \CoreLibs\Convert\Colors::rgb2hsb() instead
- */
- public static function rgb2hsb(int $red, int $green, int $blue)
- {
- trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsb()', E_USER_DEPRECATED);
- return \CoreLibs\Convert\Colors::rgb2hsb($red, $green, $blue);
- }
-
- /**
- * converts HSB/V to RGB values RGB is full INT
- * @param int $H hue 0-360
- * @param float $S saturation 0-1 (float)
- * @param float $V brightness/value 0-1 (float)
- * @return array|bool 0 red/1 green/2 blue array
- * @deprecated use \CoreLibs\Convert\Colors::hsb2rgb() instead
- */
- public static function hsb2rgb(int $H, float $S, float $V)
- {
- trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hsb2rgb()', E_USER_DEPRECATED);
- return \CoreLibs\Convert\Colors::hsb2rgb($H, (int)round($S * 100), (int)round($V * 100));
- }
-
- /**
- * converts a RGB (0-255) to HSL
- * return:
- * array with hue (0-360), saturation (0-100%) and luminance (0-100%)
- * @param int $r red 0-255
- * @param int $g green 0-255
- * @param int $b blue 0-255
- * @return array|bool hue/sat/luminance
- * @deprecated use \CoreLibs\Convert\Colors::rgb2hsl() instead
- */
- public static function rgb2hsl(int $r, int $g, int $b)
- {
- trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::rgb2hsl()', E_USER_DEPRECATED);
- return \CoreLibs\Convert\Colors::rgb2hsb($r, $g, $b);
- }
-
- /**
- * converts an HSL to RGB
- * @param int $h hue: 0-360 (degrees)
- * @param float $s saturation: 0-1
- * @param float $l luminance: 0-1
- * @return array|bool red/blue/green 0-255 each
- * @deprecated use \CoreLibs\Convert\Colors::hsl2rgb() instead
- */
- public static function hsl2rgb(int $h, float $s, float $l)
- {
- trigger_error('Method ' . __METHOD__ . ' is deprecated, use \CoreLibs\Convert\Colors::hsl2rgb()', E_USER_DEPRECATED);
- return \CoreLibs\Convert\Colors::hsl2rgb($h, $s * 100, $l * 100);
- }
-
- // *** COLORS END ***
-
// *** EMAIL FUNCTIONS ***
// [!!! DEPRECATED !!!]
// Moved to \CoreLibs\Check\Email
diff --git a/www/lib/CoreLibs/Convert/Colors.php b/www/lib/CoreLibs/Convert/Colors.php
index 52f3f9d8..73b03744 100644
--- a/www/lib/CoreLibs/Convert/Colors.php
+++ b/www/lib/CoreLibs/Convert/Colors.php
@@ -33,6 +33,7 @@ class Colors
* @param bool $hex_prefix default true, prefix with "#"
* @return string rgb in hex values with leading # if set,
* @throws \LengthException If any argument is not in the range of 0~255
+ * @deprecated v9.19.0 use: new Coordinates\RGB([$red, $green, $blue]))->returnAsHex(true/false for #)
*/
public static function rgb2hex(
int $red,
@@ -53,6 +54,7 @@ class Colors
* or a string with the seperator
* @throws \InvalidArgumentException if hex string is empty
* @throws \UnexpectedValueException if the hex string value is not valid
+ * @deprecated v9.19.0] use: new Coordinates\RGB($hex_string) (build string/array from return data)
*/
public static function hex2rgb(
string $hex_string,
@@ -91,6 +93,7 @@ class Colors
* @param int $blue blue 0-255
* @return array Hue, Sat, Brightness/Value
* @throws \LengthException If any argument is not in the range of 0~255
+ * @deprecated v9.19.0 use: Color::rgbToHsb(...)->returnAsArray() will return float unrounded
*/
public static function rgb2hsb(int $red, int $green, int $blue): array
{
@@ -112,6 +115,7 @@ class Colors
* @param float $V brightness/value 0-100 (int)
* @return array 0 red/1 green/2 blue array as 0-255
* @throws \LengthException If any argument is not in the valid range
+ * @deprecated v9.19.0 use: Color::hsbToRgb(...)->returnAsArray() will return float unrounded
*/
public static function hsb2rgb(float $H, float $S, float $V): array
{
@@ -133,6 +137,7 @@ class Colors
* @param int $blue blue 0-255
* @return array hue/sat/luminance
* @throws \LengthException If any argument is not in the range of 0~255
+ * @deprecated v9.19.0 use: Color::rgbToHsl(...)->returnAsArray() will return float unrounded
*/
public static function rgb2hsl(int $red, int $green, int $blue): array
{
@@ -153,6 +158,7 @@ class Colors
* @param float $lum luminance: 0-100
* @return array red/blue/green 0-255 each
* @throws \LengthException If any argument is not in the valid range
+ * @deprecated v9.19.0 use: Color::hslToRgb(...)->returnAsArray() will return float unrounded
*/
public static function hsl2rgb(float $hue, float $sat, float $lum): array
{