From e706f80cf29e555c1bb9d0f9eae2435fee37a3be Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Wed, 11 Jan 2012 11:54:18 -0500 Subject: [PATCH] refactor datatype() method into wiggle_minmax.pm --- lib/Bio/Graphics/Glyph/wiggle_density.pm | 4 +++- lib/Bio/Graphics/Glyph/wiggle_minmax.pm | 19 +++++++++++++++++++ lib/Bio/Graphics/Glyph/wiggle_xyplot.pm | 21 +-------------------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/lib/Bio/Graphics/Glyph/wiggle_density.pm b/lib/Bio/Graphics/Glyph/wiggle_density.pm index 1f3c315..6af4e3e 100755 --- a/lib/Bio/Graphics/Glyph/wiggle_density.pm +++ b/lib/Bio/Graphics/Glyph/wiggle_density.pm @@ -1,7 +1,9 @@ package Bio::Graphics::Glyph::wiggle_density; use strict; -use base qw(Bio::Graphics::Glyph::box Bio::Graphics::Glyph::smoothing Bio::Graphics::Glyph::wiggle_minmax); +use base qw(Bio::Graphics::Glyph::box + Bio::Graphics::Glyph::smoothing + Bio::Graphics::Glyph::wiggle_minmax); use File::Spec; sub my_description { diff --git a/lib/Bio/Graphics/Glyph/wiggle_minmax.pm b/lib/Bio/Graphics/Glyph/wiggle_minmax.pm index f93a677..dd8f37a 100755 --- a/lib/Bio/Graphics/Glyph/wiggle_minmax.pm +++ b/lib/Bio/Graphics/Glyph/wiggle_minmax.pm @@ -153,5 +153,24 @@ sub wig { $d; } +sub datatype { + my $self = shift; + my $feature = $self->feature; + my ($tag,$value); + + foreach $tag ('wigfile','wigdata','densefile','coverage') { + ($value) = eval{$feature->get_tag_values($tag)}; + last if $value; + } + unless ($value) { + $tag = 'statistical_summary'; + $value = eval{$feature->statistical_summary}; + } + unless ($value) { + $tag = 'generic'; + } + return wantarray ? ($tag,$value) : $tag; +} + 1; diff --git a/lib/Bio/Graphics/Glyph/wiggle_xyplot.pm b/lib/Bio/Graphics/Glyph/wiggle_xyplot.pm index 63f77a8..1d1a66a 100755 --- a/lib/Bio/Graphics/Glyph/wiggle_xyplot.pm +++ b/lib/Bio/Graphics/Glyph/wiggle_xyplot.pm @@ -99,7 +99,7 @@ sub draw { my ($gd,$dx,$dy) = @_; my $feature = $self->feature; - my $datatype = $self->datatype; + my $datatype = $self->datatype; # found in wiggle_minmax.pm my $retval; $retval = $self->draw_wigfile($feature,@_) if $datatype eq 'wigfile'; @@ -237,25 +237,6 @@ sub _draw_wigfile { $self->draw_plot($parts,@_); } -sub datatype { - my $self = shift; - my $feature = $self->feature; - my ($tag,$value); - - foreach $tag ('wigfile','wigdata','densefile','coverage') { - ($value) = eval{$feature->get_tag_values($tag)}; - last if $value; - } - unless ($value) { - $tag = 'statistical_summary'; - $value = eval{$feature->statistical_summary}; - } - unless ($value) { - $tag = 'generic'; - } - return wantarray ? ($tag,$value) : $tag; -} - sub get_parts { my $self = shift; my $feature = $self->feature;