--- loncom/homework/randomlabel.pm	2005/04/18 21:41:51	1.72
+++ loncom/homework/randomlabel.pm	2005/05/24 10:10:16	1.75
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.72 2005/04/18 21:41:51 foxr Exp $
+# $Id: randomlabel.pm,v 1.75 2005/05/24 10:10:16 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,10 +60,13 @@ use Apache::edit;
 use Apache::File();
 use Apache::Constants qw(:common :http);
 use Image::Magick;
+use Apache::lonplot;
 
 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'));
 }
@@ -86,6 +89,8 @@ sub start_randomlabel {
     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);
@@ -98,6 +103,8 @@ sub start_randomlabel {
 	$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') {
@@ -158,21 +165,73 @@ sub end_bgimg {
     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') {
-	    $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
+	    #   Some bg images can create latex for us... e.g. gnuplot.
+	    #   If it looks like we have some latex use that, 
+	    #   otherwise, assume this is a resource name that must
+	    #   be converted into the latex to create an eps insertion.
+	    #
+	    my $src = $bgimg;
+	    $src =~ s/\s+$//s;
+	    $src =~ s/^\s+//s;
+	    
+
+	    if ($src =~ /^\\graphicspath/) {
+	        $height_param = $Apache::lonplot::plot{'height'};
+		my $initial_width= $Apache::lonplot::plot{'width'};
+		$width_param  = $Apache::lonplot::plot{'texwidth'};
+		$scale_factor = $width_param / $initial_width;
+		$height_param = $height_param*$scale_factor;
+		&Apache::lonxml::debug("height $height_param");
+		&Apache::lonxml::debug("Width $width_param");
+
+		my $dirty_width = $width_param + 5;
+		$result .= '\parbox{'.$dirty_width.'mm}{';
+		$result  .= $src."\n";
+		$result  .= '\setlength{\unitlength}{1mm}'."\n";
+		$result  .= '\begin{picture}('."$height_param,$width_param)";
+		$result  .= "(0,-$height_param)";
+		$result  .= "\n";
+
+	    } else {
+		
+		
+		$result.=&make_eps_image($bgimg,$parstack,$safeeval,-2);
+	    }
 	}
     }
     return $result;
 }
-my $scale_factor;		# image scale factor.
 sub make_eps_image {
     my ($bgimg,$parstack,$safeeval,$depth)=@_;
+    &Apache::lonxml::debug("image prior to get_eps_image: $bgimg");
     my ($path,$file) = &Apache::londefdef::get_eps_image($bgimg);
+    &Apache::lonxml::debug("image after:  $bgimg");
     ($height_param,$width_param)=
 	&Apache::londefdef::image_size($bgimg,0.3,$parstack,$safeeval,
 				       $depth,1);
+
+    &Apache::lonxml::debug("Image size: $height_param x $width_param");
+
     my $dirtywidth=$width_param+5;
     my $result ="\n".'\vspace*{2mm}\noindent'."\n".
 	'\parbox{'.$dirtywidth.
@@ -183,6 +242,7 @@ sub make_eps_image {
     my $magick = Image::Magick->new;
     $magick->Read($bgimg);
     my $initial_width = $magick->Get('width');
+    &Apache::lonxml::debug("ImageMagick thinks width is; $initial_width");
     $scale_factor = $width_param / $initial_width;
     return $result;
 }
@@ -354,6 +414,12 @@ sub start_location {
     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);