version 1.163, 2012/07/24 10:50:54
|
version 1.181, 2018/10/24 13:37:43
|
Line 42 use Apache::lonnet;
|
Line 42 use Apache::lonnet;
|
use LONCAPA; |
use LONCAPA; |
|
|
|
|
use vars qw/$weboutputformat $version/; |
use vars qw/$weboutputformat $version $colorprefix/; |
|
|
|
|
|
|
Line 56 BEGIN {
|
Line 56 BEGIN {
|
if ($version >= 4) { |
if ($version >= 4) { |
$weboutputformat = 'png'; |
$weboutputformat = 'png'; |
} |
} |
|
$colorprefix = 'x'; |
|
if ($version > 4.6) { |
|
$colorprefix = '#'; |
|
} |
} |
} |
|
|
|
|
Line 78 BEGIN {
|
Line 81 BEGIN {
|
## align |
## align |
## |
## |
## @labels: $labels[$i] = \%label |
## @labels: $labels[$i] = \%label |
## %label: text, xpos, ypos, justify |
## %label: text, xpos, ypos, justify, rotate, zlayer |
## |
## |
## @curves: $curves[$i] = \%curve |
## @curves: $curves[$i] = \%curve |
## %curve: name, linestyle, ( function | data ) |
## %curve: name, linestyle, ( function | data ) |
Line 105 my %linetypes = # For png use these li
|
Line 108 my %linetypes = # For png use these li
|
); |
); |
my %ps_linetypes = # For ps the line types are different! |
my %ps_linetypes = # For ps the line types are different! |
( |
( |
solid => 0, |
solid => 1, |
dashed => 7 |
dashed => 7 |
); |
); |
|
|
Line 132 my $real_test =
|
Line 135 my $real_test =
|
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/}; |
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/}; |
my $pos_real_test = |
my $pos_real_test = |
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d*\.?\d*([eE][+-]\d+)?$/}; |
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 $color_test; |
|
if ($version < 4.6) { |
|
$color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^\#/x/;$_[0]=~/^x[\da-fA-F]{6}$/}; |
|
} else { |
|
$color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^x/#/;$_[0]=~/^\#[\da-fA-F]{6}$/}; |
|
} |
my $onoff_test = sub {$_[0]=~/^(on|off)$/}; |
my $onoff_test = sub {$_[0]=~/^(on|off)$/}; |
my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/}; |
my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/}; |
my $sml_test = sub {$_[0]=~/^(\d+|small|medium|large)$/}; |
my $sml_test = sub {$_[0]=~/^(\d+|small|medium|large)$/}; |
Line 181 my %gnuplot_defaults =
|
Line 189 my %gnuplot_defaults =
|
size => '10' |
size => '10' |
}, |
}, |
bgcolor => { |
bgcolor => { |
default => 'xffffff', |
default => $colorprefix.'ffffff', |
test => $color_test, |
test => $color_test, |
description => 'Background color of image (xffffff)', |
description => 'Background color of image ('.$colorprefix.'ffffff)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10', |
size => '10', |
class => 'colorchooser' |
class => 'colorchooser' |
}, |
}, |
fgcolor => { |
fgcolor => { |
default => 'x000000', |
default => $colorprefix.'000000', |
test => $color_test, |
test => $color_test, |
description => 'Foreground color of image (x000000)', |
description => 'Foreground color of image ('.$colorprefix.'000000)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10', |
size => '10', |
class => 'colorchooser' |
class => 'colorchooser' |
Line 253 my %gnuplot_defaults =
|
Line 261 my %gnuplot_defaults =
|
test => sub {$_[0]=~/^(left|right|middle|center)$/}, |
test => sub {$_[0]=~/^(left|right|middle|center)$/}, |
description => 'Alignment for image in HTML', |
description => 'Alignment for image in HTML', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['left','right','middle'] |
choices => ['left','right','middle','center'] |
}, |
}, |
texwidth => { |
texwidth => { |
default => '93', |
default => '93', |
Line 362 my %gnuplot_defaults =
|
Line 370 my %gnuplot_defaults =
|
}, |
}, |
); |
); |
|
|
|
|
my %key_defaults = |
my %key_defaults = |
( |
( |
title => { |
title => { |
Line 416 my %label_defaults =
|
Line 425 my %label_defaults =
|
description => 'Rotation of label (degrees)', |
description => 'Rotation of label (degrees)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10', |
size => '10', |
} |
}, |
|
zlayer => { |
|
default => '', |
|
test => sub {$_[0]=~/^(front|back)$/}, |
|
description => 'Z position of label', |
|
edit_type => 'choice', |
|
choices => ['front','back'], |
|
}, |
); |
); |
|
|
my @tic_edit_order = ('location','mirror','start','increment','end', |
my @tic_edit_order = ('location','mirror','start','increment','end', |
Line 463 my %tic_defaults =
|
Line 479 my %tic_defaults =
|
description => 'Number of minor tics per major tic mark', |
description => 'Number of minor tics per major tic mark', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10' |
size => '10' |
}, |
}, |
|
rotate => { |
|
default => 'off', |
|
test => $onoff_test, |
|
description => 'Rotate tic label by 90 degrees if on', |
|
edit_type => 'onoff' |
|
} |
); |
); |
|
|
my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat', 'xzero', 'yzero'); |
my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat', 'xzero', 'yzero'); |
my %axis_defaults = |
my %axis_defaults = |
( |
( |
color => { |
color => { |
default => 'x000000', |
default => $colorprefix.'000000', |
test => $color_test, |
test => $color_test, |
description => 'Color of grid lines (x000000)', |
description => 'Color of grid lines ('.$colorprefix.'000000)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10', |
size => '10', |
class => 'colorchooser' |
class => 'colorchooser' |
Line 507 my %axis_defaults =
|
Line 529 my %axis_defaults =
|
}, |
}, |
xformat => { |
xformat => { |
default => 'on', |
default => 'on', |
test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/}, |
test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E|P(|\s*\Q\0317\0200\E)))$/}, |
description => 'X-axis number formatting', |
description => 'X-axis number formatting', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['on', 'off', '2e', '2f'], |
choices => ['on', 'off', '2e', '2f'], |
}, |
}, |
yformat => { |
yformat => { |
default => 'on', |
default => 'on', |
test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/}, |
test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E|P(|\s*\Q\0317\0200\E)))$/}, |
description => 'Y-axis number formatting', |
description => 'Y-axis number formatting', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['on', 'off', '2e', '2f'], |
choices => ['on', 'off', '2e', '2f'], |
Line 546 my @curve_edit_order = ('color','name','
|
Line 568 my @curve_edit_order = ('color','name','
|
my %curve_defaults = |
my %curve_defaults = |
( |
( |
color => { |
color => { |
default => 'x000000', |
default => $colorprefix.'000000', |
test => $color_test, |
test => $color_test, |
description => 'Color of curve (x000000)', |
description => 'Color of curve ('.$colorprefix.'000000)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10', |
size => '10', |
class => 'colorchooser' |
class => 'colorchooser' |
Line 679 sub start_gnuplot {
|
Line 701 sub start_gnuplot {
|
|
|
if ($constructtag) { |
if ($constructtag) { |
# |
# |
# The color chooser does not prepent x to the color values |
# Color chooser does not prepend x (or #) to the color values |
# Do that here: |
# Do that here: |
# |
# |
foreach my $attribute ('bgcolor', 'fgcolor') { |
foreach my $attribute ('bgcolor', 'fgcolor') { |
my $value = $token->[2]{$attribute}; |
my $value = $token->[2]{$attribute}; |
if (defined $value && !($value =~ /^x/)) { |
if (defined $value && ($value !~ /^\Q$colorprefix\E/)) { |
$token->[2]{$attribute} = 'x' . $value; |
$token->[2]{$attribute} = $colorprefix . $value; |
} |
} |
} |
} |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
Line 721 sub end_gnuplot {
|
Line 743 sub end_gnuplot {
|
$filename = &escape($filename); |
$filename = &escape($filename); |
## return image tag for the plot |
## return image tag for the plot |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result .= <<"ENDIMAGE"; |
my $srcatt = "src=\"/cgi-bin/plot.$weboutputformat?file=$filename.data\""; |
<img src = "/cgi-bin/plot.$weboutputformat?file=$filename.data" |
my $widthatt = "width=\"$Apache::lonplot::plot{'width'}\""; |
width = "$Apache::lonplot::plot{'width'}" |
my $heightatt = "height=\"$Apache::lonplot::plot{'height'}\""; |
height = "$Apache::lonplot::plot{'height'}" |
my $alignatt = "align=\"$Apache::lonplot::plot{'align'}\""; |
align = "$Apache::lonplot::plot{'align'}" |
my $altatt = "alt=\"$Apache::lonplot::plot{'alttag'}\""; |
alt = "$Apache::lonplot::plot{'alttag'}" /> |
if ($Apache::lonplot::plot{'align'} eq 'center') { |
ENDIMAGE |
$result .= '<div style="text-align:center">'. |
|
"<img $srcatt $widthatt $heightatt $altatt>". |
|
"</div>\n"; |
|
|
|
} else { |
|
$result .= "<img $srcatt $widthatt $heightatt $alignatt $altatt>"; |
|
} |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
&Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}"); |
&Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}"); |
&Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}"); |
&Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}"); |
Line 735 ENDIMAGE
|
Line 763 ENDIMAGE
|
&Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps"); |
&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 = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n"; |
$result .= '\graphicspath{{'.$tmpdir.'}}'."\n"; |
$result .= '\graphicspath{{'.$tmpdir.'}}'."\n"; |
|
if ($Apache::lonplot::plot{'align'} eq 'center') { |
|
$result .= '\begin{center}'; |
|
} |
$result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}'; |
$result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}'; |
|
if ($Apache::lonplot::plot{'align'} eq 'center') { |
|
$result .= '\end{center}'; |
|
} |
} |
} |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
Line 1467 sub start_curve {
|
Line 1501 sub start_curve {
|
($token,$parstack,$safeeval,keys(%curve_defaults)); |
($token,$parstack,$safeeval,keys(%curve_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
# |
# |
# Fix up the color attribute as jcolor does not prepend an x |
# Fix up the color attribute as jcolor does not prepend an x |
|
# (or #) |
# |
# |
my $value = $token->[2]{'color'}; |
my $value = $token->[2]{'color'}; |
if (defined $value && !($value =~ /^x/)) { |
if (defined $value && ($value !~ /^\Q$colorprefix\E/)) { |
$token->[2]{'color'} = 'x' . $value; |
$token->[2]{'color'} = $colorprefix . $value; |
} |
} |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} |
} |
Line 1625 sub start_axis {
|
Line 1660 sub start_axis {
|
if ($constructtag) { |
if ($constructtag) { |
# |
# |
# Fix up the color attribute since jchooser does not |
# Fix up the color attribute since jchooser does not |
# prepend an x to the color: |
# prepend an x (or #) to the color: |
# |
# |
my $value = $token->[2]{'color'}; |
my $value = $token->[2]{'color'}; |
if (defined $value && !($value =~ /^x/)) { |
if (defined $value && ($value !~ /^\Q$colorprefix\E/)) { |
$token->[2]{'color'} = 'x' . $value; |
$token->[2]{'color'} = $colorprefix . $value; |
} |
} |
|
|
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
Line 1703 sub generate_tics {
|
Line 1738 sub generate_tics {
|
my $result = ''; |
my $result = ''; |
|
|
|
|
if (defined %$spec) { |
if ((ref($spec) eq 'HASH') && (keys(%{$spec}) > 0)) { |
|
|
|
|
|
|
Line 1714 sub generate_tics {
|
Line 1749 sub generate_tics {
|
|
|
$result .= "set $type $spec->{'location'} "; |
$result .= "set $type $spec->{'location'} "; |
$result .= ($spec->{'mirror'} eq 'on') ? 'mirror ' : 'nomirror '; |
$result .= ($spec->{'mirror'} eq 'on') ? 'mirror ' : 'nomirror '; |
|
if ($spec->{'rotate'} eq 'on') { |
|
$result .= ' rotate '; |
|
} |
if (defined $spec->{'ticspecs'}) { |
if (defined $spec->{'ticspecs'}) { |
$result .= '( '; |
$result .= '( '; |
my @ticspecs; |
my @ticspecs; |
Line 1738 sub generate_tics {
|
Line 1776 sub generate_tics {
|
if ($spec->{'minorfreq'} != 0) { |
if ($spec->{'minorfreq'} != 0) { |
$result .= "set m$type $spec->{'minorfreq'}\n"; |
$result .= "set m$type $spec->{'minorfreq'}\n"; |
} |
} |
} else { |
} elsif ($target eq 'tex' ) { |
$result .= "set $type font " . '"Helvetica,22"' ."\n"; |
$result .= "set $type font " . '"Helvetica,22"' ."\n"; |
} |
} |
|
|
Line 1874 sub write_gnuplot_file {
|
Line 1912 sub write_gnuplot_file {
|
$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n"; |
$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n"; |
# title, xlabel, ylabel |
# title, xlabel, ylabel |
# titles |
# titles |
my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : ''; |
my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' offset 0, -0.5 ' : ''; |
my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : ''; |
my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' offset -0.5, 0 ' : ''; |
|
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ; |
$gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ; |
Line 1953 sub write_gnuplot_file {
|
Line 1991 sub write_gnuplot_file {
|
$gnuplot_input .= ' '.$label->{'justify'}; |
$gnuplot_input .= ' '.$label->{'justify'}; |
|
|
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ; |
$gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"'; |
|
} |
|
if (($label->{'zlayer'} eq 'front') || ($label->{'zlayer'} eq 'back')) { |
|
$gnuplot_input .= ' '.$label->{'zlayer'}; |
} |
} |
$gnuplot_input .= $/; |
$gnuplot_input .= $/; |
} |
} |
Line 1970 sub write_gnuplot_file {
|
Line 2011 sub write_gnuplot_file {
|
# |
# |
my $linestyle_index = 50; |
my $linestyle_index = 50; |
my $line_width = ''; |
my $line_width = ''; |
|
my $plots = ''; |
|
|
# If arrows are needed there will be an arrow style for each as well: |
# If arrows are needed there will be an arrow style for each as well: |
# |
# |
|
|
my $arrow_style_index = 50; |
my $arrow_style_index = 50; |
|
|
my $plot_command; |
|
my $plot_type; |
|
|
|
for (my $i = 0;$i<=$#curves;$i++) { |
for (my $i = 0;$i<=$#curves;$i++) { |
$curve = $curves[$i]; |
$curve = $curves[$i]; |
$plot_command.= ', ' if ($i > 0); |
my $plot_command = ''; |
|
my $plot_type = ''; |
|
if ($i > 0) { |
|
$plot_type = ', '; |
|
} |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$curve->{'linewidth'} *= 2; |
$curve->{'linewidth'} *= 2; |
} |
} |
$line_width = $curve->{'linewidth'}; |
$line_width = $curve->{'linewidth'}; |
if (exists($curve->{'function'})) { |
if (exists($curve->{'function'})) { |
$plot_type = |
$plot_type .= |
$curve->{'function'}.' title "'. |
$curve->{'function'}.' title "'. |
$curve->{'name'}.'" with '. |
$curve->{'name'}.'" with '. |
$curve->{'linestyle'}; |
$curve->{'linestyle'}; |
Line 2011 sub write_gnuplot_file {
|
Line 2054 sub write_gnuplot_file {
|
print $fh $datatext; |
print $fh $datatext; |
close($fh); |
close($fh); |
# generate gnuplot text |
# generate gnuplot text |
$plot_type = '"'.$datafilename.'" title "'. |
$plot_type .= '"'.$datafilename.'" title "'. |
$curve->{'name'}.'" with '. |
$curve->{'name'}.'" with '. |
$curve->{'linestyle'}; |
$curve->{'linestyle'}; |
} |
} |
Line 2033 sub write_gnuplot_file {
|
Line 2076 sub write_gnuplot_file {
|
my $color = $curve->{'color'}; |
my $color = $curve->{'color'}; |
$color =~ s/^x/#/; # Convert xhex color -> #hex color. |
$color =~ s/^x/#/; # Convert xhex color -> #hex color. |
|
|
my $style_command = "set style line $linestyle_index $pointtype $pointsize linetype $lt linewidth $line_width lc rgb '$color'\n"; |
|
$gnuplot_input .= $style_command; |
|
|
|
|
|
|
|
if (($curve->{'linestyle'} eq 'points') || |
if (($curve->{'linestyle'} eq 'points') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'linespoints') || |
Line 2067 sub write_gnuplot_file {
|
Line 2106 sub write_gnuplot_file {
|
$arrow_style_index++; |
$arrow_style_index++; |
} |
} |
|
|
|
my $style_command = "set style line $linestyle_index $pointtype $pointsize linetype $lt linewidth $line_width lc rgb '$color'\n"; |
|
$gnuplot_input .= $style_command; |
|
|
# The condition below is because gnuplot lumps the linestyle in with the |
# The condition below is because gnuplot lumps the linestyle in with the |
# arrowstyle _sigh_. |
# arrowstyle _sigh_. |
Line 2077 sub write_gnuplot_file {
|
Line 2116 sub write_gnuplot_file {
|
$plot_command.= " ls $linestyle_index"; |
$plot_command.= " ls $linestyle_index"; |
} |
} |
|
|
$gnuplot_input .= 'plot ' . $plot_type . ' ' . $plot_command . "\n"; |
$plots .= $plot_type . ' ' . $plot_command; |
$linestyle_index++; # Each curve get a unique linestyle. |
$linestyle_index++; # Each curve get a unique linestyle. |
} |
} |
|
$gnuplot_input .= 'plot '.$plots; |
# Write the output to a file. |
# Write the output to a file. |
|
|
# &Apache::lonnet::logthis($gnuplot_input); # uncomment to log the gnuplot input. |
# &Apache::lonnet::logthis($gnuplot_input); # uncomment to log the gnuplot input. |
open (my $fh, "> $tmpdir$filename.data"); |
open (my $fh, "> $tmpdir$filename.data"); |
binmode($fh, ':utf8'); |
binmode($fh, ':utf8'); |