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

Diff for /loncom/xml/lonplot.pm between versions 1.115 and 1.116

version 1.115, 2007/02/21 20:34:58 version 1.116, 2007/02/21 20:47:49
Line 217  my %gnuplot_defaults = Line 217  my %gnuplot_defaults =
  choices     => ['100','200','500','1000','2000','5000']   choices     => ['100','200','500','1000','2000','5000']
  },   },
      align        => {       align        => {
  default     => 'center',   default     => 'middle',
  test        => sub {$_[0]=~/^(left|right|center)$/},   test        => sub {$_[0]=~/^(left|right|middle|center)$/},
  description => 'alignment for image in html',   description => 'alignment for image in html',
  edit_type   => 'choice',   edit_type   => 'choice',
  choices     => ['left','right','center']   choices     => ['left','right','middle']
  },   },
      texwidth     => {       texwidth     => {
          default     => '93',           default     => '93',
Line 550  sub start_gnuplot { Line 550  sub start_gnuplot {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .= &Apache::edit::tag_start($target,$token,'GnuPlot');   $result .= &Apache::edit::tag_start($target,$token,'GnuPlot');
  $result .= &edit_attributes($target,$token,\%gnuplot_defaults,   $result .= &edit_attributes($target,$token,\%gnuplot_defaults,
     \@gnuplot_edit_order);      \@gnuplot_edit_order)
       .&Apache::edit::end_row()
       .&Apache::edit::start_spanning_row();
     } 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));
Line 717  sub start_title { Line 719  sub start_title {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token,'Plot Title');   $result.=&Apache::edit::tag_start($target,$token,'Plot Title');
  my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);   my $text=&Apache::lonxml::get_all_text("/title",$parser,$style);
  $result.=&Apache::edit::end_row().   $result.=&Apache::edit::editline('',$text,'',60);
     &Apache::edit::start_spanning_row().  
     &Apache::edit::editline('',$text,'',60);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result.=&Apache::edit::rebuild_tag($token);   $result.=&Apache::edit::rebuild_tag($token);
  $result.=&Apache::edit::modifiedfield("/title",$parser);   $result.=&Apache::edit::modifiedfield("/title",$parser);
Line 750  sub start_xlabel { Line 750  sub start_xlabel {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');   $result.=&Apache::edit::tag_start($target,$token,'Plot Xlabel');
  my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);   my $text=&Apache::lonxml::get_all_text("/xlabel",$parser,$style);
  $result.=&Apache::edit::end_row().   $result.=&Apache::edit::editline('',$text,'',60);
     &Apache::edit::start_spanning_row().  
     &Apache::edit::editline('',$text,'',60);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result.=&Apache::edit::rebuild_tag($token);   $result.=&Apache::edit::rebuild_tag($token);
  $result.=&Apache::edit::modifiedfield("/xlabel",$parser);   $result.=&Apache::edit::modifiedfield("/xlabel",$parser);
Line 784  sub start_ylabel { Line 782  sub start_ylabel {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');   $result .= &Apache::edit::tag_start($target,$token,'Plot Ylabel');
  my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);   my $text = &Apache::lonxml::get_all_text("/ylabel",$parser,$style);
  $result .= &Apache::edit::end_row().   $result .= &Apache::edit::editline('',$text,'',60);
     &Apache::edit::start_spanning_row().  
     &Apache::edit::editline('',$text,'',60);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result.=&Apache::edit::rebuild_tag($token);   $result.=&Apache::edit::rebuild_tag($token);
  $result.=&Apache::edit::modifiedfield("/ylabel",$parser);   $result.=&Apache::edit::modifiedfield("/ylabel",$parser);
Line 858  sub start_curve { Line 854  sub start_curve {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .= &Apache::edit::tag_start($target,$token,'Curve');   $result .= &Apache::edit::tag_start($target,$token,'Curve');
  $result .= &edit_attributes($target,$token,\%curve_defaults,   $result .= &edit_attributes($target,$token,\%curve_defaults,
                                     \@curve_edit_order);                                      \@curve_edit_order)
       .&Apache::edit::end_row()
       .&Apache::edit::start_spanning_row();
   
     } 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(%curve_defaults));      ($token,$parstack,$safeeval,keys(%curve_defaults));
Line 902  sub start_function { Line 901  sub start_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');
  my $text = &Apache::lonxml::get_all_text("/function",$parser,$style);   my $text = &Apache::lonxml::get_all_text("/function",$parser,$style);
  $result .= &Apache::edit::end_row().   $result .= &Apache::edit::editline('',$text,'',60);
     &Apache::edit::start_spanning_row().  
     &Apache::edit::editline('',$text,'',60);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result.=&Apache::edit::rebuild_tag($token);   $result.=&Apache::edit::rebuild_tag($token);
  $result.=&Apache::edit::modifiedfield("/function",$parser);   $result.=&Apache::edit::modifiedfield("/function",$parser);
Line 979  sub start_data { Line 976  sub start_data {
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data');   $result .= &Apache::edit::tag_start($target,$token,'Comma or space deliminated curve data');
  my $text = &Apache::lonxml::get_all_text("/data",$parser,$style);   my $text = &Apache::lonxml::get_all_text("/data",$parser,$style);
  $result .= &Apache::edit::end_row().   $result .= &Apache::edit::editline('',$text,'',60);
     &Apache::edit::start_spanning_row().  
     &Apache::edit::editline('',$text,'',60);  
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result.=&Apache::edit::rebuild_tag($token);   $result.=&Apache::edit::rebuild_tag($token);
  $result.=&Apache::edit::modifiedfield("/data",$parser);   $result.=&Apache::edit::modifiedfield("/data",$parser);
Removed from v.1.115  
changed lines
  Added in v.1.116

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