[Jifty-commit] r3823 - in jifty/trunk: lib/Jifty/Plugin/Chart/Renderer

[jifty-commit at lists.jifty.org]

Author: trs
Date: Wed Aug  8 01:01:40 2007
New Revision: 3823

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/Makefile.PL
   jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/PlotKit.pm
   jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/XMLSWF.pm

Log:
 r25999 at zot:  tom | 2007-08-08 01:01:30 -0400
 - Treat the width and height appropriately
 - Add the XML::Simple dep


Modified: jifty/trunk/Makefile.PL
==============================================================================
--- jifty/trunk/Makefile.PL	(original)
+++ jifty/trunk/Makefile.PL	Wed Aug  8 01:01:40 2007
@@ -151,6 +151,7 @@
         recommends('Chart::Base'),
         recommends('GD'),          # for a testing hack
         recommends('GD::Graph'),
+        recommends('XML::Simple'),
         recommends('Image::Info'), # for testing
     ],
 );

Modified: jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/PlotKit.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/PlotKit.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/PlotKit.pm	Wed Aug  8 01:01:40 2007
@@ -65,6 +65,10 @@
         return;
     }
 
+    # Kill the "px" unit
+    $args{width} =~ s/px$//;
+    $args{height} =~ s/px$//;
+
     $self->_transform_data( \%args );
 
     # Save the data for retrieval from the session later

Modified: jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/XMLSWF.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/XMLSWF.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/Chart/Renderer/XMLSWF.pm	Wed Aug  8 01:01:40 2007
@@ -66,6 +66,10 @@
     # Make sure the type is ready to be used
     $args{type} = $types{ $args{type} } || undef;
 
+    # Kill the "px" unit
+    $args{width} =~ s/px$//;
+    $args{height} =~ s/px$//;
+
     # Save the data for retrieval from the session later
     my $chart_id   = Jifty->web->serial;
     my $session_id = 'chart_' . $chart_id;