--- loncom/xml/lonplot.pm 2006/05/30 12:47:53 1.113 +++ loncom/xml/lonplot.pm 2007/10/09 22:26:54 1.118.2.3 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.113 2006/05/30 12:47:53 www Exp $ +# $Id: lonplot.pm,v 1.118.2.3 2007/10/09 22:26:54 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -128,8 +128,8 @@ my $words_test = sub {$_[0]=~s/\s+/ ################################################################### my @gnuplot_edit_order = qw/alttag bgcolor fgcolor height width font transparent grid samples - border align texwidth texfont plotcolor plottype lmargin rmargin tmargin - bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle + border align texwidth texfont plotcolor plottype gridtype lmargin rmargin + tmargin bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle pattern solid/; my $margin_choices = ['default',0..20]; @@ -217,11 +217,11 @@ my %gnuplot_defaults = choices => ['100','200','500','1000','2000','5000'] }, align => { - default => 'center', - test => sub {$_[0]=~/^(left|right|center)$/}, + default => 'middle', + test => sub {$_[0]=~/^(left|right|middle|center)$/}, description => 'alignment for image in html', edit_type => 'choice', - choices => ['left','right','center'] + choices => ['left','right','middle'] }, texwidth => { default => '93', @@ -272,6 +272,13 @@ my %gnuplot_defaults = edit_type => 'choice', choices => ['Cartesian','Polar'] }, + gridtype => { + default => 'Cartesian', + test => sub {$_[0]=~/^(Polar|Cartesian|Linear-Log|Log-Linear|Log-Log)$/}, + description => 'Grid type:', + edit_type => 'choice', + choices => ['Cartesian','Polar','Linear-Log','Log-Linear','Log-Log'] + }, lmargin => { default => 'default', test => sub {$_[0]=~/^(default|\d+)$/}, @@ -460,7 +467,7 @@ my %axis_defaults = } ); -my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize','limit'); +my @curve_edit_order = ('color','name','linestyle','linewidth','pointtype','pointsize','limit'); my %curve_defaults = ( @@ -485,14 +492,13 @@ my %curve_defaults = edit_type => 'choice', choices => [keys(%linestyles)] }, -# gnuplots term=gif driver does not handle linewidth :( -# linewidth => { -# default => 1, -# test => $int_test, -# description => 'Line width (may not apply to all line styles)', -# edit_type => 'choice', -# choices => [1,2,3,4,5,6,7,8,9,10] -# }, + linewidth => { + default => 1, + test => $int_test, + description => 'Line width (may not apply to all line styles)', + edit_type => 'choice', + choices => [1,2,3,4,5,6,7,8,9,10] + }, pointsize => { default => 1, test => $pos_real_test, @@ -543,7 +549,9 @@ sub start_gnuplot { } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'GnuPlot'); $result .= &edit_attributes($target,$token,\%gnuplot_defaults, - \@gnuplot_edit_order); + \@gnuplot_edit_order) + .&Apache::edit::end_row() + .&Apache::edit::start_spanning_row(); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args ($token,$parstack,$safeeval,keys(%gnuplot_defaults)); @@ -581,7 +589,7 @@ sub end_gnuplot { ## return image tag for the plot if ($target eq 'web') { $result .= <<"ENDIMAGE"; - 0); + if ($target eq 'tex') { + $curve->{'linewidth'} *= 2; + } if (exists($curve->{'function'})) { $gnuplot_input.= $curve->{'function'}.' title "'. $curve->{'name'}.'" with '. $curve->{'linestyle'}; - $gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex'); + if (($curve->{'linestyle'} eq 'points') || ($curve->{'linestyle'} eq 'linespoints') || ($curve->{'linestyle'} eq 'errorbars') || @@ -1242,6 +1258,8 @@ sub write_gnuplot_file { } elsif ($curve->{'linestyle'} eq 'filledcurves') { $gnuplot_input.= ' '.$curve->{'limit'}; } + $gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; + } elsif (exists($curve->{'data'})) { # Store data values in $datatext my $datatext = ''; @@ -1265,7 +1283,6 @@ sub write_gnuplot_file { $gnuplot_input.= '"'.$datafilename.'" title "'. $curve->{'name'}.'" with '. $curve->{'linestyle'}; - $gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex'); if (($curve->{'linestyle'} eq 'points') || ($curve->{'linestyle'} eq 'linespoints') || ($curve->{'linestyle'} eq 'errorbars') || @@ -1277,6 +1294,7 @@ sub write_gnuplot_file { } elsif ($curve->{'linestyle'} eq 'filledcurves') { $gnuplot_input.= ' '.$curve->{'limit'}; } + $gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; } } # Write the output to a file.