--- loncom/xml/lonplot.pm 2002/02/06 10:33:27 1.49 +++ loncom/xml/lonplot.pm 2002/04/25 17:23:10 1.68 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.49 2002/02/06 10:33:27 matthew Exp $ +# $Id: lonplot.pm,v 1.68 2002/04/25 17:23:10 sakharuk Exp $ # # Copyright Michigan State University Board of Trustees # @@ -29,7 +29,7 @@ # 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 Matthew +# 01/21 02/05 02/06 2/28Matthew package Apache::lonplot; @@ -91,22 +91,20 @@ my %linestyles = yerrorbars => [3,4], xyerrorbars => [4,6], boxes => 3, -# boxerrorbars => [3,4,5], -# boxxyerrorbars => [4,6,7], -# financebars => 5, -# candlesticks => 5, vector => 4 ); my $int_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^\d+$/}; my $real_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/}; +my $pos_real_test = + sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d*\.?\d*([eE][+-]\d+)?$/}; my $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-f]{6}$/}; my $onoff_test = sub {$_[0]=~/^(on|off)$/}; my $key_pos_test = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/}; my $sml_test = sub {$_[0]=~/^(small|medium|large)$/}; my $linestyle_test = sub {exists($linestyles{$_[0]})}; -my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w\(\)]+ ?)+$/}; +my $words_test = sub {$_[0]=~s/\s+/ /g;$_[0]=~/^([\w~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/}; ################################################################### ## ## @@ -114,7 +112,7 @@ my $words_test = sub {$_[0]=~s/\s+/ ## ## ################################################################### my @gnuplot_edit_order = - qw/bgcolor fgcolor height width font transparent grid border align/; + qw/alttag bgcolor fgcolor height width font transparent grid border align/; my $gnuplot_help_text = <<"ENDPLOTHELP";

@@ -144,19 +142,28 @@ A gnuplot tag can contain the fol

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 => { + default => 'dynamically generated plot', + test => $words_test, + description => 'brief description of the plot', + edit_type => 'entry', + size => '40' + }, height => { - default => 200, + default => 300, test => $int_test, description => 'height of image (pixels)', edit_type => 'entry', size => '10' }, width => { - default => 200, + default => 400, test => $int_test, description => 'width of image (pixels)', edit_type => 'entry', @@ -183,7 +190,7 @@ my %gnuplot_defaults = edit_type => 'onoff' }, grid => { - default => 'off', + default => 'on', test => $onoff_test, description => 'Display grid', edit_type => 'onoff' @@ -202,7 +209,7 @@ my %gnuplot_defaults = choices => ['small','medium','large'] }, align => { - default => 'left', + default => 'center', test => sub {$_[0]=~/^(left|right|center)$/}, description => 'alignment for image in html', edit_type => 'choice', @@ -299,6 +306,7 @@ my %tic_defaults = }, ); +my @axis_edit_order = ('color','xmin','xmax','ymin','ymax'); my %axis_defaults = ( color => { @@ -360,8 +368,8 @@ first tag will be the X data and the sec

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 +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 @@ -369,6 +377,8 @@ is an error in your function tag. ENDCURVEHELP +my @curve_edit_order = ('color','name','linestyle','pointtype','pointsize'); + my %curve_defaults = ( color => { @@ -391,7 +401,29 @@ my %curve_defaults = description => 'Line style', edit_type => 'choice', choices => [keys(%linestyles)] - } + }, +# gnuplots term=gif driver does not handle linewidth :( +# linewidth => { +# default => 1, +# test => $int_test, +# description => 'Line width (may not apply to all line styles)', +# edit_type => 'choice', +# choices => [1,2,3,4,5,6,7,8,9,10] +# }, + pointsize => { + default => 1, + test => $pos_real_test, + description => 'point size (may not apply to all line styles)', + edit_type => 'entry', + size => '5' + }, + pointtype => { + default => 1, + test => $int_test, + description => 'point type (may not apply to all line styles)', + edit_type => 'choice', + choices => [0,1,2,3,4,5,6] + } ); ################################################################### @@ -413,10 +445,7 @@ sub start_gnuplot { ('title','xlabel','ylabel','key','axis','label','curve', 'xtics','ytics')); push (@Apache::lonxml::namespace,'lonplot'); - if ($target eq 'web') { - my $inside = &Apache::lonxml::get_all_text("/gnuplot",$$parser[-1]); - $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); - &Apache::lonxml::newparser($parser,\$inside); + if ($target eq 'web' || $target eq 'tex') { &get_attributes(\%plot,\%gnuplot_defaults,$parstack,$safeeval, $tagstack->[-1]); } elsif ($target eq 'edit') { @@ -441,23 +470,37 @@ sub end_gnuplot { &Apache::lonxml::deregister('Apache::lonplot', ('title','xlabel','ylabel','key','axis','label','curve')); my $result = ''; - if ($target eq 'web') { + 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 + if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || + $target eq 'answer') { + $randnumber=int(rand(1000)); + } + if ($target eq 'web' || $target eq 'tex') { &check_inputs(); # Make sure we have all the data we need ## ## Determine filename my $tmpdir = '/home/httpd/perl/tmp/'; my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}. - '_'.time.'_'.$$.int(rand(1000)).'_plot.data'; + '_'.time.'_'.$$.$randnumber.'_plot.data'; ## Write the plot description to the file - &write_gnuplot_file($tmpdir,$filename); + &write_gnuplot_file($tmpdir,$filename,$target); + $filename = &Apache::lonnet::escape($filename); ## return image tag for the plot - $result .= <<"ENDIMAGE"; -image should be /cgi-bin/plot.gif?$filename + alt = "$plot{'alttag'}" /> ENDIMAGE + } elsif ($target eq 'tex') { + &Apache::lonnet::ssi("/cgi-bin/plot.gif?file=$filename&output=eps"); + $result = '\\\\ \graphicspath{/home/httpd/perl/tmp/}\fbox{\includegraphics[width=9.0 cm]{'.&Apache::lonnet::unescape($filename).'.eps}} \\\\'; + } } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -469,7 +512,7 @@ ENDIMAGE sub start_xtics { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { &get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval, $tagstack->[-1]); } elsif ($target eq 'edit') { @@ -489,7 +532,7 @@ sub start_xtics { sub end_xtics { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -500,7 +543,7 @@ sub end_xtics { sub start_ytics { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { &get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval, $tagstack->[-1]); } elsif ($target eq 'edit') { @@ -520,7 +563,7 @@ sub start_ytics { sub end_ytics { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -532,7 +575,7 @@ sub end_ytics { sub start_key { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { &get_attributes(\%key,\%key_defaults,$parstack,$safeeval, $tagstack->[-1]); } elsif ($target eq 'edit') { @@ -551,7 +594,7 @@ sub start_key { sub end_key { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -562,8 +605,9 @@ sub end_key { sub start_title { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { $title = &Apache::lonxml::get_all_text("/title",$$parser[-1]); + $title=&Apache::run::evaluate($title,$safeeval,$$parstack[-1]); $title =~ s/\n/ /g; if (length($title) > $max_str_len) { $title = substr($title,0,$max_str_len); @@ -573,7 +617,7 @@ sub start_title { my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]); $result.=&Apache::edit::end_row(). &Apache::edit::start_spanning_row(). - &Apache::edit::editfield('',$text,'',60,1); + &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/title"); $result.=&Apache::edit::rebuild_tag($token); @@ -585,7 +629,7 @@ sub start_title { sub end_title { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -595,8 +639,9 @@ sub end_title { sub start_xlabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { $xlabel = &Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); + $xlabel=&Apache::run::evaluate($xlabel,$safeeval,$$parstack[-1]); $xlabel =~ s/\n/ /g; if (length($xlabel) > $max_str_len) { $xlabel = substr($xlabel,0,$max_str_len); @@ -606,7 +651,7 @@ sub start_xlabel { my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]); $result.=&Apache::edit::end_row(). &Apache::edit::start_spanning_row(). - &Apache::edit::editfield('',$text,'',60,1); + &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/xlabel"); $result.=&Apache::edit::rebuild_tag($token); @@ -618,7 +663,7 @@ sub start_xlabel { sub end_xlabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -629,8 +674,9 @@ sub end_xlabel { sub start_ylabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { $ylabel = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); + $ylabel = &Apache::run::evaluate($ylabel,$safeeval,$$parstack[-1]); $ylabel =~ s/\n/ /g; if (length($ylabel) > $max_str_len) { $ylabel = substr($ylabel,0,$max_str_len); @@ -640,7 +686,7 @@ sub start_ylabel { my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]); $result .= &Apache::edit::end_row(). &Apache::edit::start_spanning_row(). - &Apache::edit::editfield('',$text,'',60,1); + &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { my $text=$$parser[-1]->get_text("/ylabel"); $result.=&Apache::edit::rebuild_tag($token); @@ -652,7 +698,7 @@ sub start_ylabel { sub end_ylabel { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -663,11 +709,12 @@ sub end_ylabel { sub start_label { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { my %label; &get_attributes(\%label,\%label_defaults,$parstack,$safeeval, $tagstack->[-1]); my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]); + $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; @@ -678,7 +725,7 @@ sub start_label { my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]); $result .= &Apache::edit::end_row(). &Apache::edit::start_spanning_row(). - &Apache::edit::editfield('',$text,'',60,1); + &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { &Apache::edit::get_new_args ($token,$parstack,$safeeval,keys(%label_defaults)); @@ -692,7 +739,7 @@ sub start_label { sub end_label { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -705,7 +752,7 @@ sub start_curve { my $result=''; &Apache::lonxml::register('Apache::lonplot',('function','data')); push (@Apache::lonxml::namespace,'curve'); - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { my %curve; &get_attributes(\%curve,\%curve_defaults,$parstack,$safeeval, $tagstack->[-1]); @@ -713,7 +760,8 @@ sub start_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); + $result .= &edit_attributes($target,$token,\%curve_defaults, + \@curve_edit_order); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args ($token,$parstack,$safeeval,keys(%curve_defaults)); @@ -730,7 +778,7 @@ sub end_curve { my $result = ''; pop @Apache::lonxml::namespace; &Apache::lonxml::deregister('Apache::lonplot',('function','data')); - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } @@ -741,19 +789,20 @@ sub end_curve { sub start_function { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { if (exists($curves[-1]->{'data'})) { &Apache::lonxml::warning('Use of precludes use of . The will be omitted in favor of the declaration.'); delete $curves[-1]->{'data'} ; } - $curves[-1]->{'function'} = - &Apache::lonxml::get_all_text("/function",$$parser[-1]); + my $function = &Apache::lonxml::get_all_text("/function",$$parser[-1]); + $function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]); + $curves[-1]->{'function'} = $function; } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Gnuplot compatible curve function'); my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]); $result .= &Apache::edit::end_row(). &Apache::edit::start_spanning_row(). - &Apache::edit::editfield('',$text,'',60,1); + &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); my $text=$$parser[-1]->get_text("/function"); @@ -765,7 +814,7 @@ sub start_function { sub end_function { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result .= &Apache::edit::end_table(); } @@ -776,7 +825,7 @@ sub end_function { sub start_data { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { if (exists($curves[-1]->{'function'})) { &Apache::lonxml::warning('Use of precludes use of .'. '. The will be omitted in favor of '. @@ -784,6 +833,7 @@ sub start_data { delete($curves[-1]->{'function'}); } my $datatext = &Apache::lonxml::get_all_text("/data",$$parser[-1]); + $datatext=&Apache::run::evaluate($datatext,$safeeval,$$parstack[-1]); # Deal with cases where we're given an array... if ($datatext =~ /^\@/) { $datatext = &Apache::run::run('return "'.$datatext.'"', @@ -828,7 +878,7 @@ sub start_data { my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]); $result .= &Apache::edit::end_row(). &Apache::edit::start_spanning_row(). - &Apache::edit::editfield('',$text,'',60,1); + &Apache::edit::editline('',$text,'',60); } elsif ($target eq 'modified') { $result.=&Apache::edit::rebuild_tag($token); my $text=$$parser[-1]->get_text("/data"); @@ -840,7 +890,7 @@ sub start_data { sub end_data { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result .= &Apache::edit::end_table(); } @@ -851,12 +901,13 @@ sub end_data { sub start_axis { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { &get_attributes(\%axis,\%axis_defaults,$parstack,$safeeval, $tagstack->[-1]); } elsif ($target eq 'edit') { $result .= &Apache::edit::tag_start($target,$token,'Plot Axes'); - $result .= &edit_attributes($target,$token,\%axis_defaults); + $result .= &edit_attributes($target,$token,\%axis_defaults, + \@axis_edit_order); } elsif ($target eq 'modified') { my $constructtag=&Apache::edit::get_new_args ($token,$parstack,$safeeval,keys(%axis_defaults)); @@ -870,7 +921,7 @@ sub start_axis { sub end_axis { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'tex') { } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_end($target,$token); } elsif ($target eq 'modified') { @@ -916,7 +967,7 @@ sub get_attributes{ ##------------------------------------------------------- write_gnuplot_file sub write_gnuplot_file { - my ($tmpdir,$filename)= @_; + my ($tmpdir,$filename,$target)= @_; my $gnuplot_input = ''; my $curve; # Collect all the colors @@ -930,19 +981,26 @@ sub write_gnuplot_file { $plot{'fgcolor'} ); } # set term - $gnuplot_input .= 'set term gif '; - $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on'); - $gnuplot_input .= $plot{'font'} . ' '; - $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' '; - $gnuplot_input .= "@Colors\n"; - # set output - $gnuplot_input .= "set output\n"; + if ($target eq 'web') { + $gnuplot_input .= 'set term gif '; + $gnuplot_input .= 'transparent ' if ($plot{'transparent'} eq 'on'); + $gnuplot_input .= $plot{'font'} . ' '; + $gnuplot_input .= 'size '.$plot{'width'}.','.$plot{'height'}.' '; + $gnuplot_input .= "@Colors\n"; + # set output + $gnuplot_input .= "set output\n"; + } elsif ($target eq 'tex') { + $gnuplot_input .= "set term postscript eps monochrome\n"; + $gnuplot_input .= "set output \"/home/httpd/perl/tmp/". + &Apache::lonnet::unescape($filename).".eps\"\n"; + } # grid $gnuplot_input .= 'set grid'.$/ if ($plot{'grid'} eq 'on'); # border $gnuplot_input .= ($plot{'border'} eq 'on'? 'set border'.$/ : - 'set noborder'.$/ ); # title, xlabel, ylabel + 'set noborder'.$/ ); + # title, xlabel, ylabel # titles $gnuplot_input .= "set title \"$title\"\n" if (defined($title)) ; $gnuplot_input .= "set xlabel \"$xlabel\"\n" if (defined($xlabel)); @@ -971,7 +1029,7 @@ sub write_gnuplot_file { if (%key) { $gnuplot_input .= 'set key '.$key{'pos'}.' '; if ($key{'title'} ne '') { - $gnuplot_input .= 'title " '.$key{'title'}.'" '; + $gnuplot_input .= 'title "'.$key{'title'}.'" '; } $gnuplot_input .= ($key{'box'} eq 'on' ? 'box ' : 'nobox ').$/; } else { @@ -993,6 +1051,19 @@ sub write_gnuplot_file { $curve->{'function'}.' title "'. $curve->{'name'}.'" with '. $curve->{'linestyle'}; +# +# gnuplot's term=gif driver does not handle linewidths :( +# . ' linewidth '. $curve->{'linewidth'}; +# + if (($curve->{'linestyle'} eq 'points') || + ($curve->{'linestyle'} eq 'linespoints') || + ($curve->{'linestyle'} eq 'errorbars') || + ($curve->{'linestyle'} eq 'xerrorbars') || + ($curve->{'linestyle'} eq 'yerrorbars') || + ($curve->{'linestyle'} eq 'xyerrorbars')) { + $gnuplot_input.=' pointtype '.$curve->{'pointtype'}; + $gnuplot_input.=' pointsize '.$curve->{'pointsize'}; + } } elsif (exists($curve->{'data'})) { # Store data values in $datatext my $datatext = ''; @@ -1016,6 +1087,15 @@ sub write_gnuplot_file { $gnuplot_input.= '"'.$datafilename.'" title "'. $curve->{'name'}.'" with '. $curve->{'linestyle'}; + if (($curve->{'linestyle'} eq 'points') || + ($curve->{'linestyle'} eq 'linespoints') || + ($curve->{'linestyle'} eq 'errorbars') || + ($curve->{'linestyle'} eq 'xerrorbars') || + ($curve->{'linestyle'} eq 'yerrorbars') || + ($curve->{'linestyle'} eq 'xyerrorbars')) { + $gnuplot_input.=' pointtype '.$curve->{'pointtype'}; + $gnuplot_input.=' pointsize '.$curve->{'pointsize'}; + } } } # Write the output to a file. @@ -1089,11 +1169,11 @@ sub edit_attributes { sub insert_gnuplot { my $result = ''; # plot attributes - $result .= "{'default'}\"\n"; + $result .= "\n $attr=\"$gnuplot_defaults{$attr}->{'default'}\""; } - $result .= ">\n"; + $result .= ">"; # Add the components (most are commented out for simplicity) # $result .= &insert_key(); # $result .= &insert_axis(); @@ -1101,8 +1181,8 @@ sub insert_gnuplot { # $result .= &insert_xlabel(); # $result .= &insert_ylabel(); $result .= &insert_curve(); - # close up the - $result .= "\n"; + # close up the + $result .= "\n"; return $result; } @@ -1116,9 +1196,9 @@ sub insert_xtics { my $result; $result .= "\n {'default'}\" "; + $result .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" "; } - $result .= "/>\n"; + $result .= "/>"; return $result; } @@ -1126,19 +1206,19 @@ sub insert_ytics { my $result; $result .= "\n {'default'}\" "; + $result .= "\n $attr=\"$tic_defaults{$attr}->{'default'}\" "; } - $result .= "/>\n"; + $result .= "/>"; return $result; } sub insert_key { my $result; - $result .= "\n {'default'}\"\n"; + $result .= "\n $attr=\"$key_defaults{$attr}->{'default'}\""; } - $result .= " />\n"; + $result .= " />"; return $result; } @@ -1146,24 +1226,24 @@ sub insert_axis{ my $result; $result .= "\n {'default'}\"\n"; + $result .= "\n $attr=\"$axis_defaults{$attr}->{'default'}\""; } - $result .= " />\n"; + $result .= " />"; return $result; } -sub insert_title { return "\n \n"; } -sub insert_xlabel { return "\n \n"; } -sub insert_ylabel { return "\n \n"; } +sub insert_title { return "\n "; } +sub insert_xlabel { return "\n "; } +sub insert_ylabel { return "\n "; } sub insert_label { my $result; $result .= "\n \n"; + $result .= ">"; return $result; } @@ -1171,22 +1251,22 @@ sub insert_curve { my $result; $result .= "\n {'default'}."\""; } - $result .= " >\n"; - $result .= &insert_data().&insert_data()."\n"; + $result .= " >"; + $result .= &insert_data().&insert_data()."\n "; } sub insert_function { my $result; - $result .= "\n"; + $result .= "\n "; return $result; } sub insert_data { my $result; - $result .= " \n"; + $result .= "\n "; return $result; }