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

[albertel]

albertel		Fri Aug  3 13:44:35 2007 EDT

  Modified files:              
    /loncom/xml	lonplot.pm 
  Log:
  - add in extra space between label and border if the tics are in the graph
  - update font description stirng
  
  
Index: loncom/xml/lonplot.pm
diff -u loncom/xml/lonplot.pm:1.124 loncom/xml/lonplot.pm:1.125
--- loncom/xml/lonplot.pm:1.124	Fri Aug  3 02:08:06 2007
+++ loncom/xml/lonplot.pm	Fri Aug  3 13:44:35 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Dynamic plot
 #
-# $Id: lonplot.pm,v 1.124 2007/08/03 06:08:06 albertel Exp $
+# $Id: lonplot.pm,v 1.125 2007/08/03 17:44:35 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -206,7 +206,7 @@
      font         => {
 	 default     => '9',
 	 test        => $sml_test,
-	 description => 'Size of font to use',
+	 description => 'Font size to use in web output (pts)',
 	 edit_type   => 'choice',
 	 choices     => [['5','5 (small)'],'7',['9','9 (medium)'],'10','12',['15','15 (large)']]
 	 },
@@ -1236,14 +1236,17 @@
     $gnuplot_input .= "set samples $Apache::lonplot::plot{'samples'}\n";
     # title, xlabel, ylabel
     # titles
+    my $extra_space_x = ($xtics{'location'} eq 'axis') ? ' 0, -0.5 ' : '';
+    my $extra_space_y = ($ytics{'location'} eq 'axis') ? ' -0.5, 0 ' : '';
+
     if ($target eq 'tex') {
-	$gnuplot_input .= "set title  \"$title\"  font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
-	$gnuplot_input .= "set xlabel \"$xlabel\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
-	$gnuplot_input .= "set ylabel \"$ylabel\" font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
+	$gnuplot_input .= "set title  \"$title\"          font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($title)) ;
+	$gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($xlabel));
+	$gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y font \"".$font_properties->{'printname'}.",".$fontsize."pt\"\n" if (defined($ylabel));
     } else {
-        $gnuplot_input .= "set title  \"$title\"  \n" if (defined($title)) ;
-        $gnuplot_input .= "set xlabel \"$xlabel\" \n" if (defined($xlabel));
-        $gnuplot_input .= "set ylabel \"$ylabel\" \n" if (defined($ylabel));
+        $gnuplot_input .= "set title  \"$title\"          \n" if (defined($title)) ;
+        $gnuplot_input .= "set xlabel \"$xlabel\" $extra_space_x \n" if (defined($xlabel));
+        $gnuplot_input .= "set ylabel \"$ylabel\" $extra_space_y \n" if (defined($ylabel));
     }
     # tics
     if (%xtics) {