version 1.183, 2020/01/30 15:59:15
|
version 1.184, 2020/02/02 20:12:31
|
Line 39 use Apache::response;
|
Line 39 use Apache::response;
|
use Apache::lonxml; |
use Apache::lonxml; |
use Apache::edit; |
use Apache::edit; |
use Apache::lonnet; |
use Apache::lonnet; |
|
use Apache::lonlocal; |
use LONCAPA; |
use LONCAPA; |
|
|
|
|
use vars qw/$weboutputformat $version $colorprefix/; |
use vars qw/$weboutputformat $version $colorprefix/; |
|
|
Line 56 BEGIN {
|
Line 56 BEGIN {
|
if ($version >= 4) { |
if ($version >= 4) { |
$weboutputformat = 'png'; |
$weboutputformat = 'png'; |
} |
} |
$colorprefix = 'x'; |
$colorprefix = 'x'; |
if ($version > 4.6) { |
if ($version >= 4.6) { |
$colorprefix = '#'; |
$colorprefix = '#'; |
} |
} |
} |
} |
Line 137 my $pos_real_test =
|
Line 137 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; |
my $color_test; |
if ($version < 4.6) { |
if ($version < 4.6) { |
$color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^\#/x/;$_[0]=~/^x[\da-fA-F]{6}$/}; |
$color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^\#/x/;$_[0]=~s/^x+/x/;$_[0]=~/^x[\da-fA-F]{6}$/}; |
} else { |
} else { |
$color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^x/#/;$_[0]=~/^\#[\da-fA-F]{6}$/}; |
$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 $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| )+$/}; |
Line 682 sub start_gnuplot {
|
Line 682 sub start_gnuplot {
|
# |
# |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
|
|
&Apache::lonxml::register('Apache::lonplot', |
&Apache::lonxml::register('Apache::lonplot', |
('title','xlabel','ylabel','key','axis','label','curve', |
('title','xlabel','ylabel','key','axis','label','curve', |
'xtics','ytics')); |
'xtics','ytics')); |
Line 690 sub start_gnuplot {
|
Line 691 sub start_gnuplot {
|
&get_attributes(\%Apache::lonplot::plot,\%gnuplot_defaults,$parstack,$safeeval, |
&get_attributes(\%Apache::lonplot::plot,\%gnuplot_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
|
&fixup_colors($token,['bgcolor','fgcolor']); |
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot'); |
$result .= &Apache::edit::tag_start($target,$token,'GnuPlot'); |
$result .= &edit_attributes($target,$token,\%gnuplot_defaults, |
$result .= &edit_attributes($target,$token,\%gnuplot_defaults, |
\@gnuplot_edit_order) |
\@gnuplot_edit_order) |
Line 698 sub start_gnuplot {
|
Line 700 sub start_gnuplot {
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys(%gnuplot_defaults)); |
($token,$parstack,$safeeval,keys(%gnuplot_defaults)); |
|
my $fixed = &fixup_colors($token,['bgcolor','fgcolor']); |
if ($constructtag) { |
if ($constructtag || $fixed) { |
# |
|
# Color chooser does not prepend x (or #) to the color values |
|
# Do that here: |
|
# |
|
foreach my $attribute ('bgcolor', 'fgcolor') { |
|
my $value = $token->[2]{$attribute}; |
|
if (defined $value && ($value !~ /^\Q$colorprefix\E/)) { |
|
$token->[2]{$attribute} = $colorprefix . $value; |
|
} |
|
} |
|
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} |
} |
} |
} |
Line 1490 sub start_curve {
|
Line 1482 sub start_curve {
|
$tagstack->[-1]); |
$tagstack->[-1]); |
push (@curves,\%curve); |
push (@curves,\%curve); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
|
&fixup_colors($token); |
$result .= &Apache::edit::tag_start($target,$token,'Curve'); |
$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) |
\@curve_edit_order) |
Line 1499 sub start_curve {
|
Line 1492 sub start_curve {
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys(%curve_defaults)); |
($token,$parstack,$safeeval,keys(%curve_defaults)); |
if ($constructtag) { |
my $fixed = &fixup_colors($token); |
# |
if ($constructtag || $fixed) { |
# Fix up the color attribute as jcolor does not prepend an x |
|
# (or #) |
|
# |
|
my $value = $token->[2]{'color'}; |
|
if (defined $value && ($value !~ /^\Q$colorprefix\E/)) { |
|
$token->[2]{'color'} = $colorprefix . $value; |
|
} |
|
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} |
} |
} |
} |
Line 1650 sub start_axis {
|
Line 1636 sub start_axis {
|
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
&get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, |
$tagstack->[-1]); |
$tagstack->[-1]); |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
|
&fixup_colors($token); |
$result .= &Apache::edit::tag_start($target,$token,'Plot Axes'); |
$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); |
\@axis_edit_order); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args |
my $constructtag=&Apache::edit::get_new_args |
($token,$parstack,$safeeval,keys(%axis_defaults)); |
($token,$parstack,$safeeval,keys(%axis_defaults)); |
|
my $fixed = &fixup_colors($token); |
if ($constructtag) { |
if ($constructtag || $fixed) { |
# |
|
# Fix up the color attribute since jchooser does not |
|
# prepend an x (or #) to the color: |
|
# |
|
my $value = $token->[2]{'color'}; |
|
if (defined $value && ($value !~ /^\Q$colorprefix\E/)) { |
|
$token->[2]{'color'} = $colorprefix . $value; |
|
} |
|
|
|
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} |
} |
} |
} |
Line 1716 sub get_attributes{
|
Line 1694 sub get_attributes{
|
} |
} |
my $test = $defaults->{$attr}->{'test'}; |
my $test = $defaults->{$attr}->{'test'}; |
if (! &$test($values->{$attr})) { |
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 |
&Apache::lonxml::warning |
($tag.':'.$attr.': Bad value.'.'Replacing your value with : ' |
($tag.':'.$attr.': '.&mt('Bad value').'. '.$warning); |
.$defaults->{$attr}->{'default'} ); |
|
$values->{$attr} = $defaults->{$attr}->{'default'}; |
|
} |
} |
} |
} |
return ; |
return ; |
Line 1810 sub write_gnuplot_file {
|
Line 1804 sub write_gnuplot_file {
|
@curves = @curvescopy; |
@curves = @curvescopy; |
# Collect all the colors |
# Collect all the colors |
my @Colors; |
my @Colors; |
push @Colors, $Apache::lonplot::plot{'bgcolor'}; |
if ($version < 4.6) { |
push @Colors, $Apache::lonplot::plot{'fgcolor'}; |
push(@Colors,$Apache::lonplot::plot{'bgcolor'}); |
push @Colors, (defined($axis{'color'})?$axis{'color'}:$Apache::lonplot::plot{'fgcolor'}); |
push(@Colors,$Apache::lonplot::plot{'fgcolor'}); |
foreach $curve (@curves) { |
push(@Colors,(defined($axis{'color'})?$axis{'color'}:$Apache::lonplot::plot{'fgcolor'})); |
push @Colors, ($curve->{'color'} ne '' ? |
foreach $curve (@curves) { |
$curve->{'color'} : |
push(@Colors,($curve->{'color'} ne '' ? |
$Apache::lonplot::plot{'fgcolor'} ); |
$curve->{'color'} : |
|
$Apache::lonplot::plot{'fgcolor'})); |
|
} |
} |
} |
|
|
# set term |
# set term |
Line 1827 sub write_gnuplot_file {
|
Line 1823 sub write_gnuplot_file {
|
'/'.$font_properties->{'file'}.'.ttf" '; |
'/'.$font_properties->{'file'}.'.ttf" '; |
$gnuplot_input .= $fontsize; |
$gnuplot_input .= $fontsize; |
$gnuplot_input .= ' size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' '; |
$gnuplot_input .= ' size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' '; |
if ($version > 4.6) { |
if ($version >= 4.6) { |
if ($Apache::lonplot::plot{'bgcolor'}) { |
if ($Apache::lonplot::plot{'bgcolor'}) { |
$gnuplot_input .= "background '$Apache::lonplot::plot{'bgcolor'}'\n"; |
$gnuplot_input .= "background '$Apache::lonplot::plot{'bgcolor'}'\n"; |
} |
} |
Line 1843 sub write_gnuplot_file {
|
Line 1839 sub write_gnuplot_file {
|
'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}. |
'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}. |
'/'.$font_properties->{'file'}.'.pfb" '; |
'/'.$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 .= ' "'.$font_properties->{'printname'}.'" '; |
$gnuplot_input .= $fontsize; |
$gnuplot_input .= $fontsize; |
$gnuplot_input .= "\nset output \"".$tmpdir. |
$gnuplot_input .= "\nset output \"".$tmpdir. |
Line 1909 sub write_gnuplot_file {
|
Line 1909 sub write_gnuplot_file {
|
if ($Apache::lonplot::plot{'gridlayer'} eq 'on'); |
if ($Apache::lonplot::plot{'gridlayer'} eq 'on'); |
|
|
# grid |
# grid |
if (($version > 4.6) && ($Apache::lonplot::plot{'fgcolor'} ne '')) { |
if ($Apache::lonplot::plot{'grid'} eq 'on') { |
$gnuplot_input .= 'set grid linecolor "'.$Apache::lonplot::plot{'fgcolor'}.'"'.$/ |
if (($version >= 4.6) && (($axis{'color'} ne '') || ($Apache::lonplot::plot{'fgcolor'} ne ''))) { |
if ($Apache::lonplot::plot{'grid'} eq 'on'); |
if (($target eq 'web') || (($target eq 'tex') && |
} else { |
($Apache::lonplot::plot{'plotcolor'} =~ /^colou?r$/))) { |
$gnuplot_input .= 'set grid'.$/ if ($Apache::lonplot::plot{'grid'} eq 'on'); |
$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 |
# border |
if ($Apache::lonplot::plot{'border'} eq 'on') { |
if ($Apache::lonplot::plot{'border'} eq 'on') { |
if (($version > 4.6) && (($axis{'color'} ne '') || ($Apache::lonplot::plot{'fgcolor'} ne ''))) { |
if (($version >= 4.6) && ($Apache::lonplot::plot{'fgcolor'} ne '')) { |
$gnuplot_input .= 'set border linecolor "'. |
if (($target eq 'web') || (($target eq 'tex') && |
(($axis{'color'} ne '')?$axis{'color'}: |
($Apache::lonplot::plot{'plotcolor'} =~ /^colou?r$/))) { |
$Apache::lonplot::plot{'fgcolor'}). |
$gnuplot_input .= 'set border linecolor rgb "'. |
'" '.$/; |
$Apache::lonplot::plot{'fgcolor'}.'" '.$/; |
|
} else { |
|
$gnuplot_input .= 'set border '.$/; |
|
} |
} else { |
} else { |
$gnuplot_input .= 'set border '.$/; |
$gnuplot_input .= 'set border '.$/; |
} |
} |
Line 2191 sub check_inputs {
|
Line 2204 sub check_inputs {
|
} |
} |
} |
} |
|
|
#------------------------------------------------ make_edit |
#------------------------------------------ edit_attributes |
sub edit_attributes { |
sub edit_attributes { |
my ($target,$token,$defaults,$keys) = @_; |
my ($target,$token,$defaults,$keys) = @_; |
my ($result,@keys); |
my ($result,@keys); |
Line 2221 sub edit_attributes {
|
Line 2234 sub edit_attributes {
|
return $result; |
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; |
|
} |
|
|
################################################################### |
################################################################### |
## ## |
## ## |
Line 2419 described at http://www.lon-capa.org.
|
Line 2472 described at http://www.lon-capa.org.
|
|
|
=item edit_attributes() |
=item edit_attributes() |
|
|
|
=item fixup_colors() |
|
|
=back |
=back |
|
|
=head1 SUBROUTINES (Insertion functions for editing plots) |
=head1 SUBROUTINES (Insertion functions for editing plots) |