--- loncom/xml/lonplot.pm 2007/08/03 05:58:12 1.122
+++ loncom/xml/lonplot.pm 2007/08/04 00:01:52 1.127
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Dynamic plot
#
-# $Id: lonplot.pm,v 1.122 2007/08/03 05:58:12 albertel Exp $
+# $Id: lonplot.pm,v 1.127 2007/08/04 00:01:52 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -127,8 +127,9 @@ my $words_test = sub {$_[0]=~s/\s+/
## ##
###################################################################
my @gnuplot_edit_order =
- qw/alttag bgcolor fgcolor height width fontface font transparent grid samples
- border align texwidth texfont plotcolor plottype gridtype lmargin rmargin
+ qw/alttag bgcolor fgcolor height width texwidth fontface font texfont
+ transparent grid samples
+ border align plotcolor plottype gridtype lmargin rmargin
tmargin bmargin major_ticscale minor_ticscale boxwidth gridlayer fillstyle
pattern solid/;
@@ -205,9 +206,9 @@ my %gnuplot_defaults =
font => {
default => '9',
test => $sml_test,
- description => 'Size of font to use',
+ description => 'Font size to use in web output (pts)',
edit_type => 'choice',
- choices => [['5','5 (small)'],'7',['9','9 (medium)'],'10','12',['15','15 (large)']]
+ choices => [['5','5 (small)'],'6','7','8',['9','9 (medium)'],'10',['11','11 (large)'],'12','15']
},
fontface => {
default => 'sans-serif',
@@ -500,7 +501,7 @@ my %curve_defaults =
choices => [keys(%linestyles)]
},
linewidth => {
- default => 4,
+ default => 2,
test => $int_test,
description => 'Line width (may not apply to all line styles)',
edit_type => 'choice',
@@ -702,6 +703,7 @@ my %font_properties =
);
sub get_font {
+ my ($target) = @_;
my ($size, $selected_font);
if ( $Apache::lonplot::plot{'font'} =~ /^(small|medium|large)/) {
@@ -711,7 +713,7 @@ sub get_font {
} elsif ( $Apache::lonplot::plot{'font'} eq 'medium') {
$size = '9';
} elsif ( $Apache::lonplot::plot{'font'} eq 'large') {
- $size = '15';
+ $size = '11';
} else {
$size = '9';
}
@@ -719,6 +721,9 @@ sub get_font {
$size = $Apache::lonplot::plot{'font'};
$selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
}
+ if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {
+ $size = $Apache::lonplot::plot{'texfont'};
+ }
return ($size, $selected_font);
}
@@ -752,6 +757,12 @@ sub end_key {
return $result;
}
+sub gnuplot_protect {
+ my ($string) = @_;
+ $string =~ s{([_^&~\{\}]|\\\\)}{\\\\$1}g;
+ return $string;
+}
+
##------------------------------------------------------------------- title
sub start_title {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
@@ -763,6 +774,7 @@ sub start_title {
if (length($title) > $max_str_len) {
$title = substr($title,0,$max_str_len);
}
+ $title = &gnuplot_protect($title);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Title');
my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
@@ -794,6 +806,7 @@ sub start_xlabel {
if (length($xlabel) > $max_str_len) {
$xlabel = substr($xlabel,0,$max_str_len);
}
+ $xlabel = &gnuplot_protect($xlabel);
} elsif ($target eq 'edit') {
$result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
@@ -826,6 +839,7 @@ sub start_ylabel {
if (length($ylabel) > $max_str_len) {
$ylabel = substr($ylabel,0,$max_str_len);
}
+ $ylabel = &gnuplot_protect($ylabel);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
@@ -859,7 +873,7 @@ sub start_label {
$text = &Apache::run::evaluate($text,$safeeval,$$parstack[-1]);
$text =~ s/\n/ /g;
$text = substr($text,0,$max_str_len) if (length($text) > $max_str_len);
- $label{'text'} = $text;
+ $label{'text'} = &gnuplot_protect($text);
push(@labels,\%label);
} elsif ($target eq 'edit') {
$result .= &Apache::edit::tag_start($target,$token,'Plot Label');
@@ -1116,10 +1130,9 @@ sub get_attributes{
##------------------------------------------------------- write_gnuplot_file
sub write_gnuplot_file {
my ($tmpdir,$filename,$target)= @_;
- my ($fontsize, $font_properties) = &get_font();
+ my ($fontsize, $font_properties) = &get_font($target);
my $gnuplot_input = '';
my $curve;
- my $pt = $Apache::lonplot::plot{'texfont'};
#
# Check to be sure we do not have any empty curves
my @curvescopy;
@@ -1232,14 +1245,17 @@ sub write_gnuplot_file {
$gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
# title, xlabel, ylabel
# titles
+ my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : '';
+ my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : '';
+
if ($target eq 'tex') {
- $gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($title)) ;
- $gnuplot_input .= "set xlabel \"$xlabel\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($xlabel));
- $gnuplot_input .= "set ylabel \"$ylabel\" font \"".$font_properties->{'printname'}.",".$pt."pt\"\n" if (defined($ylabel));
+ $gnuplot_input .= "set title \"$title\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
} else {
- $gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ;
- $gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel));
- $gnuplot_input .= "set ylabel \"$ylabel\" \n" if (defined($ylabel));
+ $gnuplot_input .= "set title \"$title\" \n" if (defined($title)) ;
+ $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel));
+ $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
}
# tics
if (%xtics) {
@@ -1283,7 +1299,7 @@ sub write_gnuplot_file {
$gnuplot_input .= 'set label "'.$label->{'text'}.'" at '.
$label->{'xpos'}.','.$label->{'ypos'}.' '.$label->{'justify'};
if ($target eq 'tex') {
- $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$pt.'pt"' ;
+ $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ;
}
$gnuplot_input .= $/;
}