--- loncom/xml/lonplot.pm 2002/01/28 14:12:34 1.45
+++ loncom/xml/lonplot.pm 2007/07/30 21:50:29 1.120
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.45 2002/01/28 14:12:34 matthew Exp $
+# $Id: lonplot.pm,v 1.120 2007/07/30 21:50:29 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -25,24 +25,38 @@
#
# http://www.lon-capa.org/
#
-# 12/15/01 Matthew
-# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew
-# 01/01/02 Matthew
-# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew
-# 01/21 Matthew
package Apache::lonplot;
use strict;
+use warnings FATAL=>'all';
+no warnings 'uninitialized';
use Apache::File;
use Apache::response;
use Apache::lonxml;
use Apache::edit;
+use Apache::lonnet;
+use lib '/home/httpd/lib/perl/';
+use LONCAPA;
+
+
+use vars qw/$weboutputformat $versionstring/;
+
+
BEGIN {
- &Apache::lonxml::register('Apache::lonplot',('plot'));
+ &Apache::lonxml::register('Apache::lonplot',('gnuplot'));
+ #
+ # Determine the version of GNUPLOT
+ $weboutputformat = 'gif';
+ $versionstring = `gnuplot --version 2>/dev/null`;
+ if ($versionstring =~ /^gnuplot 4/) {
+ $weboutputformat = 'png';
+ }
+
}
+
##
## Description of data structures:
##
@@ -91,57 +105,69 @@ my %linestyles =
yerrorbars => [3,4],
xyerrorbars => [4,6],
boxes => 3,
-# boxerrorbars => [3,4,5],
-# boxxyerrorbars => [4,6,7],
-# financebars => 5,
-# candlesticks => 5,
+ filledcurves => 2,
vector => 4
);
my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/};
my $real_test =
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/};
-my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/};
+my $pos_real_test =
+ sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d*\.?\d*([eE][+-]\d+)?$/};
+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\(\)]+ ?)+$/};
+my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};
###################################################################
## ##
## Attribute metadata ##
## ##
###################################################################
-my @plot_edit_order =
- qw/bgcolor fgcolor height width font transparent grid border align/;
-my %plot_defaults =
+my @gnuplot_edit_order =
+ qw/alttag bgcolor fgcolor height width fontface font transparent grid samples
+ 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];
+
+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)',
+ description => 'Height of image (pixels)',
edit_type => 'entry',
size => '10'
},
width => {
- default => 200,
+ 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'
},
@@ -152,11 +178,24 @@ my %plot_defaults =
edit_type => 'onoff'
},
grid => {
- default => 'off',
+ default => 'on',
test => $onoff_test,
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,
@@ -164,19 +203,138 @@ my %plot_defaults =
edit_type => 'onoff'
},
font => {
- default => 'medium',
+ default => '9',
test => $sml_test,
description => 'Size of font to use',
edit_type => 'choice',
- choices => ['small','medium','large']
+ choices => [['5','5 (small)'],'7',['9','9 (medium)'],'10','12',['15','15 (large)']]
+ },
+ 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',
+ edit_type => 'choice',
+ choices => ['100','200','500','1000','2000','5000']
},
align => {
- default => 'left',
- 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',
+ test => $int_test,
+ description => 'Width of plot when printed (mm)',
+ edit_type => 'entry',
+ size => '5'
+ },
+ 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/],
+ },
+ 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 =
@@ -197,7 +355,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']
@@ -209,14 +367,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'
},
@@ -229,97 +387,108 @@ my %label_defaults =
}
);
-my @tic_edit_order = ('location','mirror','start','increment','end');
+my @tic_edit_order = ('location','mirror','start','increment','end',
+ 'minorfreq');
my %tic_defaults =
(
location => {
default => 'border',
test => sub {$_[0]=~/^(border|axis)$/},
- description => 'Location of tick marks',
+ description => 'Location of major tic marks',
edit_type => 'choice',
choices => ['border','axis']
},
mirror => {
default => 'on',
test => $onoff_test,
- description => 'mirror ticks on opposite axis?',
+ description => 'Mirror tics on opposite axis?',
edit_type => 'onoff'
},
start => {
default => '-10.0',
test => $real_test,
- description => 'Start ticks at',
+ description => 'Start major tics at',
edit_type => 'entry',
size => '10'
},
increment => {
default => '1.0',
test => $real_test,
- description => 'Place a tick every',
+ description => 'Place a major tic every',
edit_type => 'entry',
size => '10'
},
end => {
default => ' 10.0',
test => $real_test,
- description => 'Stop ticks at ',
+ description => 'Stop major tics at ',
edit_type => 'entry',
size => '10'
},
+ minorfreq => {
+ default => '0',
+ test => $int_test,
+ description => 'Number of minor tics per major tic mark',
+ edit_type => 'entry',
+ size => '10'
+ },
);
+my @axis_edit_order = ('color','xmin','xmax','ymin','ymax');
my %axis_defaults =
(
color => {
default => 'x000000',
test => $color_test,
- description => 'color of axes (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','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'
},
@@ -329,7 +498,35 @@ my %curve_defaults =
description => 'Line style',
edit_type => 'choice',
choices => [keys(%linestyles)]
- }
+ },
+ 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,
+ 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)',
+ 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']
+ },
);
###################################################################
@@ -337,13 +534,15 @@ my %curve_defaults =
## parsing and edit rendering ##
## ##
###################################################################
-my (%plot,%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
-sub start_plot {
- %plot = (); %key = (); %axis = ();
- $title = undef; $xlabel = undef; $ylabel = undef;
- $#labels = -1; $#curves = -1;
- %xtics = (); %ytics = ();
+undef %Apache::lonplot::plot;
+my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
+
+sub start_gnuplot {
+ undef(%Apache::lonplot::plot); undef(%key); undef(%axis);
+ undef($title); undef($xlabel); undef($ylabel);
+ undef(@labels); undef(@curves);
+ undef(%xtics); undef(%ytics);
#
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
@@ -351,19 +550,18 @@ sub start_plot {
('title','xlabel','ylabel','key','axis','label','curve',
'xtics','ytics'));
push (@Apache::lonxml::namespace,'lonplot');
- if ($target eq 'web') {
- my $inside = &Apache::lonxml::get_all_text("/plot",$$parser[-1]);
- $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
- &Apache::lonxml::newparser($parser,\$inside);
- &get_attributes(\%plot,\%plot_defaults,$parstack,$safeeval,
+ if ($target eq 'web' || $target eq 'tex') {
+ &get_attributes(\%Apache::lonplot::plot,\%gnuplot_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
- $result .= &Apache::edit::tag_start($target,$token,'Plot');
- $result .= &edit_attributes($target,$token,\%plot_defaults,
- \@plot_edit_order);
+ $result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
+ $result .= &edit_attributes($target,$token,\%gnuplot_defaults,
+ \@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(%plot_defaults));
+ ($token,$parstack,$safeeval,keys(%gnuplot_defaults));
if ($constructtag) {
$result = &Apache::edit::rebuild_tag($token);
}
@@ -371,30 +569,48 @@ sub start_plot {
return $result;
}
-sub end_plot {
+sub end_gnuplot {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
-
pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::lonplot',
('title','xlabel','ylabel','key','axis','label','curve'));
my $result = '';
- if ($target eq 'web') {
+ my $randnumber;
+ # need to call rand everytime start_script would evaluate, as the
+ # safe space rand number generator and the global rand generator
+ # are not separate
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'answer') {
+ $randnumber=int(rand(1000));
+ }
+ if ($target eq 'web' || $target eq 'tex') {
&check_inputs(); # Make sure we have all the data we need
##
## Determine filename
my $tmpdir = '/home/httpd/perl/tmp/';
- my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
- '_'.time.'_'.$$.int(rand(1000)).'_plot.data';
+ my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
+ '_'.time.'_'.$$.$randnumber.'_plot';
## Write the plot description to the file
- &write_gnuplot_file($tmpdir,$filename);
+ &write_gnuplot_file($tmpdir,$filename,$target);
+ $filename = &escape($filename);
## return image tag for the plot
- $result .= <<"ENDIMAGE";
-
+ if ($target eq 'web') {
+ $result .= <<"ENDIMAGE";
+
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 = "%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);
}
@@ -406,7 +622,7 @@ ENDIMAGE
sub start_xtics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -426,7 +642,7 @@ sub start_xtics {
sub end_xtics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -437,7 +653,7 @@ sub end_xtics {
sub start_ytics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -457,19 +673,58 @@ sub start_ytics {
sub end_ytics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
return $result;
}
+##-----------------------------------------------------------------font
+my %font_properties =
+ (
+ 'classic' => {
+ face => 'classic',
+ file => 'DejaVuSansMono-Bold',
+ printname => 'Helvetica',
+ },
+ 'sans-serif' => {
+ face => 'sans-serif',
+ file => 'DejaVuSans',
+ printname => 'DejaVuSans',
+ },
+ 'serif' => {
+ face => 'serif',
+ file => 'DejaVuSerif',
+ printname => 'DejaVuSerif',
+ },
+ );
+
+sub get_font {
+ 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 = '15';
+ } else {
+ $size = '9';
+ }
+ } else {
+ $selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
+ }
+ return ($size, $selected_font);
+}
##----------------------------------------------------------------- key
sub start_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%key,\%key_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
@@ -488,7 +743,7 @@ sub start_key {
sub end_key {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -499,21 +754,20 @@ sub end_key {
sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
- $title = &Apache::lonxml::get_all_text("/title",$$parser[-1]);
+ if ($target eq 'web' || $target eq 'tex') {
+ $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);
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
- my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);
- $result.=&Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
+ $result.=&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
- my $text=$$parser[-1]->get_text("/title");
$result.=&Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/title",$parser);
}
return $result;
}
@@ -521,7 +775,7 @@ sub start_title {
sub end_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -531,21 +785,20 @@ sub end_title {
sub start_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
- $xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
+ if ($target eq 'web' || $target eq 'tex') {
+ $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);
}
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
- my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
- $result.=&Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
+ $result.=&Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
- my $text=$$parser[-1]->get_text("/xlabel");
$result.=&Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/xlabel",$parser);
}
return $result;
}
@@ -553,7 +806,7 @@ sub start_xlabel {
sub end_xlabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -564,21 +817,20 @@ sub end_xlabel {
sub start_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
- $ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
+ if ($target eq 'web' || $target eq 'tex') {
+ $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);
}
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
- my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
- $result .= &Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
+ $result .= &Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
- my $text=$$parser[-1]->get_text("/ylabel");
$result.=&Apache::edit::rebuild_tag($token);
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/ylabel",$parser);
}
return $result;
}
@@ -586,7 +838,7 @@ sub start_ylabel {
sub end_ylabel {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -597,27 +849,28 @@ sub end_ylabel {
sub start_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
my %label;
&get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
$tagstack->[-1]);
- my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
+ 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;
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[-1]);
+ my $text = &Apache::lonxml::get_all_text("/label",$parser,$style);
$result .= &Apache::edit::end_row().
&Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ &Apache::edit::editline('',$text,'',60);
} elsif ($target eq 'modified') {
&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%label_defaults));
$result.=&Apache::edit::rebuild_tag($token);
- my $text=$$parser[-1]->get_text("/label");
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/label",$parser);
}
return $result;
}
@@ -625,7 +878,7 @@ sub start_label {
sub end_label {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -638,20 +891,23 @@ sub start_curve {
my $result='';
&Apache::lonxml::register('Apache::lonplot',('function','data'));
push (@Apache::lonxml::namespace,'curve');
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
my %curve;
&get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval,
$tagstack->[-1]);
push (@curves,\%curve);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Curve');
- $result .= &edit_attributes($target,$token,\%curve_defaults);
+ $result .= &edit_attributes($target,$token,\%curve_defaults,
+ \@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;
@@ -662,7 +918,7 @@ sub end_curve {
my $result = '';
pop @Apache::lonxml::namespace;
&Apache::lonxml::deregister('Apache::lonplot',('function','data'));
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -673,23 +929,26 @@ sub end_curve {
sub start_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
if (exists($curves[-1]->{'data'})) {
- &Apache::lonxml::warning('Use of precludes use of . The will be omitted in favor of the declaration.');
+ &Apache::lonxml::warning
+ ('Use of the curve function tag precludes use of '.
+ ' the curve data tag. '.
+ 'The curve data tag will be omitted in favor of the '.
+ 'curve function declaration.');
delete $curves[-1]->{'data'} ;
}
- $curves[-1]->{'function'} =
- &Apache::lonxml::get_all_text("/function",$$parser[-1]);
+ 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[-1]);
- $result .= &Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ 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);
- my $text=$$parser[-1]->get_text("/function");
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/function",$parser);
}
return $result;
}
@@ -697,7 +956,7 @@ sub start_function {
sub end_function {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::end_table();
}
@@ -708,41 +967,44 @@ sub end_function {
sub start_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
if (exists($curves[-1]->{'function'})) {
- &Apache::lonxml::warning('Use of precludes use of .'.
- '. The will be omitted in favor of '.
- 'the declaration.');
+ &Apache::lonxml::warning
+ ('Use of the curve function tag precludes use of '.
+ ' the curve data tag. '.
+ 'The curve function tag will be omitted in favor of the '.
+ 'curve data declaration.');
delete($curves[-1]->{'function'});
}
- my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
+ 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 =~ /^\@/) {
$datatext = &Apache::run::run('return "'.$datatext.'"',
$safeeval,1);
}
- $datatext =~ s/\s+/ /g;
+ $datatext =~ s/\s+/ /g;
# Need to do some error checking on the @data array -
# make sure it's all numbers and make sure each array
# is of the same length.
my @data;
if ($datatext =~ /,/) { # comma deliminated
@data = split /,/,$datatext;
- } else { # Assume it's space seperated.
+ } else { # Assume it's space separated.
@data = split / /,$datatext;
}
for (my $i=0;$i<=$#data;$i++) {
# Check that it's non-empty
if (! defined($data[$i])) {
&Apache::lonxml::warning(
- 'undefined value. Replacing with '.
+ 'undefined curve data value. Replacing with '.
' pi/e = 1.15572734979092');
$data[$i] = 1.15572734979092;
}
# Check that it's a number
if (! &$real_test($data[$i]) & ! &$int_test($data[$i])) {
&Apache::lonxml::warning(
- 'Bad value of '.$data[$i].' Replacing with '.
+ 'Bad curve data value of '.$data[$i].' Replacing with '.
' pi/e = 1.15572734979092');
$data[$i] = 1.15572734979092;
}
@@ -757,14 +1019,11 @@ 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[-1]);
- $result .= &Apache::edit::end_row().
- &Apache::edit::start_spanning_row().
- &Apache::edit::editfield('',$text,'',60,1);
+ 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);
- my $text=$$parser[-1]->get_text("/data");
- $result.=&Apache::edit::modifiedfield($token);
+ $result.=&Apache::edit::modifiedfield("/data",$parser);
}
return $result;
}
@@ -772,7 +1031,7 @@ sub start_data {
sub end_data {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result .= &Apache::edit::end_table();
}
@@ -783,12 +1042,13 @@ sub end_data {
sub start_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
$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));
@@ -802,7 +1062,7 @@ sub start_axis {
sub end_axis {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'tex') {
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
} elsif ($target eq 'modified') {
@@ -829,8 +1089,13 @@ sub set_defaults {
sub get_attributes{
my ($values,$defaults,$parstack,$safeeval,$tag) = @_;
foreach my $attr (keys(%{$defaults})) {
- $values->{$attr} =
- &Apache::lonxml::get_param($attr,$parstack,$safeeval);
+ if ($attr eq 'texwidth' || $attr eq 'texfont') {
+ $values->{$attr} =
+ &Apache::lonxml::get_param($attr,$parstack,$safeeval,undef,1);
+ } else {
+ $values->{$attr} =
+ &Apache::lonxml::get_param($attr,$parstack,$safeeval);
+ }
if ($values->{$attr} eq '' | !defined($values->{$attr})) {
$values->{$attr} = $defaults->{$attr}->{'default'};
next;
@@ -848,51 +1113,150 @@ sub get_attributes{
##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {
- my ($tmpdir,$filename)= @_;
+ my ($tmpdir,$filename,$target)= @_;
+ my ($fontsize, $font_properties) = &get_font();
my $gnuplot_input = '';
my $curve;
+ my $pt = $Apache::lonplot::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
- $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 .= "@Colors\n";
- # set output
- $gnuplot_input .= "set output\n";
+ if ($target eq 'web') {
+ $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 enhanced $Apache::lonplot::plot{'plotcolor'} solid ";
+ $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 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
+ $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'.$/ ); # title, xlabel, ylabel
+ 'set noborder'.$/ );
+ # sampling rate for non-data curves
+ $gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
+ # title, xlabel, ylabel
# titles
- $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));
+ if ($target eq 'tex') {
+ $gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\" font \"".$font_properties->{'printname'}.",".$pt."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));
+ }
# tics
if (%xtics) {
$gnuplot_input .= "set xtics $xtics{'location'} ";
- $gnuplot_input .= ( $xtics{'mirror'} eq 'on' ? "mirror" : "nomirror ");
+ $gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");
$gnuplot_input .= "$xtics{'start'}, ";
$gnuplot_input .= "$xtics{'increment'}, ";
$gnuplot_input .= "$xtics{'end'}\n";
+ if ($xtics{'minorfreq'} != 0) {
+ $gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";
+ }
}
if (%ytics) {
$gnuplot_input .= "set ytics $ytics{'location'} ";
- $gnuplot_input .= ( $ytics{'mirror'} eq 'on' ? "mirror" : "nomirror ");
+ $gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");
$gnuplot_input .= "$ytics{'start'}, ";
$gnuplot_input .= "$ytics{'increment'}, ";
$gnuplot_input .= "$ytics{'end'}\n";
+ if ($ytics{'minorfreq'} != 0) {
+ $gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";
+ }
}
# axis
if (%axis) {
@@ -903,7 +1267,7 @@ sub write_gnuplot_file {
if (%key) {
$gnuplot_input .= 'set key '.$key{'pos'}.' ';
if ($key{'title'} ne '') {
- $gnuplot_input .= 'title " '.$key{'title'}.'" ';
+ $gnuplot_input .= 'title "'.$key{'title'}.'" ';
}
$gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/;
} else {
@@ -913,23 +1277,47 @@ sub write_gnuplot_file {
my $label;
foreach $label (@labels) {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
- $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'}.$/ ;
+ $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
+ if ($target eq 'tex') {
+ $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$pt.'pt"' ;
+ }
+ $gnuplot_input .= $/;
+ }
+ if ($target eq 'tex') {
+ $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'};
+ $curve->{'linestyle'};
+ $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
+
+ if (($curve->{'linestyle'} eq 'points') ||
+ ($curve->{'linestyle'} eq 'linespoints') ||
+ ($curve->{'linestyle'} eq 'errorbars') ||
+ ($curve->{'linestyle'} eq 'xerrorbars') ||
+ ($curve->{'linestyle'} eq 'yerrorbars') ||
+ ($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
my $datatext = '';
# get new filename
- my $datafilename = "$tmpdir/$filename.$i";
+ my $datafilename = "$tmpdir/$filename.data.$i";
my $fh=Apache::File->new(">$datafilename");
# Compile data
my @Data = @{$curve->{'data'}};
@@ -943,15 +1331,27 @@ 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 '.$curve->{'linewidth'};
+ if (($curve->{'linestyle'} eq 'points') ||
+ ($curve->{'linestyle'} eq 'linespoints') ||
+ ($curve->{'linestyle'} eq 'errorbars') ||
+ ($curve->{'linestyle'} eq 'xerrorbars') ||
+ ($curve->{'linestyle'} eq 'yerrorbars') ||
+ ($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");
+ my $fh=Apache::File->new(">$tmpdir$filename.data");
print $fh $gnuplot_input;
close($fh);
# That's all folks.
@@ -962,7 +1362,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,\%plot_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
@@ -976,7 +1376,7 @@ sub check_inputs {
my $curve;
foreach $curve (@curves) {
if (!defined($curve->{'function'})&&!defined($curve->{'data'})){
- &Apache::lonxml::warning("One of the curves specified did not contain any or declarations\n");
+ &Apache::lonxml::warning("One of the curves specified did not contain any curve data or curve function declarations\n");
return '';
}
}
@@ -1000,10 +1400,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 .= '
';
@@ -1018,79 +1418,84 @@ sub edit_attributes {
## ##
###################################################################
-#------------------------------------------------ insert_xxxxxxx
-sub insert_plot {
+sub insert_gnuplot {
my $result = '';
# plot attributes
- $result .= "{'default'}\"\n";
+ $result .= "\n{'default'}\"";
}
- $result .= ">\n";
- # Add the components
+ $result .= ">";
+ # Add the components (most are commented out for simplicity)
# $result .= &insert_key();
# $result .= &insert_axis();
# $result .= &insert_title();
# $result .= &insert_xlabel();
# $result .= &insert_ylabel();
$result .= &insert_curve();
- # close up the
- $result .= "\n";
+ # close up the
+ $result .= "\n";
+ return $result;
+}
+
+sub insert_tics {
+ my $result;
+ $result .= &insert_xtics() . &insert_ytics;
return $result;
}
sub insert_xtics {
my $result;
- $result .= " {'default'}\"\n";
+ $result .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" ";
}
- $result .= " />\n";
+ $result .= "/>";
return $result;
}
sub insert_ytics {
my $result;
- $result .= " {'default'}\"\n";
+ $result .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" ";
}
- $result .= " />\n";
+ $result .= "/>";
return $result;
}
sub insert_key {
my $result;
- $result .= " {'default'}\"\n";
+ $result .= "\n $attr=\"$key_defaults{$attr}->{'default'}\"";
}
- $result .= " />\n";
+ $result .= " />";
return $result;
}
sub insert_axis{
my $result;
- $result .= ' {'default'}\"\n";
+ $result .= "\n $attr=\"$axis_defaults{$attr}->{'default'}\"";
}
- $result .= " />\n";
+ $result .= " />";
return $result;
}
-sub insert_title { return " \n"; }
-sub insert_xlabel { return " \n"; }
-sub insert_ylabel { return " \n"; }
+sub insert_title { return "\n "; }
+sub insert_xlabel { return "\n "; }
+sub insert_ylabel { return "\n "; }
sub insert_label {
my $result;
- $result .= ' \n";
+ $result .= ">";
return $result;
}
@@ -1098,22 +1503,22 @@ sub insert_curve {
my $result;
$result .= "\n {'default'}."\"";
}
- $result .= " >\n";
- $result .= &insert_data().&insert_data()."\n";
+ $result .= " >";
+ $result .= &insert_data().&insert_data()."\n ";
}
sub insert_function {
my $result;
- $result .= "\n";
+ $result .= "\n ";
return $result;
}
sub insert_data {
my $result;
- $result .= " \n";
+ $result .= "\n ";
return $result;
}