--- loncom/xml/lonplot.pm 2007/02/21 20:34:58 1.115 +++ loncom/xml/lonplot.pm 2007/09/05 13:38:18 1.118.2.1 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.115 2007/02/21 20:34:58 albertel Exp $ +# $Id: lonplot.pm,v 1.118.2.1 2007/09/05 13:38:18 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -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', @@ -274,10 +274,10 @@ my %gnuplot_defaults = }, gridtype => { default => 'Cartesian', - test => sub {$_[0]=~/^(Polar|Cartesian)$/}, + test => sub {$_[0]=~/^(Polar|Cartesian|Linear-Log|Log-Linear|Log-Log)$/}, description => 'Grid type:', edit_type => 'choice', - choices => ['Cartesian','Polar'] + choices => ['Cartesian','Polar','Linear-Log','Log-Linear','Log-Log'] }, lmargin => { default => 'default', @@ -467,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 = ( @@ -492,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 => 4, + 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, @@ -550,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)); @@ -717,9 +718,7 @@ sub start_title { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token,'Plot Title'); my $text=&Apache::lonxml::get_all_text("/title",$parser,$style); - $result.=&Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + $result.=&Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/title",$parser); @@ -750,9 +749,7 @@ sub start_xlabel { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style); - $result.=&Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + $result.=&Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/xlabel",$parser); @@ -784,9 +781,7 @@ sub start_ylabel { } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style); - $result .= &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + $result .= &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/ylabel",$parser); @@ -858,13 +853,15 @@ sub start_curve { } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Curve'); $result .= &edit_attributes($target,$token,\%curve_defaults, - \@curve_edit_order); + \@curve_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(%curve_defaults)); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); - $result.= &Apache::edit::handle_insert(); } } return $result; @@ -902,9 +899,7 @@ sub start_function { } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function'); my $text = &Apache::lonxml::get_all_text("/function",$parser,$style); - $result .= &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + $result .= &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/function",$parser); @@ -979,9 +974,7 @@ sub start_data { } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data'); my $text = &Apache::lonxml::get_all_text("/data",$parser,$style); - $result .= &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + $result .= &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/data",$parser); @@ -1129,6 +1122,13 @@ sub write_gnuplot_file { # cartesian or polar grid? if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') { $gnuplot_input .= 'set grid polar'.$/; + } elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'linear-log') { + $gnuplot_input .= 'set logscale x'.$/; + } elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-linear') { + $gnuplot_input .= 'set logscale y'.$/; + } elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-log') { + $gnuplot_input .= 'set logscale x'.$/; + $gnuplot_input .= 'set logscale y'.$/; } else { # Assume Cartesian } @@ -1238,12 +1238,16 @@ sub write_gnuplot_file { for (my $i = 0;$i<=$#curves;$i++) { $curve = $curves[$i]; $gnuplot_input.= ', ' if ($i > 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'); + $gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; + if (($curve->{'linestyle'} eq 'points') || ($curve->{'linestyle'} eq 'linespoints') || ($curve->{'linestyle'} eq 'errorbars') || @@ -1278,7 +1282,7 @@ sub write_gnuplot_file { $gnuplot_input.= '"'.$datafilename.'" title "'. $curve->{'name'}.'" with '. $curve->{'linestyle'}; - $gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex'); + $gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; if (($curve->{'linestyle'} eq 'points') || ($curve->{'linestyle'} eq 'linespoints') || ($curve->{'linestyle'} eq 'errorbars') ||