version 1.116, 2007/02/21 20:47:49
|
version 1.119, 2007/06/19 01:15:24
|
Line 117 my $pos_real_test =
|
Line 117 my $pos_real_test =
|
my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-fA-F]{6}$/}; |
my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\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]=~/^(small|medium|large)$/}; |
my $sml_test = sub {$_[0]=~/^(\d+|small|medium|large)$/}; |
my $linestyle_test = sub {exists($linestyles{$_[0]})}; |
my $linestyle_test = sub {exists($linestyles{$_[0]})}; |
my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/}; |
my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/}; |
|
|
Line 203 my %gnuplot_defaults =
|
Line 203 my %gnuplot_defaults =
|
edit_type => 'onoff' |
edit_type => 'onoff' |
}, |
}, |
font => { |
font => { |
default => 'medium', |
default => '9', |
test => $sml_test, |
test => $sml_test, |
description => 'Size of font to use', |
description => 'Size of font to use', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['small','medium','large'] |
choices => [['5','5 (small)'],'7',['9','9 (medium)'],'10','12',['15','15 (large)']] |
}, |
}, |
samples => { |
samples => { |
default => '100', |
default => '100', |
Line 274 my %gnuplot_defaults =
|
Line 274 my %gnuplot_defaults =
|
}, |
}, |
gridtype => { |
gridtype => { |
default => 'Cartesian', |
default => 'Cartesian', |
test => sub {$_[0]=~/^(Polar|Cartesian)$/}, |
test => sub {$_[0]=~/^(Polar|Cartesian|Linear-Log|Log-Linear|Log-Log)$/}, |
description => 'Grid type:', |
description => 'Grid type:', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['Cartesian','Polar'] |
choices => ['Cartesian','Polar','Linear-Log','Log-Linear','Log-Log'] |
}, |
}, |
lmargin => { |
lmargin => { |
default => 'default', |
default => 'default', |
Line 467 my %axis_defaults =
|
Line 467 my %axis_defaults =
|
} |
} |
); |
); |
|
|
my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize','limit'); |
my @curve_edit_order = ('color','name','linestyle','linewidth','pointtype','pointsize','limit'); |
|
|
my %curve_defaults = |
my %curve_defaults = |
( |
( |
Line 492 my %curve_defaults =
|
Line 492 my %curve_defaults =
|
edit_type => 'choice', |
edit_type => 'choice', |
choices => [keys(%linestyles)] |
choices => [keys(%linestyles)] |
}, |
}, |
# gnuplots term=gif driver does not handle linewidth :( |
linewidth => { |
# linewidth => { |
default => 4, |
# default => 1, |
test => $int_test, |
# test => $int_test, |
description => 'Line width (may not apply to all line styles)', |
# description => 'Line width (may not apply to all line styles)', |
edit_type => 'choice', |
# edit_type => 'choice', |
choices => [1,2,3,4,5,6,7,8,9,10] |
# choices => [1,2,3,4,5,6,7,8,9,10] |
}, |
# }, |
|
pointsize => { |
pointsize => { |
default => 1, |
default => 1, |
test => $pos_real_test, |
test => $pos_real_test, |
Line 674 sub end_ytics {
|
Line 673 sub end_ytics {
|
return $result; |
return $result; |
} |
} |
|
|
|
##-----------------------------------------------------------------font |
|
sub get_font { |
|
my ($size); |
|
if ( $Apache::lonplot::plot{'font'} =~ /^(small|medium|large)/) { |
|
if ( $Apache::lonplot::plot{'font'} eq 'small') { |
|
$size = '5'; |
|
} elsif ( $Apache::lonplot::plot{'font'} eq 'medium') { |
|
$size = '9'; |
|
} elsif ( $Apache::lonplot::plot{'font'} eq 'large') { |
|
$size = '15'; |
|
} else { |
|
$size = '9'; |
|
} |
|
} else { |
|
$size = $Apache::lonplot::plot{'font'}; |
|
} |
|
return ($size); |
|
} |
|
|
##----------------------------------------------------------------- key |
##----------------------------------------------------------------- key |
sub start_key { |
sub start_key { |
Line 863 sub start_curve {
|
Line 880 sub start_curve {
|
($token,$parstack,$safeeval,keys(%curve_defaults)); |
($token,$parstack,$safeeval,keys(%curve_defaults)); |
if ($constructtag) { |
if ($constructtag) { |
$result = &Apache::edit::rebuild_tag($token); |
$result = &Apache::edit::rebuild_tag($token); |
$result.= &Apache::edit::handle_insert(); |
|
} |
} |
} |
} |
return $result; |
return $result; |
Line 1103 sub write_gnuplot_file {
|
Line 1119 sub write_gnuplot_file {
|
} |
} |
# set term |
# set term |
if ($target eq 'web') { |
if ($target eq 'web') { |
$gnuplot_input .= 'set term '.$weboutputformat .' '; |
$gnuplot_input .= 'set term '.$weboutputformat .' enhanced '; |
$gnuplot_input .= 'transparent ' if ($Apache::lonplot::plot{'transparent'} eq 'on'); |
$gnuplot_input .= 'transparent ' if ($Apache::lonplot::plot{'transparent'} eq 'on'); |
$gnuplot_input .= $Apache::lonplot::plot{'font'} . ' '; |
$gnuplot_input .= $Apache::lonplot::plot{'font'} . ' '; |
$gnuplot_input .= 'size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' '; |
$gnuplot_input .= 'size '.$Apache::lonplot::plot{'width'}.','.$Apache::lonplot::plot{'height'}.' '; |
Line 1111 sub write_gnuplot_file {
|
Line 1127 sub write_gnuplot_file {
|
# set output |
# set output |
$gnuplot_input .= "set output\n"; |
$gnuplot_input .= "set output\n"; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$gnuplot_input .= "set term postscript eps $Apache::lonplot::plot{'plotcolor'} solid \"Helvetica\" $pt \n"; |
$gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} solid \"Helvetica\" $pt \n"; |
$gnuplot_input .= "set output \"/home/httpd/perl/tmp/". |
$gnuplot_input .= "set output \"/home/httpd/perl/tmp/". |
&unescape($filename).".eps\"\n"; |
&unescape($filename).".eps\"\n"; |
} |
} |
Line 1124 sub write_gnuplot_file {
|
Line 1140 sub write_gnuplot_file {
|
# cartesian or polar grid? |
# cartesian or polar grid? |
if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') { |
if (lc($Apache::lonplot::plot{'gridtype'}) eq 'polar') { |
$gnuplot_input .= 'set grid polar'.$/; |
$gnuplot_input .= 'set grid polar'.$/; |
|
} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'linear-log') { |
|
$gnuplot_input .= 'set logscale x'.$/; |
|
} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-linear') { |
|
$gnuplot_input .= 'set logscale y'.$/; |
|
} elsif (lc($Apache::lonplot::plot{'gridtype'}) eq 'log-log') { |
|
$gnuplot_input .= 'set logscale x'.$/; |
|
$gnuplot_input .= 'set logscale y'.$/; |
} else { |
} else { |
# Assume Cartesian |
# Assume Cartesian |
} |
} |
Line 1233 sub write_gnuplot_file {
|
Line 1256 sub write_gnuplot_file {
|
for (my $i = 0;$i<=$#curves;$i++) { |
for (my $i = 0;$i<=$#curves;$i++) { |
$curve = $curves[$i]; |
$curve = $curves[$i]; |
$gnuplot_input.= ', ' if ($i > 0); |
$gnuplot_input.= ', ' if ($i > 0); |
|
if ($target eq 'tex') { |
|
$curve->{'linewidth'} *= 2; |
|
} |
if (exists($curve->{'function'})) { |
if (exists($curve->{'function'})) { |
$gnuplot_input.= |
$gnuplot_input.= |
$curve->{'function'}.' title "'. |
$curve->{'function'}.' title "'. |
$curve->{'name'}.'" with '. |
$curve->{'name'}.'" with '. |
$curve->{'linestyle'}; |
$curve->{'linestyle'}; |
$gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex'); |
$gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; |
|
|
if (($curve->{'linestyle'} eq 'points') || |
if (($curve->{'linestyle'} eq 'points') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'errorbars') || |
($curve->{'linestyle'} eq 'errorbars') || |
Line 1268 sub write_gnuplot_file {
|
Line 1295 sub write_gnuplot_file {
|
} |
} |
# write file |
# write file |
print $fh $datatext; |
print $fh $datatext; |
close ($fh); |
close($fh); |
# generate gnuplot text |
# generate gnuplot text |
$gnuplot_input.= '"'.$datafilename.'" title "'. |
$gnuplot_input.= '"'.$datafilename.'" title "'. |
$curve->{'name'}.'" with '. |
$curve->{'name'}.'" with '. |
$curve->{'linestyle'}; |
$curve->{'linestyle'}; |
$gnuplot_input.= ' linewidth 4 ' if ($target eq 'tex'); |
$gnuplot_input.= ' linewidth '.$curve->{'linewidth'}; |
if (($curve->{'linestyle'} eq 'points') || |
if (($curve->{'linestyle'} eq 'points') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'linespoints') || |
($curve->{'linestyle'} eq 'errorbars') || |
($curve->{'linestyle'} eq 'errorbars') || |