oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

graphing doesn't work with GraphicsMagick

Browse source
This commit is contained in:
JT Smith 2007-10-03 23:23:44 +00:00
parent e41f544f4f
commit 9775400b8a
3 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lib/WebGUI/Image.pm
View file

@ -4,7 +4,7 @@ use strict;
use WebGUI::Image::Palette;
use Carp qw(croak);
my $graphicsPackage;
our $graphicsPackage;
BEGIN {
if (eval { require Graphics::Magick; 1 }) {
$graphicsPackage = 'Graphics::Magick';
@ -264,8 +264,12 @@ sub setImageHeight {
my $self = shift;
my $height = shift;
#$self->image->set(size => $self->getImageWidth.'x'.$height);
$self->image->Extent(height => $height);
if ($graphicsPackage eq 'Graphics::Magick') {
$self->image->set(size => $self->getImageWidth.'x'.$height);
}
else {
$self->image->Extent(height => $height);
}
$self->image->Colorize(fill => $self->getBackgroundColor);
$self->{_properties}->{height} = $height;
}
@ -285,9 +289,12 @@ Teh width of the image in pixels.
sub setImageWidth {
my $self = shift;
my $width = shift;
#$self->image->set(size => $width.'x'.$self->getImageHeight);
$self->image->Extent(width => $width);
if ($graphicsPackage eq 'Graphics::Magick') {
$self->image->set(size => $width.'x'.$self->getImageHeight);
}
else {
$self->image->Extent(width => $width);
}
$self->image->Colorize(fill => $self->getBackgroundColor);
$self->{_properties}->{width} = $width;
}
@ -410,8 +417,13 @@ sub text {
my $anchorX = $properties{x};
my $anchorY = $properties{y};
my ($x_ppem, $y_ppem, $ascender, $descender, $width, $height, $max_advance) = $self->image->QueryMultilineFontMetrics(%properties);
my %testProperties = %properties;
delete $testProperties{align};
delete $testProperties{style};
delete $testProperties{fill};
delete $testProperties{alignHorizontal};
delete $testProperties{alignVertical};
my ($x_ppem, $y_ppem, $ascender, $descender, $width, $height, $max_advance) = $self->image->QueryFontMetrics(%testProperties);
# Process horizontal alignment
if ($properties{alignHorizontal} eq 'center') {

4
lib/WebGUI/Image/Graph.pm
View file

@ -422,8 +422,8 @@ sub getLabelDimensions {
my ($x_ppem, $y_ppem, $ascender, $descender, $width, $height, $max_advance) = $self->image->QueryFontMetrics(
font => $self->getLabelFont->getFile,
# stroke => $self->getLabelColor,
fill => $self->getLabelColor,
style => 'Normal',
# fill => $self->getLabelColor,
# style => 'Normal',
pointsize => $self->getLabelFontSize,
%$properties,
text => $text,