[svn:p5ee] r9716 - p5ee/trunk/App-Widget/lib/App/Widget

Author: spadkins
Date: Tue Jul 10 14:27:01 2007
New Revision: 9716

Modified:
   p5ee/trunk/App-Widget/lib/App/Widget/Graph.pm

Log:
fix scaling in graphs

Modified: p5ee/trunk/App-Widget/lib/App/Widget/Graph.pm
==============================================================================
--- p5ee/trunk/App-Widget/lib/App/Widget/Graph.pm	(original)
+++ p5ee/trunk/App-Widget/lib/App/Widget/Graph.pm	Tue Jul 10 14:27:01 2007
@@ -235,10 +235,16 @@
                 $column = $columns->[$j];
                 $format = $column_defs->{$column}{format};
                 $yn_val = $object->{$column};
+
                 if ($format && $format =~ /%/) {
                     $yn_val = App::Widget->format($yn_val, $column_defs->{$column});
                     $yn_val =~ s/%//;
                 }
+                elsif ($format && $format =~ /\s+\((?:\/)?\d+\)/) {
+                    if ($yn_val ne "") { 
+                        $yn_val = App::Widget->format($yn_val, $column_defs->{$column});
+                    }
+                }
                 $yn[$j][$i] = $yn_val;
             }
         }
@@ -302,10 +308,16 @@
                 $y_idx{$y_value} = $#y;
             }
             $yn_val = $object->{$column};
+
             if ($format && $format =~ /%/) {
                 $yn_val = App::Widget->format($yn_val, $column_defs->{$column});
                 $yn_val =~ s/%//;
             }
+            elsif ($format && $format =~ /\s+\((?:\/)?\d+\)/) {
+                if ($yn_val ne "") { 
+                    $yn_val = App::Widget->format($yn_val, $column_defs->{$column});
+                }
+            }
             $yn[$y_idx{$y_value}][$x_idx{$x_value}] = $yn_val;
         }