extended possibilities of range def + tests

Author: lichtkind

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

@@ -5,11 +5,11 @@ use warnings;
 
 package Graphics::Toolkit::Color::Space::Instance::LAB;
 use Graphics::Toolkit::Color::Space;
- se Graphics::Toolkit::Color::Space::Util qw/mult_matrix apply_d65 remove_d65/;
+use Graphics::Toolkit::Color::Space::Util qw/mult_matrix apply_d65 remove_d65/;
 
 my  $lab_def = Graphics::Toolkit::Color::Space->new( axis => [qw/L* a* b*/], # 
                                                    prefix => 'CIE',
-                                                    range => [100, 500, 200] );
+                                                    range => [[0, 100, 'r'], [-500, 500, 'r'], [-200, 200, 'r']] );
 
     $lab_def->add_converter('RGB', \&to_rgb, \&from_rgb );
 
@@ -26,21 +26,18 @@ sub from_rgb {
     $y = ($y > 0.008856) ? ($y ** (1/3)) : (7.7870689 * $y + 0.137931034);
     $z = ($z > 0.008856) ? ($z ** (1/3)) : (7.7870689 * $z + 0.137931034);
 
-    my $l = (116 * $y) - 16;
-    my $a = 500 * ($x - $y);
-    my $b = 200 * ($y - $z);
-    return ($l, $a, $b);
+    return ((116 * $y) - 16, $a = 500 * ($x - $y), 200 * ($y - $z));
 }
 
 
 sub to_rgb {
     my ($l, $a, $b) = @_;
-    $i = ($i * $i_size) - $i_max;
-    $q = ($q * $q_size) - $q_max;
-    my $r = $y + ( 0.956 * $i) + ( 0.619 * $q);
-    my $g = $y + (-0.272 * $i) + (-0.647 * $q);
-    my $b = $y + (-1.106 * $i) + ( 1.703 * $q);
-    return ($r, $g, $b);
+    #~ $i = ($i * $i_size) - $i_max;
+    #~ $q = ($q * $q_size) - $q_max;
+    #~ my $r = $y + ( 0.956 * $i) + ( 0.619 * $q);
+    #~ my $g = $y + (-0.272 * $i) + (-0.647 * $q);
+    #~ my $b = $y + (-1.106 * $i) + ( 1.703 * $q);
+    #~ return ($r, $g, $b);
 }
 
 $lab_def;

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

@@ -24,10 +24,12 @@ sub new {
         for my $i ($basis->iterator) {
             my $drange = $range->[$i]; # range def of this dimension
 
-            if (not ref $drange and $drange > 0){
+            if (not ref $drange and $drange and $drange eq 'normal'){
+                $range->[$i] = [0,1];
+            } elsif (not ref $drange and $drange > 0){
                 $drange = int $drange;
                 $range->[$i] = [0, $drange];
-            } elsif (ref $drange eq 'ARRAY' and @$drange == 2
+            } elsif (ref $drange eq 'ARRAY' and (@$drange == 2 or @$drange == 3)
                      and defined $drange->[0] and defined $drange->[1] and $drange->[0] < $drange->[1]) { # full valid def
             } else { return }
         }
@@ -57,6 +59,7 @@ sub dimension_is_int {
     return 0 if $r->[0] == 0 and $r->[1] == 1; #normal
     return 0 if int($r->[0]) != $r->[0];
     return 0 if int($r->[1]) != $r->[1];
+    return 0 if exists $r->[2] and $r->[2] and lc(substr $r->[2], 0, 1) eq 'r'; # r or real
     1;
 }
 sub _range {

t/03_space_shape.t

@@ -2,7 +2,7 @@
 
 use v5.12;
 use warnings;
-use Test::More tests => 75;
+use Test::More tests => 91;
 use Test::Warn;
 
 BEGIN { unshift @INC, 'lib', '../lib'}
@@ -20,7 +20,7 @@ is( Graphics::Toolkit::Color::Space::Shape->new( $basis, {}), undef, 'range defi
 is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3] ]), undef, 'not enough dimensions');
 is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3],[1,3],[1,3] ]), undef, 'too many dimensions');
 is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3],[1] ]), undef, 'one dimension had too short def');
-is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3],[1,2,3] ]), undef, 'one dimension had too long def');
+is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3],[1,2,3,4] ]), undef, 'one dimension had too long def');
 is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3],[2,2] ]), undef, 'range min is not smaller than max');
 is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3],[1,2] ],{}), undef, 'type def has to be array too');
 is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3],[1,2] ],[1,1]), undef, 'type def too short');
@@ -30,8 +30,31 @@ is( Graphics::Toolkit::Color::Space::Shape->new( $basis, [[1,3],[1,3],[1,2] ],[1
 
 my $shape = Graphics::Toolkit::Color::Space::Shape->new( $basis, 20);
 is( ref $shape,  $module, 'created shape with 0..20 range');
+is( $shape->dimension_is_int(0), 1, 'first dimension outputs is int values');
+is( $shape->dimension_is_int(1), 1, 'second dimension outputs is int values');
+is( $shape->dimension_is_int(2), 1, 'third dimension outputs is int values');
+is( $shape->dimension_is_int(3), undef, 'there is no fourth dimension ');
+
 my $bshape = Graphics::Toolkit::Color::Space::Shape->new( $basis, [[-5,5],[-5,5],[-5,5]], ['angular', 'circular', 0]);
 is( ref $bshape,  $module, 'created 3D bowl shape with -5..5 range');
+is( $bshape->dimension_is_int(0), 1, 'first dimension outputs is int values');
+is( $bshape->dimension_is_int(1), 1, 'second dimension outputs is int values');
+is( $bshape->dimension_is_int(2), 1, 'third dimension outputs is int values');
+
+my $nshape = Graphics::Toolkit::Color::Space::Shape->new( $basis, 'normal');
+is( $nshape->dimension_is_int(0), 0, 'first normal dimension outputs is not int');
+is( $nshape->dimension_is_int(1), 0, 'second normal dimension outputs is not int');
+is( $nshape->dimension_is_int(2), 0, 'third normal dimension outputs is not int');
+
+my $mshape = Graphics::Toolkit::Color::Space::Shape->new( $basis, ['normal', 100, [2, 2.2]]);
+is( $mshape->dimension_is_int(0), 0, 'first particular normal dimension is not int');
+is( $mshape->dimension_is_int(1), 1, 'second dimension defined by int is int');
+is( $mshape->dimension_is_int(2), 0, 'third dimension defined by real range is not int');
+
+my $oshape = Graphics::Toolkit::Color::Space::Shape->new( $basis, [[0, 10, 'int'], [0, 10, 'real'], [0, 10, 'r'],]);
+is( $oshape->dimension_is_int(0), 1, 'first dimension outputs is int');
+is( $oshape->dimension_is_int(1), 0, 'second dimension outputs is not int');
+is( $oshape->dimension_is_int(2), 0, 'third dimension outputs is not int');
 
 my @d = $shape->delta(1, [1,5,4,5] );
 is( int @d,   0, 'reject compute delta on none vector on first arg position');