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

[foxr]

foxr		Tue May 24 06:10:20 2005 EDT

  Modified files:              
    /loncom/homework	randomlabel.pm 
  Log:
  Support correct placement of labels on gnuplot images for both web and
  print targets.  (defect 3928).
  
  
Index: loncom/homework/randomlabel.pm
diff -u loncom/homework/randomlabel.pm:1.74 loncom/homework/randomlabel.pm:1.75
--- loncom/homework/randomlabel.pm:1.74	Mon May 23 07:02:13 2005
+++ loncom/homework/randomlabel.pm	Tue May 24 06:10:16 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.74 2005/05/23 11:02:13 foxr Exp $
+# $Id: randomlabel.pm,v 1.75 2005/05/24 10:10:16 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -65,7 +65,8 @@
 my %args;
 my $cgi_id;
 my $scale_factor;		# image scale factor.
-
+my $label_xscale;                # Label scale factor (needed for gnuplot).
+my $label_yscale;
 BEGIN {
     &Apache::lonxml::register('Apache::randomlabel',('randomlabel','labelgroup','location','label','bgimg'));
 }
@@ -88,6 +89,8 @@
     my $result='';
     push (@Apache::lonxml::namespace,'randomlabel');
     ($height_param,$width_param)=(0,0);
+    $label_xscale = 1.0;		# Assume image size not overridden.
+    $label_yscale = 1.0;
     my $bgimg= &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
     if ( defined($bgimg) && $bgimg !~ /^http:/ ) {
 	$bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
@@ -100,6 +103,8 @@
 	$cgi_id=&Apache::loncommon::get_cgi_id();
 	%args=();
 	$args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
+	$height_param = &Apache::lonxml::get_param('height',$parstack, $safeeval);
+	$width_param  = &Apache::lonxml::get_param('width', $parstack, $safeeval);
     } elsif ($target eq 'tex' && defined($bgimg)) {
 	$result.=&make_eps_image($bgimg,$parstack,$safeeval);
     } elsif ($target eq 'edit') {
@@ -160,7 +165,24 @@
     if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { 
 	my $bgimg=&Apache::lonxml::endredirection(); 
 	if ($target eq 'web') {
+	    # Try to determine  if this is a gnu plot image in which 
+	    # case it's size overrides the web size.
+	    #    If it's a gnuplot the uncleaned image will have
+	    #    the text "dynamically generated plot"
+	    #    and "cgi-bin/plot.gif?"
+	    if ( ($bgimg =~ /dynamically generated plot/) &&
+		 ($bgimg =~ /cgi-bin\/plot.gif\?/) ) {
+		&Apache::lonxml::debug("Gnuplot image!");
+		my $plot_x = $Apache::lonplot::plot{'width'};
+		my $plot_y = $Apache::lonplot::plot{'height'};
+		&Apache::lonxml::debug(" H = $plot_y W = $plot_x");
+		&Apache::lonxml::debug("PH = $height_param, PW = $width_param");
+		$label_xscale = $plot_x/$width_param;
+		$label_yscale = $plot_y/$height_param;
+	    }
+	    &Apache::lonxml::debug("Image: $bgimg");
 	    $bgimg=&Apache::imageresponse::clean_up_image($bgimg);
+	    &Apache::lonxml::debug("Cleaned image: $bgimg");
 	    $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg);
 	} elsif ($target eq 'tex') {
 	    #   Some bg images can create latex for us... e.g. gnuplot.
@@ -392,6 +414,12 @@
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $x= &check_int(&Apache::lonxml::get_param('x',$parstack,$safeeval),50);
     my $y= &check_int(&Apache::lonxml::get_param('y',$parstack,$safeeval),50);
+    &Apache::lonxml::debug("x = $x y = $y");
+    $x = $x*$label_xscale;
+    $y = $y*$label_yscale;
+    &Apache::lonxml::debug(" H = $height_param W = $width_param");
+    &Apache::lonxml::debug(" XS = $label_xscale YS = $label_yscale");
+    &Apache::lonxml::debug(" X  = $x Y = $y");
     my $value= &Apache::lonxml::get_param('value',$parstack,$safeeval);
     my $result='';
     push(@Apache::randomlabel::xcoord,$x);