version 1.153, 2011/07/04 09:25:13
|
version 1.155, 2012/02/22 10:16:39
|
Line 176 my %gnuplot_defaults =
|
Line 176 my %gnuplot_defaults =
|
test => $color_test, |
test => $color_test, |
description => 'Background color of image (xffffff)', |
description => 'Background color of image (xffffff)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10' |
size => '10', |
|
class => 'colorchooser' |
}, |
}, |
fgcolor => { |
fgcolor => { |
default => 'x000000', |
default => 'x000000', |
test => $color_test, |
test => $color_test, |
description => 'Foreground color of image (x000000)', |
description => 'Foreground color of image (x000000)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10' |
size => '10', |
|
class => 'colorchooser' |
}, |
}, |
transparent => { |
transparent => { |
default => 'off', |
default => 'off', |
Line 463 my %axis_defaults =
|
Line 465 my %axis_defaults =
|
test => $color_test, |
test => $color_test, |
description => 'Color of grid lines (x000000)', |
description => 'Color of grid lines (x000000)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10' |
size => '10', |
|
class => 'colorchooser' |
}, |
}, |
xmin => { |
xmin => { |
default => '-10.0', |
default => '-10.0', |
Line 534 my %curve_defaults =
|
Line 537 my %curve_defaults =
|
test => $color_test, |
test => $color_test, |
description => 'Color of curve (x000000)', |
description => 'Color of curve (x000000)', |
edit_type => 'entry', |
edit_type => 'entry', |
size => '10' |
size => '10', |
|
class => 'colorchooser' |
}, |
}, |
name => { |
name => { |
default => '', |
default => '', |
Line 620 sub start_gnuplot {
|
Line 624 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)); |
|
|
if ($constructtag) { |
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; |
|
} |
|
} |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} |
} |
} |
} |
Line 1351 sub start_curve {
|
Line 1366 sub start_curve {
|
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) { |
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; |
|
} |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} |
} |
} |
} |
Line 1497 sub start_axis {
|
Line 1519 sub start_axis {
|
} 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)); |
|
|
if ($constructtag) { |
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; |
|
} |
|
|
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
} |
} |
} |
} |
Line 1590 sub write_gnuplot_file {
|
Line 1622 sub write_gnuplot_file {
|
$curve->{'color'} : |
$curve->{'color'} : |
$Apache::lonplot::plot{'fgcolor'} ); |
$Apache::lonplot::plot{'fgcolor'} ); |
} |
} |
|
|
# set term |
# set term |
if ($target eq 'web') { |
if ($target eq 'web') { |
$gnuplot_input .= 'set terminal png enhanced nocrop '; |
$gnuplot_input .= 'set terminal png enhanced nocrop '; |
Line 1930 sub edit_attributes {
|
Line 1963 sub edit_attributes {
|
if ($defaults->{$attr}->{'edit_type'} eq 'entry') { |
if ($defaults->{$attr}->{'edit_type'} eq 'entry') { |
$result .= &Apache::edit::text_arg |
$result .= &Apache::edit::text_arg |
($description,$attr,$token, |
($description,$attr,$token, |
$defaults->{$attr}->{'size'}); |
$defaults->{$attr}->{'size'}, |
|
$defaults->{$attr}->{'class'}); |
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') { |
} elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') { |
$result .= &Apache::edit::select_or_text_arg |
$result .= &Apache::edit::select_or_text_arg |
($description,$attr,$defaults->{$attr}->{'choices'},$token); |
($description,$attr,$defaults->{$attr}->{'choices'},$token); |