obvious fixes in space hub due API changes

Author: lichtkind

dev/TODO.txt

@@ -5,6 +5,8 @@ TODO:
    + OKLAB
    + HunterLAB
    + HSI
+   + NCS
+   + Yxy
 
 - Set methods
     + bowl

lib/Graphics/Toolkit/Color/Space/Hub.pm

@@ -28,7 +28,7 @@ sub add_space {
 
 sub remove_space {
     my $name = shift;
-    return "got no name as argument" unless defind $nam and $name;
+    return "got no name as argument" unless defined $name and $name;
     return "no known color space with name $name" unless ref get_space( $name );
     delete $space_lookup{ $name };
 }
@@ -43,7 +43,7 @@ sub _check_values_and_space {
     $space_name //= $base_package;
     check_space_name( $space_name ) and return;
     my $space = get_space($space_name);
-    $space->is_array( $values ) ? $space
+    $space->is_value_tuple( $values ) ? $space
                                 : 'need an ARRAY ref with '.$space->axis." $space_name values as first argument of $sub_name";
 }
 

lib/Graphics/Toolkit/Color/Space/Instance/LCHab.pm

@@ -1,28 +1,28 @@
 use v5.12;
 use warnings;
 
-# CIE LCh(ab) linear color space specific code
+# CIE LCh(ab) cylindrical color space specific code
 
 package Graphics::Toolkit::Color::Space::Instance::LCHab;
 use Graphics::Toolkit::Color::Space;
 use Graphics::Toolkit::Color::Space::Util qw/mult_matrix apply_d65 remove_d65/;
 
-my  $hcl_def = Graphics::Toolkit::Color::Space->new(prefix => 'CIE', name => 'LCHab', 
+my  $hcl_def = Graphics::Toolkit::Color::Space->new(prefix => 'CIE', name => 'LCHab',
                                                       axis => [qw/luminance croma hue/],
                                                      #short => [qw/luminance croma hue/],
-                                                     range => [100, 1, 1.08883] );
+                                                     range => [100, 539, 360] );
 
     $hcl_def->add_converter('RGB', \&to_rgb, \&from_rgb );
 
 sub from_rgb {
     my ($r, $g, $b) = @_;
     my ($x, $y, $z) = mult_matrix([[0.4124564, 0.2126729, 0.0193339],
                                    [0.3575761, 0.7151522, 0.1191920],
-                                   [0.1804375, 0.0721750, 0.9503041]], 
+                                   [0.1804375, 0.0721750, 0.9503041]],
                                    apply_d65( $r ), apply_d65( $g ), apply_d65( $b ));
     $x /= 0.95047;
     $z /= 0.108883;
-    
+
     $x = ($x > 0.008856) ? ($x ** (1/3)) : (7.7870689 * $x + 0.137931034);
     $y = ($y > 0.008856) ? ($y ** (1/3)) : (7.7870689 * $y + 0.137931034);
     $z = ($z > 0.008856) ? ($z ** (1/3)) : (7.7870689 * $z + 0.137931034);

lib/Graphics/Toolkit/Color/Space/Instance/LCHuv.pm

@@ -1,7 +1,7 @@
 use v5.12;
 use warnings;
 
-# CIE LCh(uv) linear color space specific code
+# CIE LCh(uv) cylindrical color space specific code
 
 package Graphics::Toolkit::Color::Space::Instance::LCHuv;
 use Graphics::Toolkit::Color::Space;
@@ -17,11 +17,11 @@ sub from_rgb {
     my ($r, $g, $b) = @_;
     my ($x, $y, $z) = mult_matrix([[0.4124564, 0.2126729, 0.0193339],
                                    [0.3575761, 0.7151522, 0.1191920],
-                                   [0.1804375, 0.0721750, 0.9503041]], 
+                                   [0.1804375, 0.0721750, 0.9503041]],
                                    apply_d65( $r ), apply_d65( $g ), apply_d65( $b ));
     $x /= 0.95047;
     $z /= 0.108883;
-    
+
     $x = ($x > 0.008856) ? ($x ** (1/3)) : (7.7870689 * $x + 0.137931034);
     $y = ($y > 0.008856) ? ($y ** (1/3)) : (7.7870689 * $y + 0.137931034);
     $z = ($z > 0.008856) ? ($z ** (1/3)) : (7.7870689 * $z + 0.137931034);

t/23_luv_space.t

@@ -14,55 +14,20 @@ is( not($@), 1, 'could load the module');
 is( ref $def, 'Graphics::Toolkit::Color::Space', 'got tight return value by loading module');
 is( $def->name,       'CIELUV',                  'color space has right name');
 is( $def->axis,              3,                  'color space has 3 dimensions');
-is( $def->is_array([0,0,0]), 1,                  'vector has 3 elements');
-is( $def->is_partial_hash({i => 1, quadrature => 0}), 1, 'found hash with some keys');
+is( $def->is_value_tuple([0,0,0]), 1,            'tuple has 3 elements');
+is( $def->is_partial_hash({u => 1, v => 0}), 1,  'found hash with some axis names');
+is( $def->is_partial_hash({u => 1, v => 0, l => 0}), 1, 'found hash with all axis names');
+is( $def->is_partial_hash({a => 1, v => 0, l => 0}), 0, 'found hash with onw wrong axis name');
 is( $def->can_convert('rgb'), 1,                 'do only convert from and to rgb');
 is( $def->can_convert('yiq'), 0,                 'can not convert to itself');
-is( $def->format([0,0,0], 'css_string'), 'yiq(0,0,0)', 'can format css string');
-my @val = $def->deformat(['LUV', 1, 0, -0.1]);
-is( int @val,  3,     'deformated value triplet (vector)');
-is( $val[0], 1,     'first value good');
-is( $val[1], 0,     'second value good');
-is( $val[2], -0.1,  'third value good');
+is( $def->format([0,0,0], 'css_string'), 'cieluv(0, 0, 0)', 'can format css string');
 
-ok( !$def->check([0, -0.5959, -0.5227]),         'check YIO values works on lower bound values');
-ok( !$def->check([1,  0.5959,  0.5227]),         'check YIO values works on upper bound values');
-warning_like {$def->check([0,0])}        {carped => qr/needs 3 values/}, "check YIQ got too few values";
-warning_like {$def->check([0, 0, 0, 0])} {carped => qr/needs 3 values/}, "check YIQ got too many values";
+my $val = $def->deformat(['CIELUV', 1, 0, -0.1]);
+is( ref $val,  'ARRAY',  'deformated random value tuple');
+is( int @$val,    3,     'right amount of values');
+is( $val->[0],    1,     'first value good');
+is( $val->[1],    0,     'second value good');
+is( $val->[2], -0.1,     'third value good');
 
-is( $def->check([0,0,0]),  undef,     'checked neutral values');
-warning_like {$def->check([-0.1, 0, 0])}  {carped => qr/luminance value is below/},  "luminance value is too small";
-warning_like {$def->check([ 1.1, 0,0])}  {carped => qr/luminance value is above/},   "luminance value is too big";
-warning_like {$def->check([0, -0.6, 0])}  {carped => qr/in-phase value is below/},   "whiteness value is too small";
-warning_like {$def->check([0, 0.6,0])}  {carped => qr/in-phase value is above/},     "whiteness value is too big";
-warning_like {$def->check([0,0, -0.53 ])}  {carped => qr/quadrature value is below/},"quadrature value is too small";
-warning_like {$def->check([0,0, 0.53])}  {carped => qr/quadrature value is above/},  "quadrature value is too big";
-
-
-
-my @yiq = $def->deconvert( [ 0.5, 0.5, 0.5], 'RGB');
-is( int @yiq,  3,     'converted color grey has three YIQ values');
-is( $yiq[0], 0.5,     'converted color grey has computed right luminance value');
-is( $yiq[1], 0.5,  'converted color grey has computed right in-phase');
-is( $yiq[2], 0.5,  'converted color grey has computed right quadrature');
-
-my @rgb = $def->convert( [0.5, 0.5, 0.5], 'RGB');
-is( int @rgb,  3,     'converted back color grey has three rgb values');
-is( $rgb[0],   0.5,   'converted back color grey has right red value');
-is( $rgb[1],   0.5,   'converted back color grey has right green value');
-is( $rgb[2],   0.5,   'converted back color grey has right blue value');
-
-@yiq = $def->deconvert( [0.1, 0, 1], 'RGB');
-is( int @yiq,  3,     'converted blue has three YIQ values');
-is( close_enough( $yiq[0], 0.1439 )    ,  1 ,  'converted nice blue has right Y value');
-is( close_enough( $yiq[1], 0.280407787),  1 ,  'converted nice blue has right I value');
-is( close_enough( $yiq[2], 0.817916587),  1 ,  'converted nice blue has right Q value');
-
-
-@rgb = $def->convert( [0.1439, 0.280407787, 0.817916587], 'RGB');
-is( int @rgb,  3,     'converted back nice blue');
-is( close_enough($rgb[0],  0.1), 1,   'right red value');
-is( close_enough($rgb[1],  0  ), 1,   'right green value');
-is( close_enough($rgb[2],  1, ), 1,   'right blue value');
 
 exit 0;

t/lib/Test/Color.pm

@@ -1,7 +1,7 @@
 use v5.12;
 use warnings;
 
-# utilities for any sub module of the distribution
+# utilities for tests
 
 package Test::Color;