X-Git-Url: http://git.vpit.fr/?a=blobdiff_plain;f=lib%2FLaTeX%2FTikZ%2FSet%2FCircle.pm;h=8efdd9841155eb25a12275eac0522ab9a368bd49;hb=d819d3e4b5357f615a15c6c68c28b0612036ece8;hp=b1d83b83454a9217715d5c57769b25dee7b1720c;hpb=5adf00c880491bac3bd793a07431cf161c03643f;p=perl%2Fmodules%2FLaTeX-TikZ.git

diff --git a/lib/LaTeX/TikZ/Set/Circle.pm b/lib/LaTeX/TikZ/Set/Circle.pm
index b1d83b8..8efdd98 100644
--- a/lib/LaTeX/TikZ/Set/Circle.pm
+++ b/lib/LaTeX/TikZ/Set/Circle.pm
@@ -15,6 +15,11 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Set::Point;
+
+use LaTeX::TikZ::Interface;
+use LaTeX::TikZ::Functor;
+
 use LaTeX::TikZ::Tools;
 
 use Any::Moose;
@@ -24,18 +29,14 @@ with 'LaTeX::TikZ::Set::Op';
 
 has 'center' => (
  is       => 'ro',
- does     => 'LaTeX::TikZ::Point',
+ isa      => 'LaTeX::TikZ::Set::Point',
  required => 1,
+ coerce   => 1,
 );
 
-subtype 'LaTeX::TikZ::Set::Circle::Radius'
-     => as 'Num'
-     => where { LaTeX::TikZ::Tools::numcmp($_, 0) >= 1 }
-     => message { "$_ isn't a non-negative real number" };
-
 has 'radius' => (
  is       => 'ro',
- isa      => 'LaTeX::TikZ::Set::Circle::Radius',
+ isa      => subtype('Num' => where { LaTeX::TikZ::Tools::numcmp($_, 0) > 0 }),
  required => 1,
 );
 
@@ -46,11 +47,23 @@ sub path {
  $set->center->path(@_) . ' circle (' . $tikz->len($set->radius) . ')';
 }
 
-use LaTeX::TikZ::Interface circle => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ circle => sub {
+  shift;
 
- __PACKAGE__->new(center => $_[0], radius => $_[1]);
-};
+  __PACKAGE__->new(center => $_[0], radius => $_[1]);
+ },
+);
+
+LaTeX::TikZ::Functor->default_rule(
+ (__PACKAGE__) => sub {
+  my ($functor, $set, @args) = @_;
+  $set->new(
+   center => $set->center->$functor(@args),
+   radius => $set->radius,
+  );
+ }
+);
 
 __PACKAGE__->meta->make_immutable;