Diff for /loncom/xml/lonplot.pm between versions 1.143 and 1.155

version 1.143, 2008/05/27 10:40:30 version 1.155, 2012/02/22 10:16:39
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
   
   
   
   
 package Apache::lonplot;  package Apache::lonplot;
   
 use strict;  use strict;
Line 57  BEGIN { Line 60  BEGIN {
 }  }
   
   
   =pod
   
 ##   ## 
 ## Description of data structures:  ## Description of data structures:
 ##  ##
Line 88  BEGIN { Line 93  BEGIN {
 ##                                                               ##  ##                                                               ##
 ###################################################################  ###################################################################
   
   =cut
   
 my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text  my $max_str_len = 50;    # if a label, title, xlabel, or ylabel text
                          # is longer than this, it will be truncated.                           # is longer than this, it will be truncated.
   
Line 169  my %gnuplot_defaults = Line 176  my %gnuplot_defaults =
  test        => $color_test,    test        => $color_test, 
  description => 'Background color of image (xffffff)',   description => 'Background color of image (xffffff)',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10',
            class       => 'colorchooser'
  },   },
      fgcolor      => {       fgcolor      => {
  default     => 'x000000',   default     => 'x000000',
  test        => $color_test,   test        => $color_test,
  description => 'Foreground color of image (x000000)',   description => 'Foreground color of image (x000000)',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10',
            class       => 'colorchooser'
  },   },
      transparent  => {       transparent  => {
  default     => 'off',   default     => 'off',
Line 448  my %tic_defaults = Line 457  my %tic_defaults =
  },            },         
      );       );
   
 my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat');  my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat', 'xzero', 'yzero');
 my %axis_defaults =   my %axis_defaults = 
     (      (
      color   => {       color   => {
Line 456  my %axis_defaults = Line 465  my %axis_defaults =
  test => $color_test,   test => $color_test,
  description => 'Color of grid lines (x000000)',   description => 'Color of grid lines (x000000)',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10',
            class       => 'colorchooser'
  },   },
      xmin      => {       xmin      => {
  default => '-10.0',   default => '-10.0',
Line 496  my %axis_defaults = Line 506  my %axis_defaults =
      yformat      => {       yformat      => {
          default     => 'on',           default     => 'on',
          test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},           test        => sub {$_[0]=~/^(on|off|\d+(f|F|e|E))$/},
          description => 'X-axis number formatting',           description => 'Y-axis number formatting',
          edit_type   => 'choice',           edit_type   => 'choice',
          choices     => ['on', 'off', '2e', '2f'],           choices     => ['on', 'off', '2e', '2f'],
          },           },
        
        xzero => {
         default => 'off',
         test => sub {$_[0]=~/^(off|line|thick-line|dotted)$/},
         description => 'Show x-zero (y=0) axis',
         edit_type  => 'choice',
         choices => ['off', 'line', 'thick-line', 'dotted'],
         },
        
        yzero => {
         default => 'off',
         test => sub {$_[0]=~/^(off|line|thick-line|dotted)$/},
         description => 'Show y-zero (x=0) axis',
         edit_type  => 'choice',
         choices => ['off', 'line', 'thick-line', 'dotted'],
         },
      );       );
   
 my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');  my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');
Line 512  my %curve_defaults = Line 537  my %curve_defaults =
  test => $color_test,   test => $color_test,
  description => 'Color of curve (x000000)',   description => 'Color of curve (x000000)',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10',
    class       => 'colorchooser'
  },   },
      name      => {       name      => {
  default => '',   default => '',
Line 598  sub start_gnuplot { Line 624  sub start_gnuplot {
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args   my $constructtag=&Apache::edit::get_new_args
     ($token,$parstack,$safeeval,keys(%gnuplot_defaults));      ($token,$parstack,$safeeval,keys(%gnuplot_defaults));
   
  if ($constructtag) {   if ($constructtag) {
       #
       # The color chooser does not prepent x to the color values
       # Do that here:
       #
       foreach my $attribute ('bgcolor', 'fgcolor') {
    my $value = $token->[2]{$attribute};
    if (defined $value && !($value =~ /^x/)) {
       $token->[2]{$attribute} = 'x' . $value;
    }
       }
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
  }   }
     }      }
Line 612  sub end_gnuplot { Line 649  sub end_gnuplot {
  ('title','xlabel','ylabel','key','axis','label','curve'));   ('title','xlabel','ylabel','key','axis','label','curve'));
     my $result = '';      my $result = '';
     my $randnumber;      my $randnumber;
       my $tmpdir =LONCAPA::tempdir(); # Where temporary files live:
   
     # need to call rand everytime start_script would evaluate, as the      # need to call rand everytime start_script would evaluate, as the
     # safe space rand number generator and the global rand generator       # safe space rand number generator and the global rand generator 
     # are not separate      # are not separate
Line 623  sub end_gnuplot { Line 662  sub end_gnuplot {
  &check_inputs(); # Make sure we have all the data we need   &check_inputs(); # Make sure we have all the data we need
  ##   ##
  ## Determine filename   ## Determine filename
  my $tmpdir = '/home/httpd/perl/tmp/';  
  my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.   my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
     '_'.time.'_'.$$.$randnumber.'_plot';      '_'.time.'_'.$$.$randnumber.'_plot';
  ## Write the plot description to the file   ## Write the plot description to the file
Line 644  ENDIMAGE Line 682  ENDIMAGE
     #might be inside the safe space, register the URL for later      #might be inside the safe space, register the URL for later
     &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");      &Apache::lonxml::register_ssi("/cgi-bin/plot.gif?file=$filename.data&output=eps");
     $result  = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n";      $result  = "%DYNAMICIMAGE:$Apache::lonplot::plot{'width'}:$Apache::lonplot::plot{'height'}:$Apache::lonplot::plot{'texwidth'}\n";
     $result .= '\graphicspath{{/home/httpd/perl/tmp/}}'."\n";      $result .= '\graphicspath{{'.$tmpdir.'}}'."\n";
     $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}';      $result .= '\includegraphics[width='.$Apache::lonplot::plot{'texwidth'}.' mm]{'.&unescape($filename).'.eps}';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
Line 757  sub get_font { Line 795  sub get_font {
  $selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};   $selected_font = $font_properties{$Apache::lonplot::plot{'fontface'}};
     }      }
     if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {      if ($target eq 'tex' && defined($Apache::lonplot::plot{'texfont'})) {
   # $selected_font = $font_properties{'classic'};
  $size = $Apache::lonplot::plot{'texfont'};   $size = $Apache::lonplot::plot{'texfont'};
     }      }
     return ($size, $selected_font);      return ($size, $selected_font);
Line 1037  my %lookup = Line 1076  my %lookup =
       '(ensp|#8194)'   => {'tex' => ' ',              'web' => "\x{2002}"}, # en space.        '(ensp|#8194)'   => {'tex' => ' ',              'web' => "\x{2002}"}, # en space.
       '(emsp|#8195)'   => {'tex' => ' ',              'web' => "\x{2003}"}, # em space.        '(emsp|#8195)'   => {'tex' => ' ',              'web' => "\x{2003}"}, # em space.
       '(thinsp|#8201)' => {'tex' => ' ',              'web' => "\x{2009}"}, # thin space.        '(thinsp|#8201)' => {'tex' => ' ',              'web' => "\x{2009}"}, # thin space.
       '(zwnj|#8204)'   => {'tex' => '',               'web' => "\x{200c}"}, # Zero width non joiner.        '(zwnj|#8204)'   => {'tex' => ' ',               'web' => "\x{200c}"}, # Zero width non joiner.
       '(zwj|#8205)'    => {'tex' => '',               'web' => "\x{200d}"}, # Zero width joiner.        '(zwj|#8205)'    => {'tex' => ' ',               'web' => "\x{200d}"}, # Zero width joiner.
       '(lrm|#8206)'    => {'tex' => '',               'web' => "\x{200e}"}, # Left to right mark        '(lrm|#8206)'    => {'tex' => ' ',               'web' => "\x{200e}"}, # Left to right mark
       '(rlm|#8207)'    => {'tex' => '',               'web' => "\x{200f}"}, # right to left mark.        '(rlm|#8207)'    => {'tex' => ' ',               'web' => "\x{200f}"}, # right to left mark.
       '(ndash|#8211)'  => {'tex' => '{/Text \55}',    'web' => "\x{2013}"}, # en dash.        '(ndash|#8211)'  => {'tex' => '{/Text \55}',    'web' => "\x{2013}"}, # en dash.
       '(mdash|#8212)'  => {'tex' => '{/Symbol \55}',  'web' => "\x{2014}"}, # em dash.        '(mdash|#8212)'  => {'tex' => '{/Symbol \55}',  'web' => "\x{2014}"}, # em dash.
       '(lsquo|#8216)'  => {'tex' => '{/Text \140}',   'web' => "\x{2018}"}, # Left single quote.        '(lsquo|#8216)'  => {'tex' => '{/Text \140}',   'web' => "\x{2018}"}, # Left single quote.
       '(rsquo|#8217)'  => {'tex' => '{/Symbol \242}', 'web' => "\x{2019}"}, # Right single quote.        '(rsquo|#8217)'  => {'tex' => '\47',            'web' => "\x{2019}"}, # Right single quote.
       '(sbquo|#8218)'  => {'tex' => ',',              'web' => "\x{201a}"}, # Single low-9 quote.        '(sbquo|#8218)'  => {'tex' => '\54',             'web' => "\x{201a}"}, # Single low-9 quote.
       '(ldquo|#8220)'  => {'tex' => '{/Text \252}',   'web' => "\x{201c}"}, # Left double quote.        '(ldquo|#8220)'  => {'tex' => '\42',   'web' => "\x{201c}"}, # Left double quote.
       '(rdquo|#8221)'  => {'tex' => '{/Text \272}',   'web' => "\x{201d}"}, # Right double quote.        '(rdquo|#8221)'  => {'tex' => '\42',   'web' => "\x{201d}"}, # Right double quote.
       '(bdquo|#8222)'  => {'tex' => '{/Text \271}',   'web' => "\x{201e}"}, # Double low-9 quote.        '(bdquo|#8222)'  => {'tex' => ',',              'web' => "\x{201e}"}, # Double low-9 quote.
       '(dagger|#8224)' => {'tex' => '{/Text \262}',   'web' => "\x{2020}"}, # Is this a dagger I see before me now?        '(dagger|#8224)' => {'tex' => '+',   'web' => "\x{2020}"}, # Is this a dagger I see before me now?
       '(Dagger|#8225)' => {'tex' => '{/Text \263}',   'web' => "\x{2021}"}, # it's handle pointing towards my heart?        '(Dagger|#8225)' => {'tex' => '\261',   'web' => "\x{2021}"}, # it's handle pointing towards my heart?
       '(bull|#8226)'   => {'tex' => '\267',           'web' => "\x{2022}"}, # Bullet.        '(bull|#8226)'   => {'tex' => '\267',           'web' => "\x{2022}"}, # Bullet.
       '(hellep|#8230)' => {'tex' => '{/Text \274}',   'web' => "\x{2026}"}, # Ellipses.        '(hellep|#8230)' => {'tex' => '{/Symbol \274}',   'web' => "\x{2026}"}, # Ellipses.
       '(permil|#8240)' => {'tex' => '{/Text \275}',   'web' => "\x{2031}"}, # Per mille.        '(permil|#8240)' => {'tex' => '%_o',            'web' => "\x{2031}"}, # Per mille.
       '(prime|#8242)'  => {'tex' => '\264',           'web' => "\x{2032}"}, # Prime.        '(prime|#8242)'  => {'tex' => '\264',           'web' => "\x{2032}"}, # Prime.
       '(Prime|#8243)'  => {'tex' => '{/Symbol \262}', 'web' => "\x{2033}"}, # double prime.        '(Prime|#8243)'  => {'tex' => '{/Symbol \262}', 'web' => "\x{2033}"}, # double prime.
       '(lsaquo|#8249)' => {'tex' => '{/Text \254}',   'web' => "\x{2039}"}, # < quote.        '(lsaquo|#8249)' => {'tex' => '<',              'web' => "\x{2039}"}, # < quote.
       '(rsaquo|#8250)' => {'tex' => '{/Text \255}',   'web' => "\x{2040}"}, # > quote.        '(rsaquo|#8250)' => {'tex' => '\74',              'web' => "\x{203a}"}, # > quote.
       '(oline|#8254)'  => {'tex' => '{/Symbol \140}', 'web' => "\x{203e}"}, # Overline.        '(oline|#8254)'  => {'tex' => '{/Symbol \140}', 'web' => "\x{203e}"}, # Overline.
       '(frasl|#8260)'  => {'tex' => '/',              'web' => "\x{2044}"}, # Fraction slash.        '(frasl|#8260)'  => {'tex' => '/',              'web' => "\x{2044}"}, # Fraction slash.
       '(euro|#8364)'   => {'tex' => '{/Symbol \240}', 'web' => "\x{20a0}"}, # Euro currency.        '(euro|#8364)'   => {'tex' => '{/Symbol \240}', 'web' => "\x{20ac}"}, # Euro currency.
               
       # Letter like symbols.        # Letter like symbols.
   
Line 1091  my %lookup = Line 1130  my %lookup =
       '(empty|#8709)'   => {'tex' => '{/Symbol \306}',  'web' => "\x{2205}"}, # Null set.        '(empty|#8709)'   => {'tex' => '{/Symbol \306}',  'web' => "\x{2205}"}, # Null set.
       '(nabla|#8711)'   => {'tex' => '{/Symbol \321}',  'web' => "\x{2207}"}, # Gradient e.g.        '(nabla|#8711)'   => {'tex' => '{/Symbol \321}',  'web' => "\x{2207}"}, # Gradient e.g.
       '(isin|#8712)'    => {'tex' => '{/Symbol \316}',  'web' => "\x{2208}"}, # Element of the set.        '(isin|#8712)'    => {'tex' => '{/Symbol \316}',  'web' => "\x{2208}"}, # Element of the set.
         '(notin|#8713)'   => {'tex' => '{/Symbol \317}',  'web' => "\x{2209}"}, # Not an element of
       '(ni|#8715)'      => {'tex' => '{/Symbol \47}',   'web' => "\x{220b}"}, # Contains as a member        '(ni|#8715)'      => {'tex' => '{/Symbol \47}',   'web' => "\x{220b}"}, # Contains as a member
       '(prod|#8719)'    => {'tex' => '{/Symbol \325}',  'web' => "\x{220f}"}, # Product         '(prod|#8719)'    => {'tex' => '{/Symbol \325}',  'web' => "\x{220f}"}, # Product 
       '(sum|#8721)'     => {'tex' => '{/Symbol \345}',  'web' => "\x{2211}"}, # Sum of.        '(sum|#8721)'     => {'tex' => '{/Symbol \345}',  'web' => "\x{2211}"}, # Sum of.
       '(minus|#8722)'   => {'tex' => '-',               'web' => "\x{2212}"}, # - sign.        '(minus|#8722)'   => {'tex' => '{/Symbol \55}',   'web' => "\x{2212}"}, # - sign.
       '(lowast|#8727)'  => {'tex' => '*',               'web' => "\x{2217}"}, # *         '(lowast|#8727)'  => {'tex' => '*',               'web' => "\x{2217}"}, # * 
       '(radic|#8730)'   => {'tex' => '{/Symbol \326}',  'web' => "\x{221a}"}, # Square root.         '(radic|#8730)'   => {'tex' => '{/Symbol \326}',  'web' => "\x{221a}"}, # Square root. 
       '(prop|#8733)'    => {'tex' => '{/Symbol \265}',  'web' => "\x{221d}"}, # Proportional to.        '(prop|#8733)'    => {'tex' => '{/Symbol \265}',  'web' => "\x{221d}"}, # Proportional to.
Line 1105  my %lookup = Line 1145  my %lookup =
       '(cap|#8745)'     => {'tex' => '{/Symbol \307}',  'web' => "\x{2229}"}, # Set intersection.        '(cap|#8745)'     => {'tex' => '{/Symbol \307}',  'web' => "\x{2229}"}, # Set intersection.
       '(cup|#8746)'     => {'tex' => '{/Symbol \310}',  'web' => "\x{222a}"}, # Set union.        '(cup|#8746)'     => {'tex' => '{/Symbol \310}',  'web' => "\x{222a}"}, # Set union.
       '(int|8747)'      => {'tex' => '{/Symbol \362}',  'web' => "\x{222b}"}, # Integral.        '(int|8747)'      => {'tex' => '{/Symbol \362}',  'web' => "\x{222b}"}, # Integral.
       '(there4|#8756)'  => {'tex' => '{/Symbol \134}',  'web' => "\x{2234}"}, # Therefore triple dots.  
       '(sim|#8764)'     => {'tex' => '~',               'web' => "\x{223c}"}, # Simlar to.        # Some gnuplot guru will have to explain to me why the next three
       '(cong|#8773)'    => {'tex' => '{/Symbol \100}',  'web' => "\x{2245}"}, # Congruent to/with.        # require the extra slashes... else they print very funkily.
       '(asymp|#8776)'   => {'tex' => '{/Symbol \278}',  'web' => "\x{2248}"}, # Asymptotic to.  
         '(there4|#8756)'  => {'tex' => '{/Symbol \\\134}',  'web' => "\x{2234}"}, # Therefore triple dots.
         '(sim|#8764)'     => {'tex' => '\\\176',               'web' => "\x{223c}"}, # Simlar to.
         '(cong|#8773)'    => {'tex' => '{/Symbol \\\100}','web' => "\x{2245}"}, # Congruent to/with.
   
         '(asymp|#8776)'   => {'tex' => '{/Symbol \273}',  'web' => "\x{2248}"}, # Asymptotic to.
       '(ne|#8800)'      => {'tex' => '{/Symbol \271}',  'web' => "\x{2260}"}, # not equal to.        '(ne|#8800)'      => {'tex' => '{/Symbol \271}',  'web' => "\x{2260}"}, # not equal to.
       '(equiv|#8801)'   => {'tex' => '{/Symbol \272}',  'web' => "\x{2261}"}, # Equivalent to.        '(equiv|#8801)'   => {'tex' => '{/Symbol \272}',  'web' => "\x{2261}"}, # Equivalent to.
       '(le|8804)'       => {'tex' => '{/Symbol \243}',  'web' => "\x{2264}"}, # Less than or equal to.        '(le|8804)'       => {'tex' => '{/Symbol \243}',  'web' => "\x{2264}"}, # Less than or equal to.
Line 1129  my %lookup = Line 1174  my %lookup =
       '(rceil|8969)'    => {'tex' => '{/Symbol \371}',  'web' => "\x{2309}"}, # Right ceiling.        '(rceil|8969)'    => {'tex' => '{/Symbol \371}',  'web' => "\x{2309}"}, # Right ceiling.
       '(lfloor|8970)'   => {'tex' => '{/Symbol \353}',  'web' => "\x{230a}"}, # Left floor.        '(lfloor|8970)'   => {'tex' => '{/Symbol \353}',  'web' => "\x{230a}"}, # Left floor.
       '(rfloor|8971)'   => {'tex' => '{/Symbol \373}',  'web' => "\x{230b}"}, # Right floor.        '(rfloor|8971)'   => {'tex' => '{/Symbol \373}',  'web' => "\x{230b}"}, # Right floor.
       '(lang|9001)'     => {'tex' => '{/Symbol \341}',  'web' => "\x{2329}"}, # Left angle bracket.  
       '(rang|9002)'     => {'tex' => '{/Symbol \361}',  'web' => "\x{232a}"}, # Right angle bracket.        # The gnuplot png font evidently does not have the big angle brackets at
         # positions 0x2329, 0x232a so use ordinary brackets.
   
         '(lang|9001)'     => {'tex' => '{/Symbol \341}',  'web' => '<'}, # Left angle bracket.
         '(rang|9002)'     => {'tex' => '{/Symbol \361}',  'web' => '>'}, # Right angle bracket.
   
       # Gemoetric shapes.        # Gemoetric shapes.
   
Line 1317  sub start_curve { Line 1366  sub start_curve {
  my $constructtag=&Apache::edit::get_new_args   my $constructtag=&Apache::edit::get_new_args
     ($token,$parstack,$safeeval,keys(%curve_defaults));      ($token,$parstack,$safeeval,keys(%curve_defaults));
  if ($constructtag) {   if ($constructtag) {
       #
       # Fix up the color attribute as jcolor does not prepend an x
       #
       my $value = $token->[2]{'color'};
       if (defined $value && !($value =~ /^x/)) {
    $token->[2]{'color'} = 'x' . $value;
       }
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
  }   }
     }      }
Line 1351  sub start_function { Line 1407  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 1421  sub start_data { Line 1478  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 1462  sub start_axis { Line 1519  sub start_axis {
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $constructtag=&Apache::edit::get_new_args   my $constructtag=&Apache::edit::get_new_args
     ($token,$parstack,$safeeval,keys(%axis_defaults));      ($token,$parstack,$safeeval,keys(%axis_defaults));
   
  if ($constructtag) {   if ($constructtag) {
       #
       #  Fix up the color attribute since jchooser does not
       #  prepend an x to the color:
       #
       my $value = $token->[2]{'color'};
       if (defined $value && !($value =~ /^x/)) {
    $token->[2]{'color'} = 'x' . $value;
       }
   
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
  }   }
     }      }
Line 1555  sub write_gnuplot_file { Line 1622  sub write_gnuplot_file {
        $curve->{'color'}       :          $curve->{'color'}       : 
        $Apache::lonplot::plot{'fgcolor'}        );         $Apache::lonplot::plot{'fgcolor'}        );
     }      }
       
     # set term      # set term
     if ($target eq 'web') {      if ($target eq 'web') {
  $gnuplot_input .= 'set terminal png enhanced nocrop ';   $gnuplot_input .= 'set terminal png enhanced nocrop ';
Line 1575  sub write_gnuplot_file { Line 1643  sub write_gnuplot_file {
  }   }
  $gnuplot_input .= ' "'.$font_properties->{'printname'}.'" ';   $gnuplot_input .= ' "'.$font_properties->{'printname'}.'" ';
  $gnuplot_input .= $fontsize;   $gnuplot_input .= $fontsize;
  $gnuplot_input .= "\nset output \"/home/httpd/perl/tmp/".   $gnuplot_input .= "\nset output \"".$tmpdir.
     &unescape($filename).".eps\"\n";      &unescape($filename).".eps\"\n";
  $gnuplot_input .= "set encoding iso_8859_1\n"; # Get access to extended font.   $gnuplot_input .= "set encoding iso_8859_1\n"; # Get access to extended font.
   
Line 1665  sub write_gnuplot_file { Line 1733  sub write_gnuplot_file {
  $gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");   $gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");
  $gnuplot_input .= "$xtics{'start'}, ";   $gnuplot_input .= "$xtics{'start'}, ";
  $gnuplot_input .= "$xtics{'increment'}, ";   $gnuplot_input .= "$xtics{'increment'}, ";
  $gnuplot_input .= "$xtics{'end'}\n";   $gnuplot_input .= "$xtics{'end'} ";
    if ($target eq 'tex') {
       $gnuplot_input .= 'font "Helvetica,22"';     # Needed in iso 8859-1 enc.
    }
    $gnuplot_input .= "\n";
         if ($xtics{'minorfreq'} != 0) {          if ($xtics{'minorfreq'} != 0) {
             $gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";              $gnuplot_input .= "set mxtics ".$xtics{'minorfreq'}."\n";
         }           } 
       } else {
    if ($target eq 'tex') {
       $gnuplot_input .= 'set xtics font "Helvetica,22"'."\n"; # needed in iso 8859-1 enc
    }
     }      }
     if (%ytics) {          if (%ytics) {    
  $gnuplot_input .= "set ytics $ytics{'location'} ";   $gnuplot_input .= "set ytics $ytics{'location'} ";
  $gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");   $gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");
  $gnuplot_input .= "$ytics{'start'}, ";   $gnuplot_input .= "$ytics{'start'}, ";
  $gnuplot_input .= "$ytics{'increment'}, ";   $gnuplot_input .= "$ytics{'increment'}, ";
         $gnuplot_input .= "$ytics{'end'}\n";          $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";
         }           } 
       } else {
    if ($target eq 'tex') {
       $gnuplot_input .= 'set ytics font "Helvetica,22"'."\n"; # Needed for iso 8859-1 enc.
    }
     }      }
     # axis      # axis
     if (%axis) {      if (%axis) {
Line 1700  sub write_gnuplot_file { Line 1784  sub write_gnuplot_file {
         }          }
  $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";   $gnuplot_input .= "set xrange \[$axis{'xmin'}:$axis{'xmax'}\]\n";
  $gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";   $gnuplot_input .= "set yrange \[$axis{'ymin'}:$axis{'ymax'}\]\n";
    if ($axis{'xzero'} ne 'off') {
    $gnuplot_input .= "set xzeroaxis ";
    if ($axis{'xzero'} eq 'line' || $axis{'xzero'} eq 'thick-line') {
    $gnuplot_input .= "lt -1 ";
    if ($axis{'xzero'} eq 'thick-line') {
    $gnuplot_input .= "lw 3 ";
    }
    }
    $gnuplot_input .= "\n";
    }
    if ($axis{'yzero'} ne 'off') {
    $gnuplot_input .= "set yzeroaxis ";
    if ($axis{'yzero'} eq 'line' || $axis{'yzero'} eq 'thick-line') {
    $gnuplot_input .= "lt -1 ";
    if ($axis{'yzero'} eq 'thick-line') {
    $gnuplot_input .= "lw 3 ";
    }
    }
    $gnuplot_input .= "\n";
    }
     }      }
     # Key      # Key
     if (%key) {      if (%key) {
Line 1859  sub edit_attributes { Line 1963  sub edit_attributes {
  if ($defaults->{$attr}->{'edit_type'} eq 'entry') {   if ($defaults->{$attr}->{'edit_type'} eq 'entry') {
     $result .= &Apache::edit::text_arg      $result .= &Apache::edit::text_arg
  ($description,$attr,$token,   ($description,$attr,$token,
  $defaults->{$attr}->{'size'});   $defaults->{$attr}->{'size'},
    $defaults->{$attr}->{'class'});
  } elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {   } elsif ($defaults->{$attr}->{'edit_type'} eq 'choice') {
     $result .= &Apache::edit::select_or_text_arg      $result .= &Apache::edit::select_or_text_arg
  ($description,$attr,$defaults->{$attr}->{'choices'},$token);   ($description,$attr,$defaults->{$attr}->{'choices'},$token);
Line 1988  sub insert_data { Line 2093  sub insert_data {
 __END__  __END__
   
   
   =head1 NAME
   
   Apache::lonplot.pm
   
   =head1 SYNOPSIS
   
   XML-based plotter of graphs
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   
   =head1 SUBROUTINES (parsing and edit rendering)
   
   =over
   
   =item start_gnuplot()
   
   =item end_gnuplot()
   
   =item start_xtics()
   
   =item end_xtics()
   
   =item start_ytics()
   
   =item end_ytics()
   
   =item get_font()
   
   =item start_key()
   
   =item end_key()
   
   =item parse_label()
   
   =item replace_entities()
   
   =item start_title()
   
   =item end_title()
   
   =item start_xlabel()
   
   =item end_xlabel()
   
   =item start_ylabel()
   
   =item end_label()
   
   =item start_curve()
   
   =item end_curve()
   
   =item start_function()
   
   =item end_function()
   
   =item start_data()
   
   =item end_data()
   
   =item start_axis()
   
   =item end_axis
   
   =back
   
   =head1 SUBROUTINES (Utility)
   
   =over
   
   =item set_defaults()
   
   =item get_attributes()
   
   =item write_gnuplot_file()
   
   =item check_inputs()
   
   =item edit_attributes()
   
   =back
   
   =head1 SUBROUTINES (Insertion functions for editing plots)
   
   =over
   
   =item insert_gnuplot()
   
   =item insert_tics()
   
   =item insert_xtics()
   
   =item insert_key()
   
   =item insert_axis()
   
   =item insert_title()
   
   =item insert_xlabel()
   
   =item insert_ylabel()
   
   =item insert_label()
   
   =item insert_curve()
   
   =item insert_function()
   
   =item insert_data()
   
   =back
   
   =cut

Removed from v.1.143  
changed lines
  Added in v.1.155


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>