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

Diff for /loncom/xml/lonplot.pm between versions 1.29 and 1.31

version 1.29, 2002/01/01 19:34:25 version 1.31, 2002/01/03 22:09:49
Line 26 Line 26
 # http://www.lon-capa.org/  # http://www.lon-capa.org/
 #  #
 # 12/15/01 Matthew  # 12/15/01 Matthew
 # 12/17 12/18 12/19 12/20 12/21 12/27 12/28 12/30 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 Matthew
 package Apache::lonplot;  package Apache::lonplot;
   
 use strict;  use strict;
Line 384  sub start_title { Line 386  sub start_title {
  $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[-1]);   my $text=&Apache::lonxml::get_all_text("/title",$$parser[-1]);
  $result.='</td></tr><tr><td colspan="3">'.   $result.='</td></tr><tr><td colspan="3">'.
     &Apache::edit::editfield('',$text,'',20,1);      &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $text=$$parser[-1]->get_text("/title");   my $text=$$parser[-1]->get_text("/title");
  $result.=&Apache::edit::modifiedfield($token);   $result.=&Apache::edit::modifiedfield($token);
Line 411  sub start_xlabel { Line 413  sub start_xlabel {
  $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[-1]);   my $text=&Apache::lonxml::get_all_text("/xlabel",$$parser[-1]);
  $result.='</td></tr><tr><td colspan="3">'.   $result.='</td></tr><tr><td colspan="3">'.
     &Apache::edit::editfield('',$text,'',20,1);      &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $text=$$parser[-1]->get_text("/xlabel");   my $text=$$parser[-1]->get_text("/xlabel");
  $result.=&Apache::edit::modifiedfield($token);   $result.=&Apache::edit::modifiedfield($token);
Line 439  sub start_ylabel { Line 441  sub start_ylabel {
  $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[-1]);   my $text = &Apache::lonxml::get_all_text("/ylabel",$$parser[-1]);
  $result .= '</td></tr><tr><td colspan="3">'.   $result .= '</td></tr><tr><td colspan="3">'.
     &Apache::edit::editfield('',$text,'',20,1);      &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $text=$$parser[-1]->get_text("/ylabel");   my $text=$$parser[-1]->get_text("/ylabel");
  $result.=&Apache::edit::modifiedfield($token);   $result.=&Apache::edit::modifiedfield($token);
Line 466  sub start_label { Line 468  sub start_label {
  &get_attributes(\%label,\%label_defaults,$parstack,$safeeval,   &get_attributes(\%label,\%label_defaults,$parstack,$safeeval,
     $tagstack->[-1]);      $tagstack->[-1]);
  $label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);   $label{'text'} = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
    $label{'text'} =~ s/[\-\:\`\'\"\,\.]//g;
  if (! &$words_test($label{'text'})) {   if (! &$words_test($label{'text'})) {
     # I should probably warn about it, too.      # I should probably warn about it, too.
     $label{'text'} = 'Illegal text';      $label{'text'} = 'Illegal text';
Line 476  sub start_label { Line 479  sub start_label {
  $result .= &edit_attributes($target,$token,\%label_defaults);   $result .= &edit_attributes($target,$token,\%label_defaults);
  my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);   my $text = &Apache::lonxml::get_all_text("/label",$$parser[-1]);
  $result .= '</td></tr><tr><td colspan="3">'.   $result .= '</td></tr><tr><td colspan="3">'.
     &Apache::edit::editfield('',$text,'',20,1);      &Apache::edit::editfield('',$text,'',60,1);
     } 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(%label_defaults));      ($token,$parstack,$safeeval,keys(%label_defaults));
Line 552  sub start_function { Line 555  sub start_function {
  $result .= &Apache::edit::tag_start($target,$token,'Curve Function');   $result .= &Apache::edit::tag_start($target,$token,'Curve Function');
  my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);   my $text = &Apache::lonxml::get_all_text("/function",$$parser[-1]);
  $result .= '</td></tr><tr><td colspan="3">'.   $result .= '</td></tr><tr><td colspan="3">'.
     &Apache::edit::editfield('',$text,'',20,1);      &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  # Why do I do this?   # Why do I do this?
  my $text=$$parser[-1]->get_text("/function");   my $text=$$parser[-1]->get_text("/function");
Line 614  sub start_data { Line 617  sub start_data {
  $result .= &Apache::edit::tag_start($target,$token,'Curve Data');   $result .= &Apache::edit::tag_start($target,$token,'Curve Data');
  my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);   my $text = &Apache::lonxml::get_all_text("/data",$$parser[-1]);
  $result .= '</td></tr><tr><td colspan="3">'.   $result .= '</td></tr><tr><td colspan="3">'.
     &Apache::edit::editfield('',$text,'',20,1);      &Apache::edit::editfield('',$text,'',60,1);
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  my $text=$$parser[-1]->get_text("/data");   my $text=$$parser[-1]->get_text("/data");
  $result.=&Apache::edit::modifiedfield($token);   $result.=&Apache::edit::modifiedfield($token);
Line 838  sub insert_plot { Line 841  sub insert_plot {
     my $result = '';      my $result = '';
     #  plot attributes      #  plot attributes
     $result .= "<plot \n";      $result .= "<plot \n";
     foreach my $attr (%plot_defaults) {      foreach my $attr (keys(%plot_defaults)) {
  $result .= "     $attr=\"$plot_defaults{$attr}->{'default'}\"\n";   $result .= "     $attr=\"$plot_defaults{$attr}->{'default'}\"\n";
     }      }
     $result .= ">\n";      $result .= ">\n";
Line 857  sub insert_plot { Line 860  sub insert_plot {
 sub insert_key {  sub insert_key {
     my $result;      my $result;
     $result .= "    <key \n";      $result .= "    <key \n";
     foreach my $attr (%key_defaults) {      foreach my $attr (keys(%key_defaults)) {
  $result .= "         $attr=\"$key_defaults{$attr}->{'default'}\"\n";   $result .= "         $attr=\"$key_defaults{$attr}->{'default'}\"\n";
     }      }
     $result .= "   />\n";      $result .= "   />\n";
Line 867  sub insert_key { Line 870  sub insert_key {
 sub insert_axis{  sub insert_axis{
     my $result;      my $result;
     $result .= '    <axis ';      $result .= '    <axis ';
     foreach my $attr (%axis_defaults) {     foreach my $attr (keys(%axis_defaults)) {
  $result .= "         $attr=\"$axis_defaults{$attr}->{'default'}\"\n";   $result .= "         $attr=\"$axis_defaults{$attr}->{'default'}\"\n";
     }      }
     $result .= "   />\n";      $result .= "   />\n";
Line 881  sub insert_ylabel { return "    <ylabel> Line 884  sub insert_ylabel { return "    <ylabel>
 sub insert_label {  sub insert_label {
     my $result;      my $result;
     $result .= '    <label ';      $result .= '    <label ';
     foreach my $attr (%label_defaults) {      foreach my $attr (keys(%label_defaults)) {
  $result .= '         '.$attr.'="'.   $result .= '         '.$attr.'="'.
     $label_defaults{$attr}->{'default'}."\"\n";      $label_defaults{$attr}->{'default'}."\"\n";
     }      }
Line 892  sub insert_label { Line 895  sub insert_label {
 sub insert_curve {  sub insert_curve {
     my $result;      my $result;
     $result .= '    <curve ';      $result .= '    <curve ';
     foreach my $attr (%curve_defaults) {      foreach my $attr (keys(%curve_defaults)) {
  $result .= '         '.$attr.'="'.   $result .= '         '.$attr.'="'.
     $curve_defaults{$attr}->{'default'}."\"\n";      $curve_defaults{$attr}->{'default'}."\"\n";
     }      }
Line 908  sub insert_function { Line 911  sub insert_function {
 sub insert_data {  sub insert_data {
     my $result;      my $result;
     $result .= "     <data></data>\n";      $result .= "     <data></data>\n";
     $result .= "     <data></data>\n";  
     return $result;      return $result;
 }  }
   
Removed from v.1.29  
changed lines
  Added in v.1.31

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