--- loncom/xml/lonplot.pm 2013/02/04 17:23:44 1.173
+++ loncom/xml/lonplot.pm 2018/09/26 14:52:43 1.179
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.173 2013/02/04 17:23:44 raeburn Exp $
+# $Id: lonplot.pm,v 1.179 2018/09/26 14:52:43 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -78,7 +78,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 )
@@ -105,7 +105,7 @@ my %linetypes = # For png use these li
);
my %ps_linetypes = # For ps the line types are different!
(
- solid => 0,
+ solid => 1,
dashed => 7
);
@@ -258,7 +258,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',
@@ -421,7 +421,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',
@@ -518,7 +525,7 @@ 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*\Q\0317\0200\E)))$/},
description => 'X-axis number formatting',
edit_type => 'choice',
choices => ['on', 'off', '2e', '2f'],
@@ -732,13 +739,19 @@ sub end_gnuplot {
$filename = &escape($filename);
## return image tag for the plot
if ($target eq 'web') {
- $result .= <<"ENDIMAGE";
-
-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 .= '