--- loncom/homework/randomlabel.pm	2006/11/07 02:39:58	1.85
+++ loncom/homework/randomlabel.pm	2008/11/18 19:14:28	1.92
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # random labelling tool
 #
-# $Id: randomlabel.pm,v 1.85 2006/11/07 02:39:58 albertel Exp $
+# $Id: randomlabel.pm,v 1.92 2008/11/18 19:14:28 jms Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,6 +53,7 @@
 #             (32,65)  : $GroupTwo[1] = "TEXT-1"
 #             (21,54)  : $GroupTwo[2] = "TEXT-2"
 #  ===========================================
+
 package Apache::randomlabel;
 use Apache::lonnet;
 use strict;
@@ -61,7 +62,6 @@ use Apache::File();
 use Apache::Constants qw(:common :http);
 use Image::Magick;
 use Apache::lonplot;
-use lib '/home/httpd/lib/perl/';
 use LONCAPA;
  
 
@@ -70,7 +70,7 @@ my $cgi_id;
 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'));
@@ -147,12 +147,13 @@ sub start_randomlabel {
     } elsif ($target eq 'tex' && defined($bgimg)) {
 	$result.=&make_eps_image($bgimg,$parstack,$safeeval);
     } elsif ($target eq 'edit') {
+        my $only = join(',',&Apache::loncommon::filecategorytypes('Pictures'));
 	$result.=&Apache::edit::tag_start($target,$token);
 	$Apache::edit::bgimgsrc=
 	    &Apache::lonxml::get_param('bgimg',$parstack,$safeeval);
 	$Apache::edit::bgimgsrccurdepth=$Apache::lonxml::curdepth;
 	$result.=&Apache::edit::text_arg('Image:','bgimg',$token,75).' ';
-	$result.=&Apache::edit::browse('bgimg').' ';
+	$result.=&Apache::edit::browse('bgimg',undef,undef,$only).' ';
 	$result.=&Apache::edit::search('bgimg').'<br />'.
 	    &Apache::edit::text_arg('Width(pixel):' ,'width'   ,$token,6).
 	    &Apache::edit::text_arg('Height(pixel):','height'  ,$token,6).
@@ -164,7 +165,6 @@ sub start_randomlabel {
 						     'height','texwidth');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -179,7 +179,7 @@ sub end_randomlabel {
 	$count = $Apache::randomlabel::obj_cnt;
 	if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; }
 	$result.='<img src="/adm/randomlabel.png?token='.$cgi_id.'" /><br />'."\n";
-	&Apache::lonnet::appenv(%args);
+	&Apache::lonnet::appenv(\%args);
     } elsif ($target eq 'tex') {
 	$result='\end{picture}\\\\';
 	$result.= ' \vskip -'.$height_param.' mm }  \\\\ ';
@@ -268,12 +268,17 @@ sub end_bgimg {
 		&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...
+		#
 		$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  .= '\begin{picture}('."$width_param,$height_param)";
+		$result  .= "($x_offset,-$height_param)";
 		$result  .= "\n";
 		$Apache::lonxml::debug = 0;
 
@@ -349,7 +354,6 @@ sub start_labelgroup {
 						     'TeXsize');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -535,7 +539,6 @@ sub start_location {
 						    $safeeval,'x','y','value');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     $Apache::lonxml::debug = 0;
@@ -550,6 +553,14 @@ sub end_location {
 }
 
 # <label>$var_abc</label>
+sub insert_label {
+    my ($after) = @_;
+    my $depth = scalar(@Apache::lonxml::depthcounter);
+    $depth-- if ($after);
+    my $inset = "\t"x$depth;
+    return "\n$inset<label></label>";
+}
+
 sub start_label {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';