--- loncom/homework/randomlabel.pm	2007/05/10 10:27:22	1.86
+++ loncom/homework/randomlabel.pm	2008/12/21 15:10:12	1.91.2.1
@@ -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.91.2.1 2008/12/21 15:10:12 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -61,7 +61,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 +69,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'));
@@ -131,7 +130,7 @@ sub start_randomlabel {
     $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:/ ) {
+    if ( defined($bgimg) && $bgimg !~ /^https?\:/ ) {
 	$bgimg=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$bgimg);
 	if (&Apache::lonnet::repcopy($bgimg) ne 'ok') {
 	    $bgimg='/home/httpd/html/adm/lonKaputt/lonlogo_broken.gif';
@@ -147,12 +146,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 +164,6 @@ sub start_randomlabel {
 						     'height','texwidth');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -179,7 +178,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,7 +267,8 @@ 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...
@@ -276,8 +276,8 @@ sub end_bgimg {
 		$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;
 
@@ -353,7 +353,6 @@ sub start_labelgroup {
 						     'TeXsize');
 	if ($constructtag) {
 	    $result = &Apache::edit::rebuild_tag($token);
-	    $result.=&Apache::edit::handle_insert();
 	}
     }
     return $result;
@@ -539,7 +538,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;
@@ -554,6 +552,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='';