--- loncom/xml/lonplot.pm 2003/10/24 17:35:32 1.92 +++ loncom/xml/lonplot.pm 2004/08/17 17:37:56 1.100 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.92 2003/10/24 17:35:32 matthew Exp $ +# $Id: lonplot.pm,v 1.100 2004/08/17 17:37:56 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -25,11 +25,6 @@ # # http://www.lon-capa.org/ # -# 12/15/01 Matthew -# 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 12/31 Matthew -# 01/01/02 Matthew -# 01/02 01/03 01/04 01/07 01/08 01/09 Matthew -# 01/21 02/05 02/06 2/28Matthew package Apache::lonplot; @@ -41,8 +36,17 @@ use Apache::response; use Apache::lonxml; use Apache::edit; +use vars qw/$weboutputformat $versionstring/; + BEGIN { - &Apache::lonxml::register('Apache::lonplot',('gnuplot')); + &Apache::lonxml::register('Apache::lonplot',('gnuplot')); + # + # Determine the version of GNUPLOT + $weboutputformat = 'gif'; + $versionstring = `gnuplot --version 2>/dev/null`; + if ($versionstring =~ /^gnuplot 4/) { + $weboutputformat = 'png'; + } } ## @@ -117,38 +121,6 @@ my @gnuplot_edit_order = qw/alttag bgcolor fgcolor height width font transparent grid samples border align texwidth texfont plottype/; -my $gnuplot_help_text = <<"ENDPLOTHELP"; -

-The gnuplot tag allows an author to design a plot which can -be created on the fly. This is intended for use in homework problems -where each student needs to see a distinct plot. It can be used in -conjunction with a script tag to generate random plots. -

-A gnuplot tag can contain the following sub-tags: -

-
-
Plot Label -
Allows you to place text at a given (x,y) coordinate on the plot. -
Plot Title -
The title of the plot -
Plot Xlabel -
The label on the horizontal axis of the plot -
Plot Ylabel -
The label on the vertical axis of the plot -
Plot Axes -
allows specification of the x and y ranges displayed in the plot -
Plot Key -
Lists the functions displayed in the plot. -
Plot Curve -
Sets the data used in the plot. -
Plot Tics -
Allows specification of the x and y coordinate 'tics' on the axes. -This is mostly used to adjust the grid lines when a grid is displayed. -
-If you are having trouble with your plot, please read the help -available on Plot Curve. -ENDPLOTHELP - my %gnuplot_defaults = ( alttag => { @@ -237,14 +209,14 @@ my %gnuplot_defaults = test => $int_test, description => 'Font size to use in TeX output (pts):', edit_type => 'choice', - choices => [qw/10 12 14 16 18 20 22 24 26 28 30 32 34 36/], + choices => [qw/8 10 12 14 16 18 20 22 24 26 28 30 32 34 36/], }, plottype => { default => 'Cartesian', test => sub {$_[0]=~/^(Polar|Cartesian)$/}, description => 'Plot type:', edit_type => 'choice', - choices => ['Polar','Cartesian'] + choices => ['Cartesian','Polar'] }, ); @@ -339,7 +311,7 @@ my %tic_defaults = minorfreq => { default => '0', test => $int_test, - description => 'Number of minor tics between major tic marks', + description => 'Number of minor tics per major tic mark', edit_type => 'entry', size => '10' }, @@ -385,37 +357,6 @@ my %axis_defaults = } ); -my $curve_help_text = <<"ENDCURVEHELP"; -The curve tag is where you set the data to be plotted by gnuplot. -There are two ways of entering the information: -
-
Curve Data -
Using a data tag you can specify the numbers used to produce -the plot. -

-By default, two data tags will be available in a plot. The -first will specify X coordinates of the data and the second will -give the Y coordinates of the data. When working with a linestyle that -requires more than two data sets, inserting another data tag is -required. Unfortunately, you must make sure the data tags appear -in the order gnuplot expects the data. -

-Specifying the data should usually be done with a perl variable or array, -such as \@Xdata and \@Ydata. You may also specify numerical data seperated -by commas. Again, the order of the data tags is important. The -first tag will be the X data and the second will be the Y data. -

-
Curve Function -
The function tag allows you to specify the curve to be -plotted as a formula that gnuplot can understand. Be careful using this -tag. It is surprisingly easy to give gnuplot a function it cannot deal -with properly. Be explicit: 2*sin(2*3.141592*x/4) will work but -2sin(2*3.141592x/4) will not. If you do not receive any errors in the -gnuplot data but still do not have an image produced, it is likely there -is an error in your function tag. -
-ENDCURVEHELP - my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize'); my %curve_defaults = @@ -489,8 +430,6 @@ sub start_gnuplot { $tagstack->[-1]); } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'GnuPlot'); - $result .= &make_javascript(); - $result .= &help_win($gnuplot_help_text); $result .= &edit_attributes($target,$token,\%gnuplot_defaults, \@gnuplot_edit_order); } elsif ($target eq 'modified') { @@ -512,7 +451,7 @@ sub end_gnuplot { my $randnumber; # need to call rand everytime start_script would evaluate, as the # safe space rand number generator and the global rand generator - # are not seperate + # are not separate if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'answer') { $randnumber=int(rand(1000)); @@ -530,7 +469,7 @@ sub end_gnuplot { ## return image tag for the plot if ($target eq 'web') { $result .= <<"ENDIMAGE"; -get_text("/title"); $result.=&Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::modifiedfield($token); + $result.=&Apache::edit::modifiedfield("/title",$parser); } return $result; } @@ -693,9 +631,8 @@ sub start_xlabel { &Apache::edit::start_spanning_row(). &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { - my $text=$$parser[-1]->get_text("/xlabel"); $result.=&Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::modifiedfield($token); + $result.=&Apache::edit::modifiedfield("/xlabel",$parser); } return $result; } @@ -728,9 +665,8 @@ sub start_ylabel { &Apache::edit::start_spanning_row(). &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { - my $text=$$parser[-1]->get_text("/ylabel"); $result.=&Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::modifiedfield($token); + $result.=&Apache::edit::modifiedfield("/ylabel",$parser); } return $result; } @@ -770,8 +706,7 @@ sub start_label { &Apache::edit::get_new_args ($token,$parstack,$safeeval,keys(%label_defaults)); $result.=&Apache::edit::rebuild_tag($token); - my $text=$$parser[-1]->get_text("/label"); - $result.=&Apache::edit::modifiedfield($token); + $result.=&Apache::edit::modifiedfield("/label",$parser); } return $result; } @@ -799,7 +734,6 @@ sub start_curve { push (@curves,\%curve); } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Curve'); - $result .= &help_win($curve_help_text); $result .= &edit_attributes($target,$token,\%curve_defaults, \@curve_edit_order); } elsif ($target eq 'modified') { @@ -849,8 +783,7 @@ sub start_function { &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); - my $text=$$parser[-1]->get_text("/function"); - $result.=&Apache::edit::modifiedfield($token); + $result.=&Apache::edit::modifiedfield("/function",$parser); } return $result; } @@ -892,7 +825,7 @@ sub start_data { my @data; if ($datatext =~ /,/) { # comma deliminated @data = split /,/,$datatext; - } else { # Assume it's space seperated. + } else { # Assume it's space separated. @data = split / /,$datatext; } for (my $i=0;$i<=$#data;$i++) { @@ -927,8 +860,7 @@ sub start_data { &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); - my $text=$$parser[-1]->get_text("/data"); - $result.=&Apache::edit::modifiedfield($token); + $result.=&Apache::edit::modifiedfield("/data",$parser); } return $result; } @@ -1022,6 +954,24 @@ sub write_gnuplot_file { my $gnuplot_input = ''; my $curve; my $pt = $plot{'texfont'}; + # + # Check to be sure we do not have any empty curves + my @curvescopy; + foreach my $curve (@curves) { + if (exists($curve->{'function'})) { + if ($curve->{'function'} !~ /^\s*$/) { + push(@curvescopy,$curve); + } + } elsif (exists($curve->{'data'})) { + foreach my $data (@{$curve->{'data'}}) { + if (scalar(@$data) > 0) { + push(@curvescopy,$curve); + last; + } + } + } + } + @curves = @curvescopy; # Collect all the colors my @Colors; push @Colors, $plot{'bgcolor'}; @@ -1345,40 +1295,6 @@ sub insert_data { } ##---------------------------------------------------------------------- -# Javascript functions to display help for tags - -sub make_javascript { - my $helpwindowwidth = 400; - my $helpwindowheight = 400; - my $result = ''; - $result.=<<"ENDFUNCTION"; - -ENDFUNCTION - return $result; -} - -sub help_win { - my ($helptext)=@_; - $helptext =~ s/\n/ /g; - $helptext =~ s/\'/\\\'/g; - my $result = ''; - $result.=<<"ENDWIN"; -
-help -
-ENDWIN - return $result; -} -##---------------------------------------------------------------------- 1; __END__