[BACK]Return to lonplot.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonplot.pm between versions 1.152.6.1 and 1.172

version 1.152.6.1, 2014/07/09 15:17:32 version 1.172, 2013/01/31 17:10:38
Line 98  BEGIN { Line 98  BEGIN {
 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.
   
 my %linetypes =  my %linetypes = # For png use these linetypes.
     (      (
      solid          => 1,       solid          => 1,
      dashed         => 0       dashed         => 0
     );      );
   my %ps_linetypes = # For ps the line types are different!
      (
       solid          => 0,
       dashed         => 7
      );
   
 my %linestyles =   my %linestyles = 
     (      (
Line 127  my $real_test      = Line 132  my $real_test      =
     sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/};      sub {$_[0]=~s/\s+//g;$_[0]=~/^[+-]?\d*\.?\d*([eE][+-]\d+)?$/};
 my $pos_real_test  =  my $pos_real_test  =
     sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d*\.?\d*([eE][+-]\d+)?$/};      sub {$_[0]=~s/\s+//g;$_[0]=~/^[+]?\d*\.?\d*([eE][+-]\d+)?$/};
 my $color_test     = sub {$_[0]=~s/\s+//g;$_[0]=~/^x[\da-fA-F]{6}$/};  my $color_test;
   if ($version < 4.6) {
       $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^\#/x/;$_[0]=~/^x[\da-fA-F]{6}$/};
   } else {
       $color_test = sub {$_[0]=~s/\s+//g;$_[0]=~s/^x/#/;$_[0]=~/^\#[\da-fA-F]{6}$/};
   }
 my $onoff_test     = sub {$_[0]=~/^(on|off)$/};  my $onoff_test     = sub {$_[0]=~/^(on|off)$/};
 my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/};  my $key_pos_test   = sub {$_[0]=~/^(top|bottom|right|left|outside|below| )+$/};
 my $sml_test       = sub {$_[0]=~/^(\d+|small|medium|large)$/};  my $sml_test       = sub {$_[0]=~/^(\d+|small|medium|large)$/};
 my $linestyle_test = sub {exists($linestyles{$_[0]})};  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~!\@\#\$\%^&\*\(\)-=_\+\[\]\{\}:\;\'<>,\.\/\?\\]+ ?)+$/};
   
   my $arrowhead_test = sub{$_[0]=~/^(nohead|head|heads| )+$/};
   my $arrowstyle_test= sub{$_[0]=~/^(filled|empty|nofilled)+$/};
   my $degree_test  = sub{&$pos_real_test($_[0]) && ($_[0] <= 360.0)};
   
 ###################################################################  ###################################################################
 ##                                                               ##  ##                                                               ##
 ##                      Attribute metadata                       ##  ##                      Attribute metadata                       ##
Line 176  my %gnuplot_defaults = Line 190  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 452  my %tic_defaults = Line 468  my %tic_defaults =
  description => 'Number of minor tics per major tic mark',   description => 'Number of minor tics per major tic mark',
  edit_type   => 'entry',   edit_type   => 'entry',
  size        => '10'   size        => '10'
  },            }, 
        rotate => {
    default => 'off',
    test    => $onoff_test,
    description => 'Rotate tic label by 90 degrees if on',
    edit_type   => 'onoff'
        }
      );       );
   
 my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat', 'xzero', 'yzero');  my @axis_edit_order = ('color','xmin','xmax','ymin','ymax','xformat', 'yformat', 'xzero', 'yzero');
Line 463  my %axis_defaults = Line 485  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 525  my %axis_defaults = Line 548  my %axis_defaults =
       },        },
      );       );
   
 my @curve_edit_order = ('color','name','linestyle','linewidth','linetype','pointtype','pointsize','limit');  
   my @curve_edit_order = ('color','name','linestyle','linewidth','linetype',
    'pointtype','pointsize','limit', 'arrowhead', 'arrowstyle', 
    'arrowlength', 'arrowangle', 'arrowbackangle'
       );
   
 my %curve_defaults =   my %curve_defaults = 
     (      (
Line 534  my %curve_defaults = Line 561  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 585  my %curve_defaults = Line 613  my %curve_defaults =
          edit_type   => 'choice',           edit_type   => 'choice',
          choices     => ['above', 'below', 'closed','x1','x2','y1','y2']           choices     => ['above', 'below', 'closed','x1','x2','y1','y2']
          },           },
        arrowhead => {
            default     => 'head',
    test        => $arrowhead_test,
    description => 'Vector arrow head type',
    edit_type   => 'choice',
    choices     => ['nohead', 'head', 'heads']
        },
        arrowstyle => {
    default     => 'filled',
    test        => $arrowstyle_test,
    description => 'Vector arrow head style',
    edit_type   => 'choice',
    choices     => ['filled', 'empty', 'nofilled']
        },
        arrowlength => {
    default     => 0.02,
    test        => $pos_real_test,
    description => "Length of vector arrow (only applies to vector plots)",
    edit_type   => 'entry',
    size        => '5'
        },
        arrowangle  => {
    default      => 10.0,
    test         => $degree_test,
    description  => 'Angle of arrow branches to arrow body (only applies to vector plots)',
    edit_type    => 'entry',
    size         => '5'
        },
   
        arrowbackangle => {
    default    => 90.0,
    test       => $degree_test,
    descripton => 'Angle of arrow back lines to branches.',
    edit_type  => 'entry',
    size       => '5'
        }
   
      );       );
   
 ###################################################################  ###################################################################
Line 596  my %curve_defaults = Line 661  my %curve_defaults =
 undef %Apache::lonplot::plot;  undef %Apache::lonplot::plot;
 my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);  my (%key,%axis,$title,$xlabel,$ylabel,@labels,@curves,%xtics,%ytics);
   
   my $current_tics; # Reference to the current tick hash
   
 sub start_gnuplot {  sub start_gnuplot {
     undef(%Apache::lonplot::plot);   undef(%key);    undef(%axis);      undef(%Apache::lonplot::plot);   undef(%key);    undef(%axis);
     undef($title);  undef($xlabel); undef($ylabel);      undef($title);  undef($xlabel); undef($ylabel);
Line 620  sub start_gnuplot { Line 687  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 634  sub end_gnuplot { Line 712  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 645  sub end_gnuplot { Line 725  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 666  ENDIMAGE Line 745  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 683  sub start_xtics { Line 762  sub start_xtics {
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  &get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,   &get_attributes(\%xtics,\%tic_defaults,$parstack,$safeeval,
     $tagstack->[-1]);      $tagstack->[-1]);
    $current_tics = \%xtics;
    &Apache::lonxml::register('Apache::lonplot', 'tic');
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .= &Apache::edit::tag_start($target,$token,'xtics');   $result .= &Apache::edit::tag_start($target,$token,'xtics');
  $result .= &edit_attributes($target,$token,\%tic_defaults,   $result .= &edit_attributes($target,$token,\%tic_defaults,
Line 701  sub end_xtics { Line 782  sub end_xtics {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';      my $result = '';
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
    &Apache::lonxml::deregister('Apache::lonplot', 'tic');
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_end($target,$token);   $result.=&Apache::edit::tag_end($target,$token);
     }      }
Line 714  sub start_ytics { Line 796  sub start_ytics {
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
  &get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,   &get_attributes(\%ytics,\%tic_defaults,$parstack,$safeeval,
     $tagstack->[-1]);      $tagstack->[-1]);
    $current_tics = \%ytics;
    &Apache::lonxml::register('Apache::lonplot', 'tic');
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .= &Apache::edit::tag_start($target,$token,'ytics');   $result .= &Apache::edit::tag_start($target,$token,'ytics');
  $result .= &edit_attributes($target,$token,\%tic_defaults,   $result .= &edit_attributes($target,$token,\%tic_defaults,
Line 732  sub end_ytics { Line 816  sub end_ytics {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result = '';      my $result = '';
     if ($target eq 'web' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'tex') {
    &Apache::lonxml::deregister('Apache::lonplot', 'tic');
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_end($target,$token);   $result.=&Apache::edit::tag_end($target,$token);
     }      }
     return $result;      return $result;
 }  }
   
   
   ##----------------------------------------------------------------
   #
   #  Tic handling:
   #   The <tic> tag allows users to specify exact Tic positions and labels
   #   for each axis.  In this version we only support level 0 tics (major tic).
   #   Each tic has associated with it a position and a label
   #   $current_tics is a reference to the current tick description hash.
   #   We add elements to an array  in that has: ticspecs whose elements
   #   are 'pos' - the tick position and 'label' - the tic label.
   #
   
   
   sub start_tic {
       my ($target, $token, $tagstack, $parstack, $parser, $safeeval, $style)  = @_;
   
       my $result = '';
       if ($target eq 'web' || $target eq 'tex') {
    my $tic_location = &Apache::lonxml::get_param('location', $parstack, $safeeval);
    my $tic_label    = &Apache::lonxml::get_all_text('/tic', $parser);
   
    # Tic location must e a real:
   
    if (!&$real_test($tic_location)) {
       &Apache::lonxml::warning("Tic location: $tic_location must be a real number");
    } else {
   
       if (!defined  $current_tics->{'ticspecs'}) {
    $current_tics->{'ticspecs'} = [];
       }
       my $ticspecs = $current_tics->{'ticspecs'};
       push (@$ticspecs, {'pos' => $tic_location, 'label' => $tic_label});
    }
       }
   
       return $result;
   }
   
   sub end_tic {
       return '';
   }
   
 ##-----------------------------------------------------------------font  ##-----------------------------------------------------------------font
 my %font_properties =  my %font_properties =
     (      (
Line 1350  sub start_curve { Line 1477  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 1385  sub start_function { Line 1519  sub start_function {
      $style);       $style);
  $function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);   $function = &Apache::run::evaluate($function,$safeeval,$$parstack[-1]);
         $function=~s/\^/\*\*/gs;          $function=~s/\^/\*\*/gs;
    $function=~ s/^\s+//; # Trim leading
    $function=~ s/\s+$//;   # And trailing whitespace.
  $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 1496  sub start_axis { Line 1632  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 1554  sub get_attributes{ Line 1700  sub get_attributes{
     }      }
     return ;      return ;
 }  }
   ##
   # Generate tic mark specifications.
   # 
   # @param type - type of tics (xtics or ytics).
   # @param spec - Reference to a hash that contains the tic specification.
   # @param target - 'tex' if hard copy target.
   #
   # @return string - the tic specification command.
   #
   sub generate_tics {
       my ($type, $spec, $target) = @_;
       my $result   = '';
   
   
       if (defined %$spec) {
   
   
   
    # Major tics: - If there are 'ticspecs' these override any other
    #               specifications:
   
   
   
    $result .= "set $type $spec->{'location'}  ";
    $result .= ($spec->{'mirror'} eq 'on') ? 'mirror ' : 'nomirror ';
    if ($spec->{'rotate'} eq 'on') {
       $result .= ' rotate ';
    }
    if (defined $spec->{'ticspecs'}) {
       $result .= '( ';
       my @ticspecs;
       my $ticinfo = $spec->{'ticspecs'};
       foreach my $tic (@$ticinfo) {
    push(@ticspecs,  '"' . $tic->{'label'} . '" ' . $tic->{'pos'} );
       }
       $result .= join(', ', (@ticspecs));
       $result .= ' )';
    } else {
       $result .= "$spec->{'start'}, ";
       $result .= "$spec->{'increment'}, ";
       $result .= "$spec->{'end'} ";
    }
    if ($target eq 'tex' ) {
       $result .= 'font "Helvetica,22"';
    }
    $result .= "\n";
   
    # minor frequency:
   
    if ($spec->{'minorfreq'} != 0) {
       $result .= "set m$type $spec->{'minorfreq'}\n";
    }
       } elsif ($target eq 'tex' ) {
    $result .= "set $type font " . '"Helvetica,22"' ."\n";
       }
       
       
       return $result;
   }
   
 ##------------------------------------------------------- write_gnuplot_file  ##------------------------------------------------------- write_gnuplot_file
 sub write_gnuplot_file {  sub write_gnuplot_file {
Line 1589  sub write_gnuplot_file { Line 1794  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 1601  sub write_gnuplot_file { Line 1807  sub write_gnuplot_file {
  # set output   # set output
  $gnuplot_input .= "set output\n";   $gnuplot_input .= "set output\n";
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} solid ";   $gnuplot_input .= "set term postscript eps enhanced $Apache::lonplot::plot{'plotcolor'} dash ";
  if (!$font_properties->{'tex_no_file'}) {   if (!$font_properties->{'tex_no_file'}) {
     $gnuplot_input .=      $gnuplot_input .=
  'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.   'fontfile "'.$Apache::lonnet::perlvar{'lonFontsDir'}.
Line 1609  sub write_gnuplot_file { Line 1815  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.
   
     }      }
       $gnuplot_input .= "set encoding utf8\n";
     # cartesian or polar plot?      # cartesian or polar plot?
     if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {      if (lc($Apache::lonplot::plot{'plottype'}) eq 'polar') {
         $gnuplot_input .= 'set polar'.$/;          $gnuplot_input .= 'set polar'.$/;
Line 1681  sub write_gnuplot_file { Line 1888  sub write_gnuplot_file {
     $gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";      $gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
     # title, xlabel, ylabel      # title, xlabel, ylabel
     # titles      # titles
     my $offset;      my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' offset 0, -0.5 ' : '';
     if ($version >= 4.4) {      my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' offset -0.5, 0 ' : '';
         $offset = 'offset ';  
     }  
     my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' '.$offset.'0, -0.5 ' : '';  
     my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' '.$offset.'-0.5, 0 ' : '';  
   
     if ($target eq 'tex') {      if ($target eq 'tex') {
  $gnuplot_input .= "set title  \"$title\"          font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;   $gnuplot_input .= "set title  \"$title\"          font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
Line 1698  sub write_gnuplot_file { Line 1901  sub write_gnuplot_file {
         $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));          $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
     }      }
     # tics      # tics
     if (%xtics) {          $gnuplot_input .= &generate_tics('xtics', \%xtics, $target);
  $gnuplot_input .= "set xtics $xtics{'location'} ";  
  $gnuplot_input .= ( $xtics{'mirror'} eq 'on'?"mirror ":"nomirror ");      $gnuplot_input .= &generate_tics('ytics', \%ytics, $target);
  $gnuplot_input .= "$xtics{'start'}, ";  
  $gnuplot_input .= "$xtics{'increment'}, ";  
  $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) {  
             $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) {      
  $gnuplot_input .= "set ytics $ytics{'location'} ";  
  $gnuplot_input .= ( $ytics{'mirror'} eq 'on'?"mirror ":"nomirror ");  
  $gnuplot_input .= "$ytics{'start'}, ";  
  $gnuplot_input .= "$ytics{'increment'}, ";  
         $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) {  
             $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) {
         if ($axis{'xformat'} ne 'on') {          if ($axis{'xformat'} ne 'on') {
Line 1805  sub write_gnuplot_file { Line 1976  sub write_gnuplot_file {
         $gnuplot_input .="\n";          $gnuplot_input .="\n";
     }      }
     # curves      # curves
     $gnuplot_input .= 'plot ';      #
       # Each curve will have its very own linestyle.
       # (This should work just fine in web rendition I think).
       #  The line_xxx variables will hold the elements of the line style.
       #  type (solid/dashed), color, width
       #
       my $linestyle_index = 50;
       my $line_width   = '';
       my $plots = '';
   
       # If arrows are needed there will be an arrow style for each as well:
       #
   
       my $arrow_style_index = 50;
   
     for (my $i = 0;$i<=$#curves;$i++) {      for (my $i = 0;$i<=$#curves;$i++) {
  $curve = $curves[$i];   $curve = $curves[$i];
  $gnuplot_input.= ', ' if ($i > 0);   my $plot_command = '';
    my $plot_type = '';
    if ($i > 0) {
       $plot_type = ', ';
    }
  if ($target eq 'tex') {   if ($target eq 'tex') {
     $curve->{'linewidth'} *= 2;      $curve->{'linewidth'} *= 2;
  }   }
    $line_width = $curve->{'linewidth'};
  if (exists($curve->{'function'})) {   if (exists($curve->{'function'})) {
     $gnuplot_input.=       $plot_type  .= 
  $curve->{'function'}.' title "'.   $curve->{'function'}.' title "'.
  $curve->{'name'}.'" with '.   $curve->{'name'}.'" with '.
                 $curve->{'linestyle'};                  $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'};  
             } elsif ($curve->{'linestyle'} eq 'filledcurves') {   
                 $gnuplot_input.= ' '.$curve->{'limit'};  
             } elsif ($curve->{'linetype'} ne '' &&  
                      $curve->{'linestyle'} eq 'lines') {  
                 $gnuplot_input.= ' linetype ';  
                 $gnuplot_input.= $linetypes{$curve->{'linetype'}};  
                 $gnuplot_input.= ' linecolor rgb "';  
                 # convert color from xaaaaaa to #aaaaaa  
                 $curve->{'color'} =~ s/^x/#/;  
                 $gnuplot_input.= $curve->{'color'}.'"';  
             }  
             $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};  
   
  } elsif (exists($curve->{'data'})) {   } elsif (exists($curve->{'data'})) {
     # Store data values in $datatext      # Store data values in $datatext
     my $datatext = '';      my $datatext = '';
Line 1859  sub write_gnuplot_file { Line 2027  sub write_gnuplot_file {
     print $fh $datatext;      print $fh $datatext;
     close($fh);      close($fh);
     #   generate gnuplot text      #   generate gnuplot text
     $gnuplot_input.= '"'.$datafilename.'" title "'.      $plot_type .= '"'.$datafilename.'" title "'.
  $curve->{'name'}.'" with '.   $curve->{'name'}.'" with '.
  $curve->{'linestyle'};   $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'};  
             } elsif ($curve->{'linestyle'} eq 'filledcurves') {   
                 $gnuplot_input.= ' '.$curve->{'limit'};  
             } elsif ($curve->{'linetype'} ne '' &&  
                      $curve->{'linestyle'} eq 'lines') {  
                 $gnuplot_input.= ' linetype ';  
                 $gnuplot_input.= $linetypes{$curve->{'linetype'}};  
                 $gnuplot_input.= ' linecolor rgb "';  
                 # convert color from xaaaaaa to #aaaaaa  
                 $curve->{'color'} =~ s/^x/#/;  
                 $gnuplot_input.= $curve->{'color'}.'"';  
             }  
                 $gnuplot_input.= ' linewidth '.$curve->{'linewidth'};   
  }   }
    my $pointtype = '';
    my $pointsize = '';
   
    # Figure out the linestyle:
   
    my $lt = $curve->{'linetype'} ne '' ? $curve->{'linetype'} 
                   : 'solid'; # Line type defaults to solid.
    # The mapping of lt -> the actual gnuplot line type depends on the target:
   
    if ($target eq 'tex') {
       $lt = $ps_linetypes{$lt};
    } else {
       $lt = $linetypes{$lt}
    }
   
    my $color = $curve->{'color'};
    $color =~ s/^x/#/;        # Convert xhex color -> #hex color.   
   
   
    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')) {
       
       $pointtype =' pointtype '.$curve->{'pointtype'};
       $pointsize =' pointsize '.$curve->{'pointsize'};
    } elsif ($curve->{'linestyle'} eq 'filledcurves') { 
       $plot_command.= ' '.$curve->{'limit'};
    } elsif ($curve->{'linestyle'} eq 'vector') {
   
       # Create the arrow head style add it to 
       # $gnuplot_input..and ensure it gets
       # Selected in the plot command.
   
       $gnuplot_input .= "set style arrow $arrow_style_index ";
       $gnuplot_input .= ' ' . $curve->{'arrowhead'};
       $gnuplot_input .= ' size ' . $curve->{'arrowlength'};
       $gnuplot_input .= ','.$curve->{'arrowangle'};
       $gnuplot_input .= ',' . $curve->{'arrowbackangle'}; 
       $gnuplot_input .=  ' ' . $curve->{'arrowstyle'} . " ls $linestyle_index\n";
   
   
       $plot_command  .= "  arrowstyle $arrow_style_index ";
       $arrow_style_index++;
    }
   
           my $style_command = "set style line $linestyle_index $pointtype $pointsize linetype $lt linewidth $line_width lc rgb '$color'\n";
           $gnuplot_input .= $style_command;
   
    # The condition below is because gnuplot lumps the linestyle in with the 
    # arrowstyle _sigh_.
   
    if ($curve->{'linestyle'} ne 'vector') {
       $plot_command.= " ls $linestyle_index";
    }
   
    $plots .= $plot_type . ' ' . $plot_command;
    $linestyle_index++; # Each curve get a unique linestyle.
     }      }
       $gnuplot_input .= 'plot '.$plots;
     # Write the output to a file.      # Write the output to a file.
     open (my $fh,">$tmpdir$filename.data");  
     binmode($fh, ":utf8");      # &Apache::lonnet::logthis($gnuplot_input); # uncomment to log the gnuplot input.
       open (my $fh, "> $tmpdir$filename.data");
       binmode($fh, ':utf8');
     print $fh $gnuplot_input;      print $fh $gnuplot_input;
     close($fh);      close($fh);
     # That's all folks.      # That's all folks.
Line 1933  sub edit_attributes { Line 2144  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);
Removed from v.1.152.6.1  
changed lines
  Added in v.1.172

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