version 1.162, 2012/07/17 10:49:53
|
version 1.175, 2014/06/19 17:23:50
|
Line 78 BEGIN {
|
Line 78 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 105 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 132 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 416 my %label_defaults =
|
Line 421 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 475 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'); |
Line 537 my %axis_defaults =
|
Line 555 my %axis_defaults =
|
}, |
}, |
); |
); |
|
|
|
|
my @curve_edit_order = ('color','name','linestyle','linewidth','linetype', |
my @curve_edit_order = ('color','name','linestyle','linewidth','linetype', |
'pointtype','pointsize','limit', 'arrowhead', 'arrowstyle', |
'pointtype','pointsize','limit', 'arrowhead', 'arrowstyle', |
'arrowlength', 'arrowangle', 'arrowbackangle' |
'arrowlength', 'arrowangle', 'arrowbackangle' |
Line 649 my %curve_defaults =
|
Line 668 my %curve_defaults =
|
undef %Apache::lonplot::plot; |
undef %Apache::lonplot::plot; |
my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics); |
my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics); |
|
|
|
my $current_tics; # Reference to the current tick hash |
|
|
sub start_gnuplot { |
sub start_gnuplot { |
undef(%Apache::lonplot::plot); undef(%key); undef(%axis); |
undef(%Apache::lonplot::plot); undef(%key); undef(%axis); |
undef($title); undef($xlabel); undef($ylabel); |
undef($title); undef($xlabel); undef($ylabel); |
Line 748 sub start_xtics {
|
Line 769 sub start_xtics {
|
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval, |
&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
|
$current_tics = \%xtics; |
|
&Apache::lonxml::register('Apache::lonplot', 'tic'); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'xtics'); |
$result .= &Apache::edit::tag_start($target,$token,'xtics'); |
$result .= &edit_attributes($target,$token,\%tic_defaults, |
$result .= &edit_attributes($target,$token,\%tic_defaults, |
Line 766 sub end_xtics {
|
Line 789 sub end_xtics {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
|
&Apache::lonxml::deregister('Apache::lonplot', 'tic'); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
} |
} |
Line 779 sub start_ytics {
|
Line 803 sub start_ytics {
|
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval, |
&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
|
$current_tics = \%ytics; |
|
&Apache::lonxml::register('Apache::lonplot', 'tic'); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'ytics'); |
$result .= &Apache::edit::tag_start($target,$token,'ytics'); |
$result .= &edit_attributes($target,$token,\%tic_defaults, |
$result .= &edit_attributes($target,$token,\%tic_defaults, |
Line 797 sub end_ytics {
|
Line 823 sub end_ytics {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web' || $target eq 'tex') { |
if ($target eq 'web' || $target eq 'tex') { |
|
&Apache::lonxml::deregister('Apache::lonplot', 'tic'); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
} |
} |
return $result; |
return $result; |
} |
} |
|
|
|
|
|
##---------------------------------------------------------------- |
|
# |
|
# Tic handling: |
|
# The <tic> tag allows users to specify exact Tic positions and labels |
|
# for each axis. In this version we only support level 0 tics (major tic). |
|
# Each tic has associated with it a position and a label |
|
# $current_tics is a reference to the current tick description hash. |
|
# We add elements to an array in that has: ticspecs whose elements |
|
# are 'pos' - the tick position and 'label' - the tic label. |
|
# |
|
|
|
|
|
sub start_tic { |
|
my ($target, $token, $tagstack, $parstack, $parser, $safeeval, $style) = @_; |
|
|
|
my $result = ''; |
|
if ($target eq 'web' || $target eq 'tex') { |
|
my $tic_location = &Apache::lonxml::get_param('location', $parstack, $safeeval); |
|
my $tic_label = &Apache::lonxml::get_all_text('/tic', $parser); |
|
|
|
# Tic location must e a real: |
|
|
|
if (!&$real_test($tic_location)) { |
|
&Apache::lonxml::warning("Tic location: $tic_location must be a real number"); |
|
} else { |
|
|
|
if (!defined $current_tics->{'ticspecs'}) { |
|
$current_tics->{'ticspecs'} = []; |
|
} |
|
my $ticspecs = $current_tics->{'ticspecs'}; |
|
push (@$ticspecs, {'pos' => $tic_location, 'label' => $tic_label}); |
|
} |
|
} |
|
|
|
return $result; |
|
} |
|
|
|
sub end_tic { |
|
return ''; |
|
} |
|
|
##-----------------------------------------------------------------font |
##-----------------------------------------------------------------font |
my %font_properties = |
my %font_properties = |
( |
( |
Line 1457 sub start_function {
|
Line 1526 sub start_function {
|
$style); |
$style); |
$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]); |
$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]); |
$function=~s/\^/\*\*/gs; |
$function=~s/\^/\*\*/gs; |
|
$function=~ s/^\s+//; # Trim leading |
|
$function=~ s/\s+$//; # And trailing whitespace. |
$curves[-1]->{'function'} = $function; |
$curves[-1]->{'function'} = $function; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function'); |
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function'); |
Line 1650 sub generate_tics {
|
Line 1721 sub generate_tics {
|
my $result = ''; |
my $result = ''; |
|
|
|
|
if (defined %$spec) { |
if ((ref($spec) eq 'HASH') && (keys(%{$spec}) > 0)) { |
|
|
|
|
|
|
|
|
# Major tics: |
# Major tics: - If there are 'ticspecs' these override any other |
|
# specifications: |
|
|
|
|
|
|
$result .= "set $type $spec->{'location'} "; |
$result .= "set $type $spec->{'location'} "; |
$result .= ($spec->{'mirror'} eq 'on') ? 'mirror ' : 'nomirror '; |
$result .= ($spec->{'mirror'} eq 'on') ? 'mirror ' : 'nomirror '; |
$result .= "$spec->{'start'}, "; |
if ($spec->{'rotate'} eq 'on') { |
$result .= "$spec->{'increment'}, "; |
$result .= ' rotate '; |
$result .= "$spec->{'end'} "; |
} |
|
if (defined $spec->{'ticspecs'}) { |
|
$result .= '( '; |
|
my @ticspecs; |
|
my $ticinfo = $spec->{'ticspecs'}; |
|
foreach my $tic (@$ticinfo) { |
|
push(@ticspecs, '"' . $tic->{'label'} . '" ' . $tic->{'pos'} ); |
|
} |
|
$result .= join(', ', (@ticspecs)); |
|
$result .= ' )'; |
|
} else { |
|
$result .= "$spec->{'start'}, "; |
|
$result .= "$spec->{'increment'}, "; |
|
$result .= "$spec->{'end'} "; |
|
} |
if ($target eq 'tex' ) { |
if ($target eq 'tex' ) { |
$result .= 'font "Helvetica,22"'; |
$result .= 'font "Helvetica,22"'; |
} |
} |
$result .= "\n"; |
$result .= "\n"; |
|
|
# minor frequency: |
# minor frequency: |
|
|
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"; |
} |
} |
|
|
|
|
return $result; |
return $result; |
} |
} |
|
|
Line 1807 sub write_gnuplot_file {
|
Line 1895 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 1886 sub write_gnuplot_file {
|
Line 1974 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 1903 sub write_gnuplot_file {
|
Line 1994 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 1944 sub write_gnuplot_file {
|
Line 2037 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 1966 sub write_gnuplot_file {
|
Line 2059 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 2000 sub write_gnuplot_file {
|
Line 2089 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 2010 sub write_gnuplot_file {
|
Line 2099 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); |
|
|
# &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'); |
print $fh $gnuplot_input; |
print $fh $gnuplot_input; |