--- loncom/xml/lonplot.pm 2012/07/03 11:29:57 1.156
+++ loncom/xml/lonplot.pm 2020/02/02 20:12:31 1.184
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.156 2012/07/03 11:29:57 foxr Exp $
+# $Id: lonplot.pm,v 1.184 2020/02/02 20:12:31 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -39,10 +39,10 @@ use Apache::response;
use Apache::lonxml;
use Apache::edit;
use Apache::lonnet;
+use Apache::lonlocal;
use LONCAPA;
-
-use vars qw/$weboutputformat $version/;
+use vars qw/$weboutputformat $version $colorprefix/;
@@ -56,7 +56,10 @@ BEGIN {
if ($version >= 4) {
$weboutputformat = 'png';
}
-
+ $colorprefix = 'x';
+ if ($version >= 4.6) {
+ $colorprefix = '#';
+ }
}
@@ -78,7 +81,7 @@ BEGIN {
## align
##
## @labels: $labels[$i] = \%label
-## %label: text, xpos, ypos, justify
+## %label: text, xpos, ypos, justify, rotate, zlayer
##
## @curves: $curves[$i] = \%curve
## %curve: name, linestyle, ( function | data )
@@ -98,11 +101,16 @@ BEGIN {
my $max_str_len = 50; # if a label, title, xlabel, or ylabel text
# is longer than this, it will be truncated.
-my %linetypes =
+my %linetypes = # For png use these linetypes.
(
solid => 1,
dashed => 0
);
+my %ps_linetypes = # For ps the line types are different!
+ (
+ solid => 1,
+ dashed => 7
+ );
my %linestyles =
(
@@ -127,13 +135,22 @@ my $real_test =
sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/};
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 $color_test;
+if ($version < 4.6) {
+ $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^\#/x/;$_[0]=~s/^x+/x/;$_[0]=~/^x[\da-fA-F]{6}$/};
+} else {
+ $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^x/#/;$_[0]=~s/^\#+/#/;$_[0]=~/^\#[\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]=~/^(\d+|small|medium|large)$/};
my $linestyle_test = sub {exists($linestyles{$_[0]})};
my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};
+my $arrowhead_test = sub{$_[0]=~/^(nohead|head|heads| )+$/};
+my $arrowstyle_test= sub{$_[0]=~/^(filled|empty|nofilled)+$/};
+my $degree_test = sub{&$pos_real_test($_[0]) && ($_[0] <= 360.0)};
+
###################################################################
## ##
## Attribute metadata ##
@@ -172,17 +189,17 @@ my %gnuplot_defaults =
size => '10'
},
bgcolor => {
- default => 'xffffff',
- test => $color_test,
- description => 'Background color of image (xffffff)',
+ default => $colorprefix.'ffffff',
+ test => $color_test,
+ description => 'Background color of image ('.$colorprefix.'ffffff)',
edit_type => 'entry',
size => '10',
class => 'colorchooser'
},
fgcolor => {
- default => 'x000000',
+ default => $colorprefix.'000000',
test => $color_test,
- description => 'Foreground color of image (x000000)',
+ description => 'Foreground color of image ('.$colorprefix.'000000)',
edit_type => 'entry',
size => '10',
class => 'colorchooser'
@@ -244,7 +261,7 @@ my %gnuplot_defaults =
test => sub {$_[0]=~/^(left|right|middle|center)$/},
description => 'Alignment for image in HTML',
edit_type => 'choice',
- choices => ['left','right','middle']
+ choices => ['left','right','middle','center']
},
texwidth => {
default => '93',
@@ -353,6 +370,7 @@ my %gnuplot_defaults =
},
);
+
my %key_defaults =
(
title => {
@@ -407,7 +425,14 @@ my %label_defaults =
description => 'Rotation of label (degrees)',
edit_type => 'entry',
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',
@@ -454,16 +479,22 @@ my %tic_defaults =
description => 'Number of minor tics per major tic mark',
edit_type => 'entry',
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_defaults =
(
color => {
- default => 'x000000',
+ default => $colorprefix.'000000',
test => $color_test,
- description => 'Color of grid lines (x000000)',
+ description => 'Color of grid lines ('.$colorprefix.'000000)',
edit_type => 'entry',
size => '10',
class => 'colorchooser'
@@ -498,14 +529,14 @@ my %axis_defaults =
},
xformat => {
default => 'on',
- test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
+ test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E|P(|\s*[Pp][Ii])))$/},
description => 'X-axis number formatting',
edit_type => 'choice',
choices => ['on', 'off', '2e', '2f'],
},
yformat => {
default => 'on',
- test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
+ test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E|P(|\s*[Pp][Ii])))$/},
description => 'Y-axis number formatting',
edit_type => 'choice',
choices => ['on', 'off', '2e', '2f'],
@@ -528,14 +559,18 @@ my %axis_defaults =
},
);
-my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');
+
+my @curve_edit_order = ('color','name','linestyle','linewidth','linetype',
+ 'pointtype','pointsize','limit', 'arrowhead', 'arrowstyle',
+ 'arrowlength', 'arrowangle', 'arrowbackangle'
+ );
my %curve_defaults =
(
color => {
- default => 'x000000',
+ default => $colorprefix.'000000',
test => $color_test,
- description => 'Color of curve (x000000)',
+ description => 'Color of curve ('.$colorprefix.'000000)',
edit_type => 'entry',
size => '10',
class => 'colorchooser'
@@ -589,6 +624,43 @@ my %curve_defaults =
edit_type => 'choice',
choices => ['above', 'below', 'closed','x1','x2','y1','y2']
},
+ arrowhead => {
+ default => 'head',
+ test => $arrowhead_test,
+ description => 'Vector arrow head type',
+ edit_type => 'choice',
+ choices => ['nohead', 'head', 'heads']
+ },
+ arrowstyle => {
+ default => 'filled',
+ test => $arrowstyle_test,
+ description => 'Vector arrow head style',
+ edit_type => 'choice',
+ choices => ['filled', 'empty', 'nofilled']
+ },
+ arrowlength => {
+ default => 0.02,
+ test => $pos_real_test,
+ description => "Length of vector arrow (only applies to vector plots)",
+ edit_type => 'entry',
+ size => '5'
+ },
+ arrowangle => {
+ default => 10.0,
+ test => $degree_test,
+ description => 'Angle of arrow branches to arrow body (only applies to vector plots)',
+ edit_type => 'entry',
+ size => '5'
+ },
+
+ arrowbackangle => {
+ default => 90.0,
+ test => $degree_test,
+ descripton => 'Angle of arrow back lines to branches.',
+ edit_type => 'entry',
+ size => '5'
+ }
+
);
###################################################################
@@ -600,6 +672,8 @@ my %curve_defaults =
undef %Apache::lonplot::plot;
my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
+my $current_tics; # Reference to the current tick hash
+
sub start_gnuplot {
undef(%Apache::lonplot::plot); undef(%key); undef(%axis);
undef($title); undef($xlabel); undef($ylabel);
@@ -608,6 +682,7 @@ sub start_gnuplot {
#
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
+
&Apache::lonxml::register('Apache::lonplot',
('title','xlabel','ylabel','key','axis','label','curve',
'xtics','ytics'));
@@ -616,6 +691,7 @@ sub start_gnuplot {
&get_attributes(\%Apache::lonplot::plot,\%gnuplot_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
+ &fixup_colors($token,['bgcolor','fgcolor']);
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
$result .= &edit_attributes($target,$token,\%gnuplot_defaults,
\@gnuplot_edit_order)
@@ -624,18 +700,8 @@ sub start_gnuplot {
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%gnuplot_defaults));
-
- if ($constructtag) {
- #
- # The color chooser does not prepent x to the color values
- # Do that here:
- #
- foreach my $attribute ('bgcolor', 'fgcolor') {
- my $value = $token->[2]{$attribute};
- if (defined $value && !($value =~ /^x/)) {
- $token->[2]{$attribute} = 'x' . $value;
- }
- }
+ my $fixed = &fixup_colors($token,['bgcolor','fgcolor']);
+ if ($constructtag || $fixed) {
$result = &Apache::edit::rebuild_tag($token);
}
}
@@ -669,13 +735,19 @@ sub end_gnuplot {
$filename = &escape($filename);
## return image tag for the plot
if ($target eq 'web') {
- $result .= <<"ENDIMAGE";
-<img src = "/cgi-bin/plot.$weboutputformat?file=$filename.data"
- width = "$Apache::lonplot::plot{'width'}"
- height = "$Apache::lonplot::plot{'height'}"
- align = "$Apache::lonplot::plot{'align'}"
- alt = "$Apache::lonplot::plot{'alttag'}" />
-ENDIMAGE
+ my $srcatt = "src=\"/cgi-bin/plot.$weboutputformat?file=$filename.data\"";
+ my $widthatt = "width=\"$Apache::lonplot::plot{'width'}\"";
+ my $heightatt = "height=\"$Apache::lonplot::plot{'height'}\"";
+ my $alignatt = "align=\"$Apache::lonplot::plot{'align'}\"";
+ my $altatt = "alt=\"$Apache::lonplot::plot{'alttag'}\"";
+ if ($Apache::lonplot::plot{'align'} eq 'center') {
+ $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') {
&Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}");
&Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}");
@@ -683,7 +755,13 @@ ENDIMAGE
&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{{'.$tmpdir.'}}'."\n";
+ if ($Apache::lonplot::plot{'align'} eq 'center') {
+ $result .= '\begin{center}';
+ }
$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') {
$result.=&Apache::edit::tag_end($target,$token);
@@ -699,6 +777,8 @@ sub start_xtics {
if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,
$tagstack->[-1]);
+ $current_tics = \%xtics;
+ &Apache::lonxml::register('Apache::lonplot', 'tic');
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'xtics');
$result .= &edit_attributes($target,$token,\%tic_defaults,
@@ -717,6 +797,7 @@ sub end_xtics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ($target eq 'web' || $target eq 'tex') {
+ &Apache::lonxml::deregister('Apache::lonplot', 'tic');
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
@@ -730,6 +811,8 @@ sub start_ytics {
if ($target eq 'web' || $target eq 'tex') {
&get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,
$tagstack->[-1]);
+ $current_tics = \%ytics;
+ &Apache::lonxml::register('Apache::lonplot', 'tic');
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'ytics');
$result .= &edit_attributes($target,$token,\%tic_defaults,
@@ -748,12 +831,55 @@ sub end_ytics {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ($target eq 'web' || $target eq 'tex') {
+ &Apache::lonxml::deregister('Apache::lonplot', 'tic');
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_end($target,$token);
}
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
my %font_properties =
(
@@ -1356,6 +1482,7 @@ sub start_curve {
$tagstack->[-1]);
push (@curves,\%curve);
} elsif ($target eq 'edit') {
+ &fixup_colors($token);
$result .= &Apache::edit::tag_start($target,$token,'Curve');
$result .= &edit_attributes($target,$token,\%curve_defaults,
\@curve_edit_order)
@@ -1365,14 +1492,8 @@ sub start_curve {
} elsif ($target eq 'modified') {
my $constructtag=&Apache::edit::get_new_args
($token,$parstack,$safeeval,keys(%curve_defaults));
- if ($constructtag) {
- #
- # Fix up the color attribute as jcolor does not prepend an x
- #
- my $value = $token->[2]{'color'};
- if (defined $value && !($value =~ /^x/)) {
- $token->[2]{'color'} = 'x' . $value;
- }
+ my $fixed = &fixup_colors($token);
+ if ($constructtag || $fixed) {
$result = &Apache::edit::rebuild_tag($token);
}
}
@@ -1408,6 +1529,8 @@ sub start_function {
$style);
$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
$function=~s/\^/\*\*/gs;
+ $function=~ s/^\s+//; # Trim leading
+ $function=~ s/\s+$//; # And trailing whitespace.
$curves[-1]->{'function'} = $function;
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function');
@@ -1513,23 +1636,15 @@ sub start_axis {
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval,
$tagstack->[-1]);
} elsif ($target eq 'edit') {
+ &fixup_colors($token);
$result .= &Apache::edit::tag_start($target,$token,'Plot Axes');
$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));
-
- if ($constructtag) {
- #
- # Fix up the color attribute since jchooser does not
- # prepend an x to the color:
- #
- my $value = $token->[2]{'color'};
- if (defined $value && !($value =~ /^x/)) {
- $token->[2]{'color'} = 'x' . $value;
- }
-
+ my $fixed = &fixup_colors($token);
+ if ($constructtag || $fixed) {
$result = &Apache::edit::rebuild_tag($token);
}
}
@@ -1579,14 +1694,89 @@ sub get_attributes{
}
my $test = $defaults->{$attr}->{'test'};
if (! &$test($values->{$attr})) {
+ my $warning = &mt('Replacing your value with: [_1].',
+ $defaults->{$attr}->{'default'});
+ my $missingprefix;
+ if (($env{'form.problemmode'} eq 'editxml') ||
+ ($env{'form.problemmode'} eq 'edit')) {
+ $warning = &mt('On display your value will be replaced with: [_1].',
+ $defaults->{$attr}->{'default'});
+ if (($env{'form.problemmode'} eq 'edit') &&
+ ($attr =~ /^(|fg|bg)color$/) && ($values->{$attr} =~ /^[\da-fA-F]{6}$/)) {
+ $missingprefix = 1;
+ $warning = &mt('The current value is missing the prefix: [_1].',
+ $colorprefix).' '.
+ &mt('As the color picker entry adds the prefix, saving will fix this issue.');
+ }
+ }
+ unless ($missingprefix) {
+ $values->{$attr} = $defaults->{$attr}->{'default'};
+ }
&Apache::lonxml::warning
- ($tag.':'.$attr.': Bad value.'.'Replacing your value with : '
- .$defaults->{$attr}->{'default'} );
- $values->{$attr} = $defaults->{$attr}->{'default'};
+ ($tag.':'.$attr.': '.&mt('Bad value').'. '.$warning);
}
}
return ;
}
+##
+# Generate tic mark specifications.
+#
+# @param type - type of tics (xtics or ytics).
+# @param spec - Reference to a hash that contains the tic specification.
+# @param target - 'tex' if hard copy target.
+#
+# @return string - the tic specification command.
+#
+sub generate_tics {
+ my ($type, $spec, $target) = @_;
+ my $result = '';
+
+
+ if ((ref($spec) eq 'HASH') && (keys(%{$spec}) > 0)) {
+
+
+
+ # Major tics: - If there are 'ticspecs' these override any other
+ # specifications:
+
+
+
+ $result .= "set $type $spec->{'location'} ";
+ $result .= ($spec->{'mirror'} eq 'on') ? 'mirror ' : 'nomirror ';
+ if ($spec->{'rotate'} eq 'on') {
+ $result .= ' rotate ';
+ }
+ 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' ) {
+ $result .= 'font "Helvetica,22"';
+ }
+ $result .= "\n";
+
+ # minor frequency:
+
+ if ($spec->{'minorfreq'} != 0) {
+ $result .= "set m$type $spec->{'minorfreq'}\n";
+ }
+ } elsif ($target eq 'tex' ) {
+ $result .= "set $type font " . '"Helvetica,22"' ."\n";
+ }
+
+
+ return $result;
+}
##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {
@@ -1614,13 +1804,15 @@ sub write_gnuplot_file {
@curves = @curvescopy;
# Collect all the colors
my @Colors;
- 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'} :
- $Apache::lonplot::plot{'fgcolor'} );
+ if ($version < 4.6) {
+ 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'} :
+ $Apache::lonplot::plot{'fgcolor'}));
+ }
}
# set term
@@ -1631,7 +1823,13 @@ sub write_gnuplot_file {
'/'.$font_properties->{'file'}.'.ttf" ';
$gnuplot_input .= $fontsize;
$gnuplot_input .= ' size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' ';
- $gnuplot_input .= "@Colors\n";
+ if ($version >= 4.6) {
+ if ($Apache::lonplot::plot{'bgcolor'}) {
+ $gnuplot_input .= "background '$Apache::lonplot::plot{'bgcolor'}'\n";
+ }
+ } else {
+ $gnuplot_input .= "@Colors\n";
+ }
# set output
$gnuplot_input .= "set output\n";
} elsif ($target eq 'tex') {
@@ -1641,6 +1839,10 @@ sub write_gnuplot_file {
'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
'/'.$font_properties->{'file'}.'.pfb" ';
}
+ if (($version >= 4.6) && ($Apache::lonplot::plot{'plotcolor'} =~ /^colou?r$/) &&
+ ($Apache::lonplot::plot{'bgcolor'} ne '')) {
+ $gnuplot_input .= "background '$Apache::lonplot::plot{'bgcolor'}' ";
+ }
$gnuplot_input .= ' "'.$font_properties->{'printname'}.'" ';
$gnuplot_input .= $fontsize;
$gnuplot_input .= "\nset output \"".$tmpdir.
@@ -1648,6 +1850,7 @@ sub write_gnuplot_file {
$gnuplot_input .= "set encoding iso_8859_1\n"; # Get access to extended font.
}
+ $gnuplot_input .= "set encoding utf8\n";
# cartesian or polar plot?
if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {
$gnuplot_input .= 'set polar'.$/;
@@ -1706,17 +1909,44 @@ sub write_gnuplot_file {
if ($Apache::lonplot::plot{'gridlayer'} eq 'on');
# grid
- $gnuplot_input .= 'set grid'.$/ if ($Apache::lonplot::plot{'grid'} eq 'on');
+ if ($Apache::lonplot::plot{'grid'} eq 'on') {
+ if (($version >= 4.6) && (($axis{'color'} ne '') || ($Apache::lonplot::plot{'fgcolor'} ne ''))) {
+ if (($target eq 'web') || (($target eq 'tex') &&
+ ($Apache::lonplot::plot{'plotcolor'} =~ /^colou?r$/))) {
+ $gnuplot_input .= 'set grid linecolor rgb "'.
+ (($axis{'color'} ne '')?$axis{'color'}:
+ $Apache::lonplot::plot{'fgcolor'}).
+ '" '.$/;
+
+ } else {
+ $gnuplot_input .= 'set grid'.$/;
+ }
+ } else {
+ $gnuplot_input .= 'set grid'.$/;
+ }
+ }
# border
- $gnuplot_input .= ($Apache::lonplot::plot{'border'} eq 'on'?
- 'set border'.$/ :
- 'set noborder'.$/ );
+ if ($Apache::lonplot::plot{'border'} eq 'on') {
+ if (($version >= 4.6) && ($Apache::lonplot::plot{'fgcolor'} ne '')) {
+ if (($target eq 'web') || (($target eq 'tex') &&
+ ($Apache::lonplot::plot{'plotcolor'} =~ /^colou?r$/))) {
+ $gnuplot_input .= 'set border linecolor rgb "'.
+ $Apache::lonplot::plot{'fgcolor'}.'" '.$/;
+ } else {
+ $gnuplot_input .= 'set border '.$/;
+ }
+ } else {
+ $gnuplot_input .= 'set border '.$/;
+ }
+ } else {
+ $gnuplot_input .= 'set noborder '.$/;
+ }
# sampling rate for non-data curves
$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 ' : '';
+ my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' offset 0, -0.5 ' : '';
+ my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' offset -0.5, 0 ' : '';
if ($target eq 'tex') {
$gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
@@ -1728,42 +1958,10 @@ sub write_gnuplot_file {
$gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
}
# tics
- if (%xtics) {
- $gnuplot_input .= "set xtics $xtics{'location'} ";
- $gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");
- $gnuplot_input .= "$xtics{'start'}, ";
- $gnuplot_input .= "$xtics{'increment'}, ";
- $gnuplot_input .= "$xtics{'end'} ";
- if ($target eq 'tex') {
- $gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso 8859-1 enc.
- }
- $gnuplot_input .= "\n";
- if ($xtics{'minorfreq'} != 0) {
- $gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";
- }
- } else {
- if ($target eq 'tex') {
- $gnuplot_input .= 'set xtics font "Helvetica,22"'."\n"; # needed in iso 8859-1 enc
- }
- }
- if (%ytics) {
- $gnuplot_input .= "set ytics $ytics{'location'} ";
- $gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");
- $gnuplot_input .= "$ytics{'start'}, ";
- $gnuplot_input .= "$ytics{'increment'}, ";
- $gnuplot_input .= "$ytics{'end'} ";
- if ($target eq 'tex') {
- $gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso-8859-1 encoding.
- }
- $gnuplot_input .= "\n";
- if ($ytics{'minorfreq'} != 0) {
- $gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n";
- }
- } else {
- if ($target eq 'tex') {
- $gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc.
- }
- }
+ $gnuplot_input .= &generate_tics('xtics', \%xtics, $target);
+
+ $gnuplot_input .= &generate_tics('ytics', \%ytics, $target);
+
# axis
if (%axis) {
if ($axis{'xformat'} ne 'on') {
@@ -1771,6 +1969,14 @@ sub write_gnuplot_file {
if ($axis{'xformat'} eq 'off') {
$gnuplot_input .= "\"\"\n";
} else {
+ if ($axis{'xformat'} =~ /^(\d+P\s*)[Pp][Ii]/) {
+ my $xprefix = $1;
+ if (($target eq 'web') || ($target eq 'tex')) {
+ $axis{'xformat'} = $xprefix.$lookup{'(pi|#960)'}{$target};
+ } else {
+ $axis{'xformat'} = $xprefix;
+ }
+ }
$gnuplot_input .= "\"\%.".$axis{'xformat'}."\"\n";
}
}
@@ -1779,6 +1985,14 @@ sub write_gnuplot_file {
if ($axis{'yformat'} eq 'off') {
$gnuplot_input .= "\"\"\n";
} else {
+ if ($axis{'yformat'} =~ /^(\d+P\s*)[Pp][Ii]/) {
+ my $yprefix = $1;
+ if (($target eq 'web') || ($target eq 'tex')) {
+ $axis{'yformat'} = $yprefix.$lookup{'(pi|#960)'}{$target};
+ } else {
+ $axis{'yformat'} = $yprefix;
+ }
+ }
$gnuplot_input .= "\"\%.".$axis{'yformat'}."\"\n";
}
}
@@ -1826,7 +2040,10 @@ sub write_gnuplot_file {
$gnuplot_input .= ' '.$label->{'justify'};
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 .= $/;
}
@@ -1842,21 +2059,27 @@ sub write_gnuplot_file {
# type (solid/dashed), color, width
#
my $linestyle_index = 50;
- my $line_type = '';
- my $line_color = '';
my $line_width = '';
+ my $plots = '';
- my $plot_command;
- my $plot_type;
+ # If arrows are needed there will be an arrow style for each as well:
+ #
+
+ my $arrow_style_index = 50;
for (my $i = 0;$i<=$#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') {
$curve->{'linewidth'} *= 2;
}
+ $line_width = $curve->{'linewidth'};
if (exists($curve->{'function'})) {
- $plot_type =
+ $plot_type .=
$curve->{'function'}.' title "'.
$curve->{'name'}.'" with '.
$curve->{'linestyle'};
@@ -1880,35 +2103,77 @@ sub write_gnuplot_file {
print $fh $datatext;
close($fh);
# generate gnuplot text
- $plot_type = '"'.$datafilename.'" title "'.
+ $plot_type .= '"'.$datafilename.'" title "'.
$curve->{'name'}.'" with '.
$curve->{'linestyle'};
}
+ my $pointtype = '';
+ my $pointsize = '';
+
+ # Figure out the linestyle:
+
+ my $lt = $curve->{'linetype'} ne '' ? $curve->{'linetype'}
+ : 'solid'; # Line type defaults to solid.
+ # The mapping of lt -> the actual gnuplot line type depends on the target:
+
+ if ($target eq 'tex') {
+ $lt = $ps_linetypes{$lt};
+ } else {
+ $lt = $linetypes{$lt}
+ }
+
+ my $color = $curve->{'color'};
+ $color =~ s/^x/#/; # Convert xhex color -> #hex color.
+
+
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')) {
- $plot_command.=' pointtype '.$curve->{'pointtype'};
- $plot_command.=' pointsize '.$curve->{'pointsize'};
+
+ $pointtype =' pointtype '.$curve->{'pointtype'};
+ $pointsize =' pointsize '.$curve->{'pointsize'};
} elsif ($curve->{'linestyle'} eq 'filledcurves') {
$plot_command.= ' '.$curve->{'limit'};
- } elsif ($curve->{'linetype'} ne '' &&
- $curve->{'linestyle'} eq 'lines') {
- $plot_command.= ' linetype ';
- $plot_command.= $linetypes{$curve->{'linetype'}};
- $plot_command.= ' linecolor rgb "';
- # convert color from xaaaaaa to #aaaaaa
- $curve->{'color'} =~ s/^x/#/;
- $plot_command.= $curve->{'color'}.'"';
+ } elsif ($curve->{'linestyle'} eq 'vector') {
+
+ # Create the arrow head style add it to
+ # $gnuplot_input..and ensure it gets
+ # Selected in the plot command.
+
+ $gnuplot_input .= "set style arrow $arrow_style_index ";
+ $gnuplot_input .= ' ' . $curve->{'arrowhead'};
+ $gnuplot_input .= ' size ' . $curve->{'arrowlength'};
+ $gnuplot_input .= ','.$curve->{'arrowangle'};
+ $gnuplot_input .= ',' . $curve->{'arrowbackangle'};
+ $gnuplot_input .= ' ' . $curve->{'arrowstyle'} . " ls $linestyle_index\n";
+
+
+ $plot_command .= " arrowstyle $arrow_style_index ";
+ $arrow_style_index++;
}
- $plot_command.= ' linewidth '.$curve->{'linewidth'};
- $gnuplot_input .= 'plot ' . $plot_type . ' ' . $plot_command . "\n";
+
+ 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
+ # arrowstyle _sigh_.
+
+ if ($curve->{'linestyle'} ne 'vector') {
+ $plot_command.= " ls $linestyle_index";
+ }
+
+ $plots .= $plot_type . ' ' . $plot_command;
+ $linestyle_index++; # Each curve get a unique linestyle.
}
+ $gnuplot_input .= 'plot '.$plots;
# Write the output to a file.
- open (my $fh,">$tmpdir$filename.data");
- binmode($fh, ":utf8");
+
+ # &Apache::lonnet::logthis($gnuplot_input); # uncomment to log the gnuplot input.
+ open (my $fh, "> $tmpdir$filename.data");
+ binmode($fh, ':utf8');
print $fh $gnuplot_input;
close($fh);
# That's all folks.
@@ -1939,7 +2204,7 @@ sub check_inputs {
}
}
-#------------------------------------------------ make_edit
+#------------------------------------------ edit_attributes
sub edit_attributes {
my ($target,$token,$defaults,$keys) = @_;
my ($result,@keys);
@@ -1969,6 +2234,46 @@ sub edit_attributes {
return $result;
}
+#------------------------------------------ fixup_colors
+
+sub fixup_colors {
+ my ($token,$attribref) = @_;
+ my @attributes;
+ if (ref($attribref) eq 'ARRAY') {
+ @attributes = @{$attribref};
+ } else {
+ @attributes = ('color');
+ }
+
+#
+# Fix up the color attribute since jchooser does not
+# prepend an x (or #) to the color:
+#
+ my $had_changes;
+ if ((ref($token) eq 'ARRAY') && (ref($token->[2]) eq 'HASH')) {
+ foreach my $attribute (@attributes) {
+ if ($attribute =~ /^(|bg|fg)color$/) {
+ my $value = $token->[2]{$attribute};
+ if (defined($value)) {
+ if ($version < 4.6) {
+ $value=~s/^\#/x/;
+ } else {
+ $value=~s/^x/#/;
+ }
+ if ($value ne $token->[2]{$attribute}) {
+ $token->[2]{$attribute} = $value;
+ $had_changes = 1;
+ }
+ if ($value !~ /^\Q$colorprefix\E/) {
+ $token->[2]{$attribute} = $colorprefix . $value;
+ $had_changes = 1;
+ }
+ }
+ }
+ }
+ }
+ return $had_changes;
+}
###################################################################
## ##
@@ -2167,6 +2472,8 @@ described at http://www.lon-capa.org.
=item edit_attributes()
+=item fixup_colors()
+
=back
=head1 SUBROUTINES (Insertion functions for editing plots)