[LON-CAPA-cvs] cvs: loncom /homework randomlabel.pm

[foxr]

foxr		Thu May 10 06:46:52 2007 EDT

  Modified files:              
    /loncom/homework	randomlabel.pm 
  Log:
  Straighten out width/height and add an appropriate X axis adjust too
  
  
  
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.86 loncom/homework/randomlabel.pm:1.87
--- loncom/homework/randomlabel.pm:1.86	Thu May 10 06:27:22 2007
+++ loncom/homework/randomlabel.pm	Thu May 10 06:46:51 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.86 2007/05/10 10:27:22 foxr Exp $
+# $Id: randomlabel.pm,v 1.87 2007/05/10 10:46:51 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -70,7 +70,7 @@
 my $scale_factor;		# image scale factor.
 my $label_xscale;                # Label scale factor (needed for gnuplot).
 my $label_yscale;
-
+my $dirty_width_adjust = 5;     # Width adjustment for e.g. gnuplot images.
 
 BEGIN {
     &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
@@ -268,7 +268,8 @@
 		&Apache::lonxml::debug("height $height_param");
 		&Apache::lonxml::debug("Width $width_param");
 		&Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale");
-		my $dirty_width = $width_param + 5;
+		my $dirty_width = $width_param + $dirty_width_adjust;
+		my $x_offset    = -$dirty_width_adjust/2.0;
 		#
 		#  Somewhere here it looks like height_param and
 		#  width_param got backwards...
@@ -276,8 +277,8 @@
 		$result .= '\parbox{'.$dirty_width.'mm}{';
 		$result  .= " $src \n";
 		$result  .= '\setlength{\unitlength}{1mm}'."\n";
-		$result  .= '\begin{picture}('."$height_param,$width_param)";
-		$result  .= "(0,-$width_param)";
+		$result  .= '\begin{picture}('."$width_param,$height_param)";
+		$result  .= "($x_offset,-$height_param)";
 		$result  .= "\n";
 		$Apache::lonxml::debug = 0;