--- loncom/xml/lonplot.pm 2007/12/05 23:22:18 1.132
+++ loncom/xml/lonplot.pm 2008/03/24 21:53:41 1.136
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.132 2007/12/05 23:22:18 albertel Exp $
+# $Id: lonplot.pm,v 1.136 2008/03/24 21:53:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -91,6 +91,12 @@ BEGIN {
my $max_str_len = 50; # if a label, title, xlabel, or ylabel text
# is longer than this, it will be truncated.
+my %linetypes =
+ (
+ solid => 1,
+ dashed => 0
+ );
+
my %linestyles =
(
lines => 2, # Maybe this will be used in the future
@@ -385,6 +391,13 @@ my %label_defaults =
description => 'justification of the label text on the plot',
edit_type => 'choice',
choices => ['left','right','center']
+ },
+ rotate => {
+ default => 0,
+ test => $real_test,
+ description => 'Rotation of label (degrees)',
+ edit_type => 'entry',
+ size => '10',
}
);
@@ -490,7 +503,7 @@ my %axis_defaults =
);
-my @curve_edit_order = ('color','name','linestyle','linewidth','pointtype','pointsize','limit');
+my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');
my %curve_defaults =
(
@@ -511,37 +524,44 @@ my %curve_defaults =
linestyle => {
default => 'lines',
test => $linestyle_test,
- description => 'Line style',
+ description => 'Plot with:',
edit_type => 'choice',
choices => [keys(%linestyles)]
},
linewidth => {
default => 1,
test => $int_test,
- description => 'Line width (may not apply to all line styles)',
+ description => 'Line width (may not apply to all plot styles)',
edit_type => 'choice',
choices => [1,2,3,4,5,6,7,8,9,10]
},
+ linetype => {
+ default => 'solid',
+ test => sub {$_[0]=~/^(solid|dashed)$/},
+ description => 'Line type (may not apply to all plot styles)',
+ edit_type => 'choice',
+ choices => ['solid', 'dashed']
+ },
pointsize => {
default => 1,
test => $pos_real_test,
- description => 'Point size (may not apply to all line styles)',
+ description => 'Point size (may not apply to all plot styles)',
edit_type => 'entry',
size => '5'
},
pointtype => {
default => 1,
test => $int_test,
- description => 'Point type (may not apply to all line styles)',
+ description => 'Point type (may not apply to all plot styles)',
edit_type => 'choice',
choices => [0,1,2,3,4,5,6]
},
limit => {
default => 'closed',
- test => sub {$_[0]=~/^(closed|x1|x2|y1|y2)$/},
+ test => sub {$_[0]=~/^(above|below|closed|x1|x2|y1|y2)$/},
description => 'Point to fill -- for filledcurves',
edit_type => 'choice',
- choices => ['closed','x1','x2','y1','y2']
+ choices => ['above', 'below', 'closed','x1','x2','y1','y2']
},
);
@@ -801,7 +821,56 @@ sub parse_label {
my %lookup =
- ('(pi|#960)' => {'tex' => '{/Symbol p}', 'web' => "\x{3C0}"},);
+ ('(Alpha|#913)' => {'tex' => '{/Symbol A}', 'web' => "\x{391}"},
+ '(Beta|#914)' => {'tex' => '{/Symbol B}', 'web' => "\x{392}"},
+ '(Chi|#935)' => {'tex' => '{/Symbol C}', 'web' => "\x{3A7}"},
+ '(Delta|#916)' => {'tex' => '{/Symbol D}', 'web' => "\x{394}"},
+ '(Epsilon|#917)' => {'tex' => '{/Symbol E}', 'web' => "\x{395}"},
+ '(Phi|#934)' => {'tex' => '{/Symbol F}', 'web' => "\x{3A6}"},
+ '(Gamma|#915)' => {'tex' => '{/Symbol G}', 'web' => "\x{393}"},
+ '(Eta|#919)' => {'tex' => '{/Symbol H}', 'web' => "\x{397}"},
+ '(Iota|#921)' => {'tex' => '{/Symbol I}', 'web' => "\x{399}"},
+ '(Kappa|#922)' => {'tex' => '{/Symbol K}', 'web' => "\x{39A}"},
+ '(Lambda|#923)' => {'tex' => '{/Symbol L}', 'web' => "\x{39B}"},
+ '(Mu|#924)' => {'tex' => '{/Symbol M}', 'web' => "\x{39C}"},
+ '(Nu|#925)' => {'tex' => '{/Symbol N}', 'web' => "\x{39D}"},
+ '(Omicron|#927)' => {'tex' => '{/Symbol O}', 'web' => "\x{39F}"},
+ '(Pi|#928)' => {'tex' => '{/Symbol P}', 'web' => "\x{3A0}"},
+ '(Theta|#920)' => {'tex' => '{/Symbol Q}', 'web' => "\x{398}"},
+ '(Rho|#929)' => {'tex' => '{/Symbol R}', 'web' => "\x{3A1}"},
+ '(Sigma|#931)' => {'tex' => '{/Symbol S}', 'web' => "\x{3A3}"},
+ '(Tau|#932)' => {'tex' => '{/Symbol T}', 'web' => "\x{3A4}"},
+ '(Upsilon|#933)' => {'tex' => '{/Symbol U}', 'web' => "\x{3A5}"},
+ '(Omega|#937)' => {'tex' => '{/Symbol W}', 'web' => "\x{3A9}"},
+ '(Xi|#926)' => {'tex' => '{/Symbol X}', 'web' => "\x{39E}"},
+ '(Psi|#936)' => {'tex' => '{/Symbol Y}', 'web' => "\x{3A8}"},
+ '(Zeta|#918)' => {'tex' => '{/Symbol Z}', 'web' => "\x{396}"},
+ '(alpha|#945)' => {'tex' => '{/Symbol a}', 'web' => "\x{3B1}"},
+ '(beta|#946)' => {'tex' => '{/Symbol b}', 'web' => "\x{3B2}"},
+ '(chi|#967)' => {'tex' => '{/Symbol c}', 'web' => "\x{3C7}"},
+ '(delta|#948)' => {'tex' => '{/Symbol d}', 'web' => "\x{3B4}"},
+ '(epsilon|#949)' => {'tex' => '{/Symbol e}', 'web' => "\x{3B5}"},
+ '(phi|#966)' => {'tex' => '{/Symbol f}', 'web' => "\x{3C6}"},
+ '(gamma|#947)' => {'tex' => '{/Symbol g}', 'web' => "\x{3B3}"},
+ '(eta|#951)' => {'tex' => '{/Symbol h}', 'web' => "\x{3B7}"},
+ '(iota|#953)' => {'tex' => '{/Symbol i}', 'web' => "\x{3B9}"},
+ '(kappa|#954)' => {'tex' => '{/Symbol k}', 'web' => "\x{3BA}"},
+ '(lambda|#955)' => {'tex' => '{/Symbol k}', 'web' => "\x{3BB}"},
+ '(mu|#956)' => {'tex' => '{/Symbol m}', 'web' => "\x{3BC}"},
+ '(nu|#957)' => {'tex' => '{/Symbol n}', 'web' => "\x{3BD}"},
+ '(omicron|#959)' => {'tex' => '{/Symbol o}', 'web' => "\x{3BF}"},
+ '(pi|#960)' => {'tex' => '{/Symbol p}', 'web' => "\x{3C0}"},
+ '(theta|#952)' => {'tex' => '{/Symbol q}', 'web' => "\x{3B8}"},
+ '(rho|#961)' => {'tex' => '{/Symbol r}', 'web' => "\x{3C1}"},
+ '(sigma|#963)' => {'tex' => '{/Symbol s}', 'web' => "\x{3C3}"},
+ '(tau|#964)' => {'tex' => '{/Symbol t}', 'web' => "\x{3C4}"},
+ '(upsilon|#965)' => {'tex' => '{/Symbol u}', 'web' => "\x{3C5}"},
+ '(omega|#969)' => {'tex' => '{/Symbol w}', 'web' => "\x{3C9}"},
+ '(xi|#958)' => {'tex' => '{/Symbol x}', 'web' => "\x{3BE}"},
+ '(psi|#968)' => {'tex' => '{/Symbol y}', 'web' => "\x{3C8}"},
+ '(zeta|#950)' => {'tex' => '{/Symbol z}', 'web' => "\x{3B6}"},
+ );
+
sub replace_entities {
my ($target,$text) = @_;
@@ -1369,7 +1438,12 @@ sub write_gnuplot_file {
my $label;
foreach $label (@labels) {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
- $label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
+ $label->{'xpos'}.','.$label->{'ypos'};
+ if ($label->{'rotate'} ne '') {
+ $gnuplot_input .= ' rotate by '.$label->{'rotate'};
+ }
+ $gnuplot_input .= ' '.$label->{'justify'};
+
if ($target eq 'tex') {
$gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ;
}
@@ -1403,6 +1477,14 @@ sub write_gnuplot_file {
$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
} elsif ($curve->{'linestyle'} eq 'filledcurves') {
$gnuplot_input.= ' '.$curve->{'limit'};
+ } elsif ($curve->{'linetype'} ne '' &&
+ $curve->{'linestyle'} eq 'lines') {
+ $gnuplot_input.= ' linetype ';
+ $gnuplot_input.= $linetypes{$curve->{'linetype'}};
+ $gnuplot_input.= ' linecolor rgb "';
+ # convert color from xaaaaaa to #aaaaaa
+ $curve->{'color'} =~ s/^x/#/;
+ $gnuplot_input.= $curve->{'color'}.'"';
}
$gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
@@ -1439,8 +1521,16 @@ sub write_gnuplot_file {
$gnuplot_input.=' pointsize '.$curve->{'pointsize'};
} elsif ($curve->{'linestyle'} eq 'filledcurves') {
$gnuplot_input.= ' '.$curve->{'limit'};
+ } elsif ($curve->{'linetype'} ne '' &&
+ $curve->{'linestyle'} eq 'lines') {
+ $gnuplot_input.= ' linetype ';
+ $gnuplot_input.= $linetypes{$curve->{'linetype'}};
+ $gnuplot_input.= ' linecolor rgb "';
+ # convert color from xaaaaaa to #aaaaaa
+ $curve->{'color'} =~ s/^x/#/;
+ $gnuplot_input.= $curve->{'color'}.'"';
}
- $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
+ $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};
}
}
# Write the output to a file.