version 1.172, 2013/01/31 17:10:38
|
version 1.179, 2018/09/26 14:52:43
|
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 258 my %gnuplot_defaults =
|
Line 258 my %gnuplot_defaults =
|
test => sub {$_[0]=~/^(left|right|middle|center)$/}, |
test => sub {$_[0]=~/^(left|right|middle|center)$/}, |
description => 'Alignment for image in HTML', |
description => 'Alignment for image in HTML', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['left','right','middle'] |
choices => ['left','right','middle','center'] |
}, |
}, |
texwidth => { |
texwidth => { |
default => '93', |
default => '93', |
Line 421 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 518 my %axis_defaults =
|
Line 525 my %axis_defaults =
|
}, |
}, |
xformat => { |
xformat => { |
default => 'on', |
default => 'on', |
test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/}, |
test => sub {$_[0]=~/^(on|off|\d+(f|F|e|E|P(|\s*\Q\0317\0200\E)))$/}, |
description => 'X-axis number formatting', |
description => 'X-axis number formatting', |
edit_type => 'choice', |
edit_type => 'choice', |
choices => ['on', 'off', '2e', '2f'], |
choices => ['on', 'off', '2e', '2f'], |
Line 732 sub end_gnuplot {
|
Line 739 sub end_gnuplot {
|
$filename = &escape($filename); |
$filename = &escape($filename); |
## return image tag for the plot |
## return image tag for the plot |
if ($target eq 'web') { |
if ($target eq 'web') { |
$result .= <<"ENDIMAGE"; |
my $srcatt = "src=\"/cgi-bin/plot.$weboutputformat?file=$filename.data\""; |
<img src = "/cgi-bin/plot.$weboutputformat?file=$filename.data" |
my $widthatt = "width=\"$Apache::lonplot::plot{'width'}\""; |
width = "$Apache::lonplot::plot{'width'}" |
my $heightatt = "height=\"$Apache::lonplot::plot{'height'}\""; |
height = "$Apache::lonplot::plot{'height'}" |
my $alignatt = "align=\"$Apache::lonplot::plot{'align'}\""; |
align = "$Apache::lonplot::plot{'align'}" |
my $altatt = "alt=\"$Apache::lonplot::plot{'alttag'}\""; |
alt = "$Apache::lonplot::plot{'alttag'}" /> |
if ($Apache::lonplot::plot{'align'} eq 'center') { |
ENDIMAGE |
$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') { |
} elsif ($target eq 'tex') { |
&Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}"); |
&Apache::lonxml::debug(" gnuplot wid = $Apache::lonplot::plot{'width'}"); |
&Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}"); |
&Apache::lonxml::debug(" gnuplot ht = $Apache::lonplot::plot{'height'}"); |
Line 746 ENDIMAGE
|
Line 759 ENDIMAGE
|
&Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps"); |
&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 = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n"; |
$result .= '\graphicspath{{'.$tmpdir.'}}'."\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}'; |
$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') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_end($target,$token); |
$result.=&Apache::edit::tag_end($target,$token); |
Line 1714 sub generate_tics {
|
Line 1733 sub generate_tics {
|
my $result = ''; |
my $result = ''; |
|
|
|
|
if (defined %$spec) { |
if ((ref($spec) eq 'HASH') && (keys(%{$spec}) > 0)) { |
|
|
|
|
|
|
Line 1967 sub write_gnuplot_file {
|
Line 1986 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 .= $/; |
} |
} |