--- loncom/xml/lonplot.pm 2004/06/28 15:42:49 1.98 +++ loncom/xml/lonplot.pm 2007/08/28 23:48:39 1.129 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.98 2004/06/28 15:42:49 matthew Exp $ +# $Id: lonplot.pm,v 1.129 2007/08/28 23:48:39 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -35,20 +35,28 @@ use Apache::File; use Apache::response; use Apache::lonxml; use Apache::edit; +use Apache::lonnet; +use LONCAPA; + + +use vars qw/$weboutputformat $version/; + -use vars qw/$weboutputformat $versionstring/; BEGIN { &Apache::lonxml::register('Apache::lonplot',('gnuplot')); # # Determine the version of GNUPLOT $weboutputformat = 'gif'; - $versionstring = `gnuplot --version`; - if ($versionstring =~ /^gnuplot 4/) { + my $versionstring = `gnuplot --version 2>/dev/null`; + ($version) = ($versionstring =~ /^gnuplot ([\d.]+)/); + if ($version >= 4) { $weboutputformat = 'png'; } + } + ## ## Description of data structures: ## @@ -97,6 +105,7 @@ my %linestyles = yerrorbars => [3,4], xyerrorbars => [4,6], boxes => 3, + filledcurves => 2, vector => 4 ); @@ -108,7 +117,7 @@ my $pos_real_test = my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-fA-F]{6}$/}; my $onoff_test = sub {$_[0]=~/^(on|off)$/}; my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/}; -my $sml_test = sub {$_[0]=~/^(small|medium|large)$/}; +my $sml_test = sub {$_[0]=~/^(\d+|small|medium|large)$/}; my $linestyle_test = sub {exists($linestyles{$_[0]})}; my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/}; @@ -118,43 +127,48 @@ 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 plottype/; + qw/alttag bgcolor fgcolor height width texwidth fontface font texfont + transparent grid samples + border align plotcolor plottype gridtype lmargin rmargin + tmargin bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle + pattern solid/; + +my $margin_choices = ['default',0..20]; my %gnuplot_defaults = ( alttag => { default => 'dynamically generated plot', test => $words_test, - description => 'brief description of the plot', + description => 'Brief description of the plot', edit_type => 'entry', size => '40' }, height => { default => 300, test => $int_test, - description => 'height of image (pixels)', + description => 'Height of image (pixels)', edit_type => 'entry', size => '10' }, width => { default => 400, test => $int_test, - description => 'width of image (pixels)', + description => 'Width of image (pixels)', edit_type => 'entry', size => '10' }, bgcolor => { default => 'xffffff', test => $color_test, - description => 'background color of image (xffffff)', + description => 'Background color of image (xffffff)', edit_type => 'entry', size => '10' }, fgcolor => { default => 'x000000', test => $color_test, - description => 'foreground color of image (x000000)', + description => 'Foreground color of image (x000000)', edit_type => 'entry', size => '10' }, @@ -170,6 +184,19 @@ my %gnuplot_defaults = description => 'Display grid', edit_type => 'onoff' }, + gridlayer => { + default => 'off', + test => $onoff_test, + description => 'Display grid front layer over filled boxes or filled curves', + edit_type => 'onoff' + }, + box_border => { + default => 'noborder', + test => sub {$_[0]=~/^(noborder|border)$/}, + description => 'Draw border for boxes', + edit_type => 'choice', + choices => ['border','noborder'] + }, border => { default => 'on', test => $onoff_test, @@ -177,13 +204,20 @@ my %gnuplot_defaults = edit_type => 'onoff' }, font => { - default => 'medium', + default => '9', test => $sml_test, - description => 'Size of font to use', + description => 'Font size to use in web output (pts)', edit_type => 'choice', - choices => ['small','medium','large'] + choices => [['5','5 (small)'],'6','7','8',['9','9 (medium)'],'10',['11','11 (large)'],'12','15'] }, - samples => { + fontface => { + default => 'sans-serif', + test => sub {$_[0]=~/^(sans-serif|serif|classic)$/}, + description => 'Type of font to use', + edit_type => 'choice', + choices => ['sans-serif','serif', 'classic'] + }, + samples => { default => '100', test => $int_test, description => 'Number of samples for non-data plots', @@ -191,11 +225,11 @@ my %gnuplot_defaults = choices => ['100','200','500','1000','2000','5000'] }, align => { - default => 'center', - test => sub {$_[0]=~/^(left|right|center)$/}, - description => 'alignment for image in html', + 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', @@ -204,20 +238,104 @@ my %gnuplot_defaults = edit_type => 'entry', size => '5' }, - texfont => { + texfont => { default => '22', test => $int_test, description => 'Font size to use in TeX output (pts):', edit_type => 'choice', choices => [qw/8 10 12 14 16 18 20 22 24 26 28 30 32 34 36/], }, - plottype => { + plotcolor => { + default => 'monochrome', + test => sub {$_[0]=~/^(monochrome|color|colour)$/}, + description => 'Color setting for printing:', + edit_type => 'choice', + choices => [qw/monochrome color colour/], + }, + pattern => { + default => '', + test => $int_test, + description => 'Pattern value for boxes:', + edit_type => 'choice', + choices => [0,1,2,3,4,5,6] + }, + solid => { + default => 0, + test => $real_test, + description => 'The density of fill style for boxes', + edit_type => 'entry', + size => '5' + }, + fillstyle => { + default => 'empty', + test => sub {$_[0]=~/^(empty|solid|pattern)$/}, + description => 'Filled style for boxes:', + edit_type => 'choice', + choices => ['empty','solid','pattern'] + }, + plottype => { default => 'Cartesian', test => sub {$_[0]=~/^(Polar|Cartesian)$/}, description => 'Plot type:', 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+)$/}, + description => 'Left margin width (pts):', + edit_type => 'choice', + choices => $margin_choices, + }, + rmargin => { + default => 'default', + test => sub {$_[0]=~/^(default|\d+)$/}, + description => 'Right margin width (pts):', + edit_type => 'choice', + choices => $margin_choices, + }, + tmargin => { + default => 'default', + test => sub {$_[0]=~/^(default|\d+)$/}, + description => 'Top margin width (pts):', + edit_type => 'choice', + choices => $margin_choices, + }, + bmargin => { + default => 'default', + test => sub {$_[0]=~/^(default|\d+)$/}, + description => 'Bottom margin width (pts):', + edit_type => 'choice', + choices => $margin_choices, + }, + boxwidth => { + default => '', + test => $real_test, + description => 'Width of boxes, default is auto', + edit_type => 'entry', + size => '5' + }, + major_ticscale => { + default => '1', + test => $real_test, + description => 'Size of major tic marks (plot coordinates)', + edit_type => 'entry', + size => '5' + }, + minor_ticscale => { + default => '0.5', + test => $real_test, + description => 'Size of minor tic mark (plot coordinates)', + edit_type => 'entry', + size => '5' + }, ); my %key_defaults = @@ -238,7 +356,7 @@ my %key_defaults = pos => { default => 'top right', test => $key_pos_test, - description => 'position of the key on the plot', + description => 'Position of the key on the plot', edit_type => 'choice', choices => ['top left','top right','bottom left','bottom right', 'outside','below'] @@ -250,14 +368,14 @@ my %label_defaults = xpos => { default => 0, test => $real_test, - description => 'x position of label (graph coordinates)', + description => 'X position of label (graph coordinates)', edit_type => 'entry', size => '10' }, ypos => { default => 0, test => $real_test, - description => 'y position of label (graph coordinates)', + description => 'Y position of label (graph coordinates)', edit_type => 'entry', size => '10' }, @@ -284,7 +402,7 @@ my %tic_defaults = mirror => { default => 'on', test => $onoff_test, - description => 'mirror tics on opposite axis?', + description => 'Mirror tics on opposite axis?', edit_type => 'onoff' }, start => { @@ -323,55 +441,55 @@ my %axis_defaults = color => { default => 'x000000', test => $color_test, - description => 'color of grid lines (x000000)', + description => 'Color of grid lines (x000000)', edit_type => 'entry', size => '10' }, xmin => { default => '-10.0', test => $real_test, - description => 'minimum x-value shown in plot', + description => 'Minimum x-value shown in plot', edit_type => 'entry', size => '10' }, xmax => { default => ' 10.0', test => $real_test, - description => 'maximum x-value shown in plot', + description => 'Maximum x-value shown in plot', edit_type => 'entry', size => '10' }, ymin => { default => '-10.0', test => $real_test, - description => 'minimum y-value shown in plot', + description => 'Minimum y-value shown in plot', edit_type => 'entry', size => '10' }, ymax => { default => ' 10.0', test => $real_test, - description => 'maximum y-value shown in plot', + description => 'Maximum y-value shown in plot', edit_type => 'entry', size => '10' } ); -my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize'); +my @curve_edit_order = ('color','name','linestyle','linewidth','pointtype','pointsize','limit'); my %curve_defaults = ( color => { default => 'x000000', test => $color_test, - description => 'color of curve (x000000)', + description => 'Color of curve (x000000)', edit_type => 'entry', size => '10' }, name => { default => '', test => $words_test, - description => 'name of curve to appear in key', + description => 'Name of curve to appear in key', edit_type => 'entry', size => '20' }, @@ -382,28 +500,34 @@ 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 => 2, + 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, - description => 'point size (may not apply to all line styles)', + description => 'Point size (may not apply to all line styles)', edit_type => 'entry', size => '5' }, pointtype => { default => 1, test => $int_test, - description => 'point type (may not apply to all line styles)', + description => 'Point type (may not apply to all line styles)', edit_type => 'choice', choices => [0,1,2,3,4,5,6] - } + }, + limit => { + default => 'closed', + test => sub {$_[0]=~/^(closed|x1|x2|y1|y2)$/}, + description => 'Point to fill -- for filledcurves', + edit_type => 'choice', + choices => ['closed','x1','x2','y1','y2'] + }, ); ################################################################### @@ -411,10 +535,12 @@ my %curve_defaults = ## parsing and edit rendering ## ## ## ################################################################### -my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics); + +undef %Apache::lonplot::plot; +my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics); sub start_gnuplot { - undef(%plot); undef(%key); undef(%axis); + undef(%Apache::lonplot::plot); undef(%key); undef(%axis); undef($title); undef($xlabel); undef($ylabel); undef(@labels); undef(@curves); undef(%xtics); undef(%ytics); @@ -426,12 +552,14 @@ sub start_gnuplot { 'xtics','ytics')); push (@Apache::lonxml::namespace,'lonplot'); if ($target eq 'web' || $target eq 'tex') { - &get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval, + &get_attributes(\%Apache::lonplot::plot,\%gnuplot_defaults,$parstack,$safeeval, $tagstack->[-1]); } 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)); @@ -461,24 +589,28 @@ sub end_gnuplot { ## ## Determine filename my $tmpdir = '/home/httpd/perl/tmp/'; - my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}. + my $filename = $env{'user.name'}.'_'.$env{'user.domain'}. '_'.time.'_'.$$.$randnumber.'_plot'; ## Write the plot description to the file &write_gnuplot_file($tmpdir,$filename,$target); - $filename = &Apache::lonnet::escape($filename); + $filename = &escape($filename); ## return image tag for the plot if ($target eq 'web') { $result .= <<"ENDIMAGE"; -$plot{'alttag'} +$Apache::lonplot::plot{'alttag'} ENDIMAGE } elsif ($target eq 'tex') { + &Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}"); + &Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}"); #might be inside the safe space, register the URL for later &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps"); - $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$plot{'texwidth'}.' mm]{'.&Apache::lonnet::unescape($filename).'.eps}'; + $result = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n"; + $result .= '\graphicspath{{/home/httpd/perl/tmp/}}'."\n"; + $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}'; } } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); @@ -549,6 +681,51 @@ sub end_ytics { return $result; } +##-----------------------------------------------------------------font +my %font_properties = + ( + 'classic' => { + face => 'classic', + file => 'DejaVuSansMono-Bold', + printname => 'Helvetica', + tex_no_file => 1, + }, + 'sans-serif' => { + face => 'sans-serif', + file => 'DejaVuSans', + printname => 'DejaVuSans', + }, + 'serif' => { + face => 'serif', + file => 'DejaVuSerif', + printname => 'DejaVuSerif', + }, + ); + +sub get_font { + my ($target) = @_; + my ($size, $selected_font); + + if ( $Apache::lonplot::plot{'font'} =~ /^(small|medium|large)/) { + $selected_font = $font_properties{'classic'}; + if ( $Apache::lonplot::plot{'font'} eq 'small') { + $size = '5'; + } elsif ( $Apache::lonplot::plot{'font'} eq 'medium') { + $size = '9'; + } elsif ( $Apache::lonplot::plot{'font'} eq 'large') { + $size = '11'; + } else { + $size = '9'; + } + } else { + $size = $Apache::lonplot::plot{'font'}; + $selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}}; + } + if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) { + $size = $Apache::lonplot::plot{'texfont'}; + } + return ($size, $selected_font); +} ##----------------------------------------------------------------- key sub start_key { @@ -580,23 +757,63 @@ sub end_key { return $result; } +sub parse_label { + my ($target,$text) = @_; + my $parser=HTML::LCParser->new(\$text); + my $result; + while (my $token=$parser->get_token) { + if ($token->[0] eq 'S') { + if ($token->[1] eq 'sub') { + $result .= '_{'; + } elsif ($token->[1] eq 'sup') { + $result .= '^{'; + } else { + $result .= $token->[4]; + } + } elsif ($token->[0] eq 'E') { + if ($token->[1] eq 'sub' + || $token->[1] eq 'sup') { + $result .= '}'; + } else { + $result .= $token->[2]; + } + } elsif ($token->[0] eq 'T') { + $result .= &replace_entities($target,$token->[1]); + } + } + return $result; +} + + +my %lookup = + ('(pi|#960)' => {'tex' => '{/Symbol p}', 'web' => "\x{3C0}"},); + +sub replace_entities { + my ($target,$text) = @_; + $text =~ s{([_^~\{\}]|\\\\)}{\\\\$1}g; + while (my ($re, $replace) = each(%lookup)) { + $text =~ s/&$re;/$replace->{$target}/g; + } + $text =~ s{(&)}{\\\\$1}g; + return $text; +} + ##------------------------------------------------------------------- title sub start_title { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; if ($target eq 'web' || $target eq 'tex') { - $title = &Apache::lonxml::get_all_text("/title",$parser); + $title = &Apache::lonxml::get_all_text("/title",$parser,$style); $title=&Apache::run::evaluate($title,$safeeval,$$parstack[-1]); $title =~ s/\n/ /g; if (length($title) > $max_str_len) { $title = substr($title,0,$max_str_len); } + $title = &parse_label($target,$title); } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token,'Plot Title'); - my $text=&Apache::lonxml::get_all_text("/title",$parser); - $result.=&Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + my $text=&Apache::lonxml::get_all_text("/title",$parser,$style); + $result.=&Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/title",$parser); @@ -618,18 +835,17 @@ sub start_xlabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; if ($target eq 'web' || $target eq 'tex') { - $xlabel = &Apache::lonxml::get_all_text("/xlabel",$parser); + $xlabel = &Apache::lonxml::get_all_text("/xlabel",$parser,$style); $xlabel=&Apache::run::evaluate($xlabel,$safeeval,$$parstack[-1]); $xlabel =~ s/\n/ /g; if (length($xlabel) > $max_str_len) { $xlabel = substr($xlabel,0,$max_str_len); } + $xlabel = &parse_label($target,$xlabel); } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel'); - my $text=&Apache::lonxml::get_all_text("/xlabel",$parser); - $result.=&Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style); + $result.=&Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/xlabel",$parser); @@ -652,18 +868,17 @@ sub start_ylabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; if ($target eq 'web' || $target eq 'tex') { - $ylabel = &Apache::lonxml::get_all_text("/ylabel",$parser); + $ylabel = &Apache::lonxml::get_all_text("/ylabel",$parser,$style); $ylabel = &Apache::run::evaluate($ylabel,$safeeval,$$parstack[-1]); $ylabel =~ s/\n/ /g; if (length($ylabel) > $max_str_len) { $ylabel = substr($ylabel,0,$max_str_len); } + $ylabel = &parse_label($target,$ylabel); } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel'); - my $text = &Apache::lonxml::get_all_text("/ylabel",$parser); - $result .= &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style); + $result .= &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/ylabel",$parser); @@ -689,16 +904,16 @@ sub start_label { my %label; &get_attributes(\%label,\%label_defaults,$parstack,$safeeval, $tagstack->[-1]); - my $text = &Apache::lonxml::get_all_text("/label",$parser); + my $text = &Apache::lonxml::get_all_text("/label",$parser,$style); $text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]); $text =~ s/\n/ /g; $text = substr($text,0,$max_str_len) if (length($text) > $max_str_len); - $label{'text'} = $text; + $label{'text'} = &parse_label($target,$text); push(@labels,\%label); } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Plot Label'); $result .= &edit_attributes($target,$token,\%label_defaults); - my $text = &Apache::lonxml::get_all_text("/label",$parser); + my $text = &Apache::lonxml::get_all_text("/label",$parser,$style); $result .= &Apache::edit::end_row(). &Apache::edit::start_spanning_row(). &Apache::edit::editline('',$text,'',60); @@ -735,13 +950,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; @@ -772,15 +989,14 @@ sub start_function { 'curve function declaration.'); delete $curves[-1]->{'data'} ; } - my $function = &Apache::lonxml::get_all_text("/function",$parser); + my $function = &Apache::lonxml::get_all_text("/function",$parser, + $style); $function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]); $curves[-1]->{'function'} = $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); - $result .= &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + my $text = &Apache::lonxml::get_all_text("/function",$parser,$style); + $result .= &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/function",$parser); @@ -811,7 +1027,7 @@ sub start_data { 'curve data declaration.'); delete($curves[-1]->{'function'}); } - my $datatext = &Apache::lonxml::get_all_text("/data",$parser); + my $datatext = &Apache::lonxml::get_all_text("/data",$parser,$style); $datatext=&Apache::run::evaluate($datatext,$safeeval,$$parstack[-1]); # Deal with cases where we're given an array... if ($datatext =~ /^\@/) { @@ -854,10 +1070,8 @@ sub start_data { push @{$curves[-1]->{'data'}},\@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); - $result .= &Apache::edit::end_row(). - &Apache::edit::start_spanning_row(). - &Apache::edit::editline('',$text,'',60); + my $text = &Apache::lonxml::get_all_text("/data",$parser,$style); + $result .= &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); $result.=&Apache::edit::modifiedfield("/data",$parser); @@ -951,57 +1165,138 @@ sub get_attributes{ ##------------------------------------------------------- write_gnuplot_file sub write_gnuplot_file { my ($tmpdir,$filename,$target)= @_; + my ($fontsize, $font_properties) = &get_font($target); my $gnuplot_input = ''; my $curve; - my $pt = $plot{'texfont'}; + # + # Check to be sure we do not have any empty curves + my @curvescopy; + foreach my $curve (@curves) { + if (exists($curve->{'function'})) { + if ($curve->{'function'} !~ /^\s*$/) { + push(@curvescopy,$curve); + } + } elsif (exists($curve->{'data'})) { + foreach my $data (@{$curve->{'data'}}) { + if (scalar(@$data) > 0) { + push(@curvescopy,$curve); + last; + } + } + } + } + @curves = @curvescopy; # Collect all the colors my @Colors; - push @Colors, $plot{'bgcolor'}; - push @Colors, $plot{'fgcolor'}; - push @Colors, (defined($axis{'color'})?$axis{'color'}:$plot{'fgcolor'}); + push @Colors, $Apache::lonplot::plot{'bgcolor'}; + push @Colors, $Apache::lonplot::plot{'fgcolor'}; + push @Colors, (defined($axis{'color'})?$axis{'color'}:$Apache::lonplot::plot{'fgcolor'}); foreach $curve (@curves) { push @Colors, ($curve->{'color'} ne '' ? $curve->{'color'} : - $plot{'fgcolor'} ); + $Apache::lonplot::plot{'fgcolor'} ); } # set term if ($target eq 'web') { - $gnuplot_input .= 'set term gif '; - $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on'); - $gnuplot_input .= $plot{'font'} . ' '; - $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' '; + $gnuplot_input .= 'set terminal png enhanced nocrop '; + $gnuplot_input .= 'transparent ' if ($Apache::lonplot::plot{'transparent'} eq 'on'); + $gnuplot_input .= 'font "'.$Apache::lonnet::perlvar{'lonFontsDir'}. + '/'.$font_properties->{'file'}.'.ttf" '; + $gnuplot_input .= $fontsize; + $gnuplot_input .= ' size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' '; $gnuplot_input .= "@Colors\n"; # set output $gnuplot_input .= "set output\n"; } elsif ($target eq 'tex') { - $gnuplot_input .= "set term postscript eps monochrome solid \"Helvetica\" $pt \n"; - $gnuplot_input .= "set output \"/home/httpd/perl/tmp/". - &Apache::lonnet::unescape($filename).".eps\"\n"; + $gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} solid "; + if (!$font_properties->{'tex_no_file'}) { + $gnuplot_input .= + 'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}. + '/'.$font_properties->{'file'}.'.pfb" '; + } + $gnuplot_input .= ' "'.$font_properties->{'printname'}.'" '; + $gnuplot_input .= $fontsize; + $gnuplot_input .= "\nset output \"/home/httpd/perl/tmp/". + &unescape($filename).".eps\"\n"; } - # cartesian or polar? - if (lc($plot{'plottype'}) eq 'polar') { + # cartesian or polar plot? + if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') { $gnuplot_input .= 'set polar'.$/; } else { # Assume Cartesian } + # 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 + } + # solid or pattern for boxes? + if (lc($Apache::lonplot::plot{'fillstyle'}) eq 'solid') { + $gnuplot_input .= 'set style fill solid '. + $Apache::lonplot::plot{'solid'}.$Apache::lonplot::plot{'box_border'}.$/; + } elsif (lc($Apache::lonplot::plot{'fillstyle'}) eq 'pattern') { + $gnuplot_input .= 'set style fill pattern '.$Apache::lonplot::plot{'pattern'}.$Apache::lonplot::plot{'box_border'}.$/; + } elsif (lc($Apache::lonplot::plot{'fillstyle'}) eq 'empty') { + } + # margin + if (lc($Apache::lonplot::plot{'lmargin'}) ne 'default') { + $gnuplot_input .= 'set lmargin '.$Apache::lonplot::plot{'lmargin'}.$/; + } + if (lc($Apache::lonplot::plot{'rmargin'}) ne 'default') { + $gnuplot_input .= 'set rmargin '.$Apache::lonplot::plot{'rmargin'}.$/; + } + if (lc($Apache::lonplot::plot{'tmargin'}) ne 'default') { + $gnuplot_input .= 'set tmargin '.$Apache::lonplot::plot{'tmargin'}.$/; + } + if (lc($Apache::lonplot::plot{'bmargin'}) ne 'default') { + $gnuplot_input .= 'set bmargin '.$Apache::lonplot::plot{'bmargin'}.$/; + } + + # tic scales + if ($version > 4) { + $gnuplot_input .= 'set tics scale '. + $Apache::lonplot::plot{'major_ticscale'}.', '.$Apache::lonplot::plot{'minor_ticscale'}.$/; + } else { + $gnuplot_input .= 'set ticscale '. + $Apache::lonplot::plot{'major_ticscale'}.' '.$Apache::lonplot::plot{'minor_ticscale'}.$/; + } + #boxwidth + if (lc($Apache::lonplot::plot{'boxwidth'}) ne '') { + $gnuplot_input .= 'set boxwidth '.$Apache::lonplot::plot{'boxwidth'}.$/; + } + # gridlayer + $gnuplot_input .= 'set grid noxtics noytics front '.$/ + if ($Apache::lonplot::plot{'gridlayer'} eq 'on'); + # grid - $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on'); + $gnuplot_input .= 'set grid'.$/ if ($Apache::lonplot::plot{'grid'} eq 'on'); # border - $gnuplot_input .= ($plot{'border'} eq 'on'? + $gnuplot_input .= ($Apache::lonplot::plot{'border'} eq 'on'? 'set border'.$/ : 'set noborder'.$/ ); # sampling rate for non-data curves - $gnuplot_input .= "set samples $plot{'samples'}\n"; + $gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n"; # title, xlabel, ylabel # titles + my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : ''; + my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : ''; + if ($target eq 'tex') { - $gnuplot_input .= "set title \"$title\" font \"Helvetica,".$pt."pt\"\n" if (defined($title)) ; - $gnuplot_input .= "set xlabel \"$xlabel\" font \"Helvetica,".$pt."pt\" \n" if (defined($xlabel)); - $gnuplot_input .= "set ylabel \"$ylabel\" font \"Helvetica,".$pt."pt\"\n" if (defined($ylabel)); + $gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ; + $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel)); + $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel)); } else { - $gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ; - $gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel)); - $gnuplot_input .= "set ylabel \"$ylabel\" \n" if (defined($ylabel)); + $gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ; + $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel)); + $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel)); } # tics if (%xtics) { @@ -1043,23 +1338,31 @@ sub write_gnuplot_file { my $label; foreach $label (@labels) { $gnuplot_input .= 'set label "'.$label->{'text'}.'" at '. - $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.' font "Helvetica,'.$pt.'pt"'.$/ ; + $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}; + if ($target eq 'tex') { + $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ; + } + $gnuplot_input .= $/; } if ($target eq 'tex') { - $gnuplot_input .="set size 1,".$plot{'height'}/$plot{'width'}*1.38; + $gnuplot_input .="set size 1,".$Apache::lonplot::plot{'height'}/$Apache::lonplot::plot{'width'}*1.38; $gnuplot_input .="\n"; - } + } # curves $gnuplot_input .= 'plot '; 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') || @@ -1068,6 +1371,8 @@ sub write_gnuplot_file { ($curve->{'linestyle'} eq 'xyerrorbars')) { $gnuplot_input.=' pointtype '.$curve->{'pointtype'}; $gnuplot_input.=' pointsize '.$curve->{'pointsize'}; + } elsif ($curve->{'linestyle'} eq 'filledcurves') { + $gnuplot_input.= ' '.$curve->{'limit'}; } } elsif (exists($curve->{'data'})) { # Store data values in $datatext @@ -1087,12 +1392,12 @@ sub write_gnuplot_file { } # write file print $fh $datatext; - close ($fh); + close($fh); # generate gnuplot text $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') || @@ -1101,11 +1406,14 @@ sub write_gnuplot_file { ($curve->{'linestyle'} eq 'xyerrorbars')) { $gnuplot_input.=' pointtype '.$curve->{'pointtype'}; $gnuplot_input.=' pointsize '.$curve->{'pointsize'}; + } elsif ($curve->{'linestyle'} eq 'filledcurves') { + $gnuplot_input.= ' '.$curve->{'limit'}; } } } # Write the output to a file. - my $fh=Apache::File->new(">$tmpdir$filename.data"); + open (my $fh,">$tmpdir$filename.data"); + binmode($fh, ":utf8"); print $fh $gnuplot_input; close($fh); # That's all folks. @@ -1116,7 +1424,7 @@ sub write_gnuplot_file { sub check_inputs { ## Note: no inputs, no outputs - this acts only on global variables. ## Make sure we have all the input we need: - if (! %plot) { &set_defaults(\%plot,\%gnuplot_defaults); } + if (! %Apache::lonplot::plot) { &set_defaults(\%Apache::lonplot::plot,\%gnuplot_defaults); } if (! %key ) {} # No key for this plot, thats okay # if (! %axis) { &set_defaults(\%axis,\%axis_defaults); } if (! defined($title )) {} # No title for this plot, thats okay @@ -1154,10 +1462,10 @@ sub edit_attributes { ($description,$attr,$token, $defaults->{$attr}->{'size'}); } elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') { - $result .= &Apache::edit::select_arg + $result .= &Apache::edit::select_or_text_arg ($description,$attr,$defaults->{$attr}->{'choices'},$token); } elsif ($defaults->{$attr}->{'edit_type'} eq 'onoff') { - $result .= &Apache::edit::select_arg + $result .= &Apache::edit::select_or_text_arg ($description,$attr,['on','off'],$token); } $result .= '
';