[LON-CAPA-cvs] cvs: loncom /xml lonplot.pm

[raeburn]

raeburn		Thu Jun 19 17:23:51 2014 EDT

  Modified files:              
    /loncom/xml	lonplot.pm 
  Log:
  - Bug 6707. Add front or back option to GNUplot labels. (e.g., set label 
    text to be in front of filled curve). 
  
  
Index: loncom/xml/lonplot.pm
diff -u loncom/xml/lonplot.pm:1.174 loncom/xml/lonplot.pm:1.175
--- loncom/xml/lonplot.pm:1.174	Tue May 27 12:31:03 2014
+++ loncom/xml/lonplot.pm	Thu Jun 19 17:23:50 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.174 2014/05/27 12:31:03 raeburn Exp $
+# $Id: lonplot.pm,v 1.175 2014/06/19 17:23:50 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,7 +78,7 @@
 ##  align
 ##
 ##  @labels: $labels[$i] = \%label
-##           %label: text, xpos, ypos, justify
+##           %label: text, xpos, ypos, justify, rotate, zlayer
 ##
 ##  @curves: $curves[$i] = \%curve
 ##           %curve: name, linestyle, ( function | data )
@@ -421,7 +421,14 @@
          description => 'Rotation of label (degrees)',
          edit_type   => 'entry',
          size        => '10',
-     }
+     },
+     zlayer => {
+         default => '',
+         test => sub {$_[0]=~/^(front|back)$/},
+         description => 'Z position of label',
+         edit_type   => 'choice',
+         choices     => ['front','back'], 
+     },
      );
 
 my @tic_edit_order = ('location','mirror','start','increment','end',
@@ -1967,7 +1974,10 @@
         $gnuplot_input .= ' '.$label->{'justify'};
 
         if ($target eq 'tex') {
-	    $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"' ;
+	    $gnuplot_input .=' font "'.$font_properties->{'printname'}.','.$fontsize.'pt"';
+        }
+        if (($label->{'zlayer'} eq 'front') || ($label->{'zlayer'} eq 'back')) {
+            $gnuplot_input .= ' '.$label->{'zlayer'};
         }
         $gnuplot_input .= $/;
     }