version 1.146, 2008/06/09 10:07:01
|
version 1.148.2.1, 2008/12/11 22:48:56
|
Line 1362 sub start_function {
|
Line 1362 sub start_function {
|
my $function = &Apache::lonxml::get_all_text("/function",$parser, |
my $function = &Apache::lonxml::get_all_text("/function",$parser, |
$style); |
$style); |
$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]); |
$function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]); |
|
$function=~s/\^/\*\*/gs; |
$curves[-1]->{'function'} = $function; |
$curves[-1]->{'function'} = $function; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function'); |
$result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function'); |
Line 1432 sub start_data {
|
Line 1433 sub start_data {
|
} |
} |
# complain if the number of data points is not the same as |
# complain if the number of data points is not the same as |
# in previous sets of data. |
# in previous sets of data. |
if (($curves[-1]->{'data'}) && ($#data != $#{@{$curves[-1]->{'data'}->[0]}})){ |
if (($curves[-1]->{'data'}) && ($#data != $#{$curves[-1]->{'data'}->[0]})){ |
&Apache::lonxml::warning |
&Apache::lonxml::warning |
('Number of data points is not consistent with previous '. |
('Number of data points is not consistent with previous '. |
'number of data points'); |
'number of data points'); |
Line 1695 sub write_gnuplot_file {
|
Line 1696 sub write_gnuplot_file {
|
$gnuplot_input .= "$ytics{'start'}, "; |
$gnuplot_input .= "$ytics{'start'}, "; |
$gnuplot_input .= "$ytics{'increment'}, "; |
$gnuplot_input .= "$ytics{'increment'}, "; |
$gnuplot_input .= "$ytics{'end'} "; |
$gnuplot_input .= "$ytics{'end'} "; |
|
if ($target eq 'tex') { |
|
$gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso-8859-1 encoding. |
|
} |
|
$gnuplot_input .= "\n"; |
if ($ytics{'minorfreq'} != 0) { |
if ($ytics{'minorfreq'} != 0) { |
$gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n"; |
$gnuplot_input .= "set mytics ".$ytics{'minorfreq'}."\n"; |
} |
} |
if ($target eq 'tex') { |
|
$gnuplot_input .= 'font "Helvetica,22"'; # Needed in iso-8859-1 encoding. |
|
} |
|
$gnuplot_input .= "\n"; |
|
|
|
} else { |
} else { |
if ($target eq 'tex') { |
if ($target eq 'tex') { |
$gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc. |
$gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc. |