@@ -1,11 +1,22 @@ Revision history for Perl extension Chart::Clicker. +2.35 + - Legend + - Depend on Layout::Manager 0.29 and adjust Legend to use + - Remove lots of random crap from Legend that wasn't being used + - Ditch Clicker's BUILD method for prepare-time work wrt plot & legend + addition + - Add has_name predicate to Series and use it in Legend + - Bar + - Fix overlap in borders + - Fix stroking of translucent bars + - Only stroke bars if their opacity is < 1 and the brush width > 0 + 2.34 - Clean up some unnecessary POD - Add shape_brush to Point renderer - Add first cut of tutorial - 2.33 - Rename share_axis_width to share_axes_with - Throw a useful error when there is no data, thanks Dave Hayes Changes @@ -17,6 +17,6 @@ requires 'Geometry::Primitive' => 0.13; requires 'Graphics::Color' => 0.20; requires 'Graphics::Primitive' => 0.42; requires 'Graphics::Primitive::Driver::Cairo' => 0.39; -requires 'Layout::Manager' => 0.24; +requires 'Layout::Manager' => 0.29; WriteAll; Makefile.PL @@ -22,7 +22,7 @@ use Chart::Clicker::Drawing::ColorAllocator; use Scalar::Util qw(refaddr); -our $VERSION = '2.34'; +our $VERSION = '2.35'; has '+background_color' => ( default => sub { @@ -146,16 +146,6 @@ has '+width' => ( default => 500 ); -sub BUILD { - my ($self) = @_; - - $self->add_component($self->plot, 'c'); - - if($self->legend->visible) { - $self->add_component($self->legend, $self->legend_position); - } -} - sub add_to_contexts { my ($self, $ctx) = @_; @@ -167,7 +157,6 @@ sub add_to_contexts { sub draw { my ($self) = @_; - my $driver = $self->driver; $driver->prepare($self); @@ -194,6 +183,18 @@ override('prepare', sub { return if $self->prepared; + unless(scalar(@{ $self->components })) { + $self->add_component($self->plot, 'c'); + + my $lp = lc($self->legend_position); + if($self->legend->visible) { + if(($lp =~ /^e/) || ($lp =~ /^w/)) { + $self->legend->orientation('vertical'); + } + $self->add_component($self->legend, $self->legend_position); + } + } + my $plot = $self->plot; $plot->clear_components; lib/Chart/Clicker.pm @@ -15,7 +15,11 @@ has 'keys' => ( 'count' => 'key_count' } ); -has 'name' => ( is => 'rw', isa => 'Str' ); +has 'name' => ( + is => 'rw', + isa => 'Str', + predicate => 'has_name' +); has 'range' => ( is => 'rw', isa => 'Chart::Clicker::Data::Range', lib/Chart/Clicker/Data/Series.pm @@ -12,6 +12,8 @@ use Graphics::Primitive::Font; use Graphics::Primitive::Insets; use Graphics::Primitive::TextBox; +use Layout::Manager::Flow; + has '+border' => ( default => sub { my $b = Graphics::Primitive::Border->new; @@ -37,10 +39,9 @@ has 'item_padding' => ( } ); has '+layout_manager' => ( - default => sub { Layout::Manager::Compass->new } + default => sub { Layout::Manager::Flow->new(anchor => 'west', wrap => 1) }, + lazy => 1 ); -has 'tallest' => ( is => 'rw', isa => 'Num' ); -has 'widest' => ( is => 'rw', isa => 'Num' ); override('prepare', sub { my ($self, $driver) = @_; @@ -53,34 +54,27 @@ override('prepare', sub { my $ii = $self->item_padding; + if($self->is_vertical) { + # This assumes you aren't changing the layout manager... + $self->layout_manager->anchor('north'); + } + my $count = 0; - my $long = 0; - my $tall = 0; - my @items; foreach my $ds (@{ $self->clicker->datasets }) { foreach my $s (@{ $ds->series }) { - my $label = $s->name; - unless(defined($label)) { + unless($s->has_name) { $s->name("Series $count"); - $label = "Series $count"; } my $tb = Graphics::Primitive::TextBox->new( color => $ca->next, - font => $self->font, - padding => $self->item_padding, - text => $label + font => $font, + padding => $ii, + text => $s->name ); - # Add this to the container in the right direction based on - # our orientation - my $dir = 'w'; - if($self->is_vertical) { - $dir = 'n'; - } - - $self->add_component($tb, $dir); + $self->add_component($tb); $count++; } @@ -134,23 +128,11 @@ Set/Get this Legend's insets. Set/Get the padding for this legend's items. -=head2 legend_items - -Set/Get this legend's items. - =head2 prepare Prepare this Legend by creating the LegendItems based on the datasets provided and testing the lengths of the series names. -=head2 tallest - -Set/Get the height of the tallest label. - -=head2 widest - -Set/Get the width of the widest label. - =head1 AUTHOR Cory G Watson <gphat@cpan.org> lib/Chart/Clicker/Decoration/Legend.pm @@ -44,7 +44,7 @@ override('prepare', sub { }); override('finalize', sub { - my $self = shift(); + my ($self) = @_; my $clicker = $self->clicker; @@ -53,7 +53,7 @@ override('finalize', sub { my $dses = $clicker->get_datasets_for_context($self->context); - my $padding = $self->bar_padding + $self->brush->width; + my $padding = $self->bar_padding + $self->brush->width * 2; my $offset = 1; foreach my $ds (@{ $dses }) { @@ -64,7 +64,7 @@ override('finalize', sub { my $range = $ctx->range_axis; my $owidth = $width - ($width * $domain->fudge_amount); - my $bwidth = int(($owidth / $self->{KEYCOUNT})) - $self->brush->width - $padding; + my $bwidth = int(($owidth / $self->{KEYCOUNT})) - $padding; my $hbwidth = int($bwidth / 2); # Fudge amounts change mess up the calculation of bar widths, so @@ -102,7 +102,7 @@ override('finalize', sub { $x - $hbwidth + ($offset * $cbwidth), $basey ); $self->rectangle( - -int($cbwidth), -int($y - ($height - $basey)) + -int($cbwidth) + $self->brush->width, -int($y - ($height - $basey)) ); } } else { @@ -119,21 +119,26 @@ override('finalize', sub { paint => Graphics::Primitive::Paint::Solid->new ); - if($self->opacity) { + my $brwidth = $self->brush->width; + + if($self->opacity < 1) { my $fillcolor = $color->clone; $fillcolor->alpha($self->opacity); $fillop->paint->color($fillcolor); # Since we're going to stroke this, we want to preserve it. - $fillop->preserve(1); + $fillop->preserve(1) if $brwidth; } else { $fillop->paint->color($color); } $self->do($fillop); - if($self->opacity) { + if(($self->opacity < 1) && ($brwidth > 0)) { my $strokeop = Graphics::Primitive::Operation::Stroke->new; - $strokeop->brush->color($color); + $strokeop->brush($self->brush->clone); + unless(defined($self->brush->color)) { + $strokeop->brush->color($color); + } $self->do($strokeop); } lib/Chart/Clicker/Renderer/Bar.pm 344b7b24823d1376927918f144e03a4f80425e43 Cory Watson github@onemogin.com http://github.com/gphat/chart-clicker/commit/9671b82f70613d2de4ca994add2c2a46410a244a 9671b82f70613d2de4ca994add2c2a46410a244a 2009-06-28T00:24:57-07:00 2009-06-28T00:24:57-07:00 - Legend - Depend on Layout::Manager 0.29 and adjust Legend to use - Remove lots of random crap from Legend that wasn't being used - Ditch Clicker's BUILD method for prepare-time work wrt plot & legend addition - Add has_name predicate to Series and use it in Legend - Bar - Fix overlap in borders - Fix stroking of translucent bars - Only stroke bars if their opacity is < 1 and the brush width > 0 dd907b42cdcee5b4a05c06e2ecaae8478a481fa6 Cory Watson github@onemogin.com