--- loncom/xml/lonplot.pm 2002/03/22 20:05:19 1.63 +++ loncom/xml/lonplot.pm 2002/04/23 15:21:36 1.65 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.63 2002/03/22 20:05:19 albertel Exp $ +# $Id: lonplot.pm,v 1.65 2002/04/23 15:21:36 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -112,7 +112,7 @@ my $words_test = sub {$_[0]=~s/\s+/ ## ## ################################################################### my @gnuplot_edit_order = - qw/bgcolor fgcolor height width font transparent grid border align/; + qw/alttag bgcolor fgcolor height width font transparent grid border align/; my $gnuplot_help_text = <<"ENDPLOTHELP";
@@ -148,15 +148,22 @@ ENDPLOTHELP
my %gnuplot_defaults =
(
+ alttag => {
+ default => 'dynamically generated plot',
+ test => $words_test,
+ description => 'brief description of the plot',
+ edit_type => 'entry',
+ size => '40'
+ },
height => {
- default => 200,
+ default => 300,
test => $int_test,
description => 'height of image (pixels)',
edit_type => 'entry',
size => '10'
},
width => {
- default => 200,
+ default => 400,
test => $int_test,
description => 'width of image (pixels)',
edit_type => 'entry',
@@ -183,7 +190,7 @@ my %gnuplot_defaults =
edit_type => 'onoff'
},
grid => {
- default => 'off',
+ default => 'on',
test => $onoff_test,
description => 'Display grid',
edit_type => 'onoff'
@@ -202,7 +209,7 @@ my %gnuplot_defaults =
choices => ['small','medium','large']
},
align => {
- default => 'left',
+ default => 'center',
test => sub {$_[0]=~/^(left|right|center)$/},
description => 'alignment for image in html',
edit_type => 'choice',
@@ -299,6 +306,7 @@ my %tic_defaults =
},
);
+my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
my %axis_defaults =
(
color => {
@@ -484,10 +492,10 @@ sub end_gnuplot {
if ($target eq 'web') {
$result .= <<"ENDIMAGE";
+ alt = "$plot{'alttag'}" />
ENDIMAGE
} elsif ($target eq 'tex') {
&Apache::lonnet::ssi('cgi-bin/plot.gif?file=$filename'.
@@ -899,7 +907,8 @@ sub start_axis {
$tagstack->[-1]);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Axes');
- $result .= &edit_attributes($target,$token,\%axis_defaults);
+ $result .= &edit_attributes($target,$token,\%axis_defaults,
+ \@axis_edit_order);
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%axis_defaults));