--- loncom/homework/randomlabel.pm 2005/06/07 22:31:30 1.77 +++ loncom/homework/randomlabel.pm 2006/08/29 10:42:59 1.83 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.77 2005/06/07 22:31:30 foxr Exp $ +# $Id: randomlabel.pm,v 1.83 2006/08/29 10:42:59 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -61,6 +61,9 @@ use Apache::File(); use Apache::Constants qw(:common :http); use Image::Magick; use Apache::lonplot; +use lib '/home/httpd/lib/perl/'; +use LONCAPA; + my %args; my $cgi_id; @@ -138,7 +141,7 @@ sub start_randomlabel { if ($target eq 'web') { $cgi_id=&Apache::loncommon::get_cgi_id(); %args=(); - $args{"cgi.$cgi_id.BGIMG"}=&Apache::lonnet::escape($bgimg); + $args{"cgi.$cgi_id.BGIMG"}=&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)) { @@ -206,21 +209,24 @@ sub end_bgimg { # If the tag produced has sizes, they override ours. # (for now anyway). # - &Apache::lonxml::debug("Base sizes: $width_param x $height_param"); my ($plot_x, $plot_y) = &extract_tag_sizes($bgimg, $width_param, - $height_param ); + $height_param); &Apache::lonxml::debug("Extracted sizes: $plot_x x $plot_y"); - $label_xscale = $plot_x / $width_param; - $label_yscale = $plot_y / $height_param; + if ($width_param) { + $label_xscale = $plot_x / $width_param; + } + if ($height_param) { + $label_yscale = $plot_y / $height_param; + } &Apache::lonxml::debug("Scale factors: $label_xscale $label_yscale"); &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); + $args{"cgi.$cgi_id.BGIMG"}=&escape($bgimg); } elsif ($target eq 'tex') { # Some bg images can create latex for us... e.g. gnuplot. # If it looks like we have some latex use that, @@ -272,8 +278,6 @@ sub end_bgimg { $Apache::lonxml::debug = 0; } else { - - $result.=&make_eps_image($bgimg,$parstack,$safeeval,-2); } } @@ -292,10 +296,20 @@ sub make_eps_image { &Apache::lonxml::debug("Image size: $height_param x $width_param"); my $dirtywidth=$width_param+5; + # + # Note that lonprintout/prinout will conspire to replace + # spaces in paths and names with _'s since spacess cause problems + # for latex included filenames. Therefore: + # + my $safe_path = $path; + $safe_path =~ s/ /\_/g; + my $safe_file = $file; + $safe_file =~ s/ /\_/g; + my $result ="\n".'\vspace*{2mm}\noindent'."\n". '\parbox{'.$dirtywidth. ' mm}{ \noindent \epsfxsize='.$width_param. - ' mm \epsffile{'.$path.$file. + ' mm \epsffile{'.$safe_path.$safe_file. '}\setlength{\unitlength}{1mm}'."\n".' \begin{picture}('. $width_param.','.$height_param.')(0,-'.$height_param.')'."\n"; my $magick = Image::Magick->new; @@ -368,6 +382,21 @@ sub get_label_width { } + +sub get_label_height { + my $label = shift; + &Apache::lonxml::debug("image label = $label"); + if (-e $label) { + &Apache::lonxml::debug("$label exists"); + } else { + &Apache::lonxml::debug("$label does not exist"); + } + my $magick = Image::Magick->new; + $magick->Read($label); + my $pixel_height = $magick->Get('height'); + return $pixel_height * $scale_factor; +} + sub add_vars { my ($name,$order,$label,$labelorder,$value,$image,$safeeval) = @_; if (!defined($name) || $name eq '') { return; } @@ -406,13 +435,13 @@ sub end_labelgroup { my $i=$Apache::randomlabel::obj_cnt++; if( $type eq 'text') { &add_vars($gname,$_,$label,$idx_arr[$_],$value,'',$safeeval); - $str = join(':',$x,$y,&Apache::lonnet::escape($label)); + $str = join(':',$x,$y,&escape($label)); $args{"cgi.$cgi_id.OBJTYPE"}.='LABEL:'; } elsif ( $type eq 'image') { &add_vars($gname,$_, $Apache::randomlabel::description[$idx_arr[$_]], $idx_arr[$_],$value,$label,$safeeval); - $str = join(':',$x,$y,&Apache::lonnet::escape($label)); + $str = join(':',$x,$y,&escape($label)); $args{"cgi.$cgi_id.OBJTYPE"}.='IMAGE:'; } else { &Apache::lonxml::error('Unknown type of label :'.$type.':'); @@ -435,8 +464,11 @@ sub end_labelgroup { for(my $i=0;$i <= $#Apache::randomlabel::label_arr; $i++) { my $label = "$Apache::randomlabel::label_arr[ $idx_arr[$i] ]"; my $x = $Apache::randomlabel::xcoord[$i]; - # FIXME the 3.5 here is the 'height' of the letter in TeX - my $y = $Apache::randomlabel::ycoord[$i]-3.5; + my $y = $Apache::randomlabel::ycoord[$i]; + if ( $type eq 'text' ) { + # FIXME the 3.5 here is the 'height' of the letter in TeX + $y=$y-3.5; + } &Apache::lonxml::debug("initially: x= $x y= $y"); my $value = $Apache::randomlabel::value[$i]; #x latex coordinate @@ -445,6 +477,11 @@ sub end_labelgroup { #y latex coordinate # my $ratio=($wwidth > 0 ? $wheight/$wwidth : 1 ); my $tcY=$height_param-$y*($height_param/$wheight); + if ( $type eq 'image') { + my $label_height = &get_label_height($label); + $tcY=$tcY-$label_height; + } + &Apache::lonxml::debug("hparam = $height_param wheight = $wheight texy = $tcY"); $tcX=sprintf('%.2f',$tcX); $tcY=sprintf('%.2f',$tcY); @@ -455,7 +492,12 @@ sub end_labelgroup { } elsif ( $type eq 'image') { my ($path,$file) = &Apache::londefdef::get_eps_image($label); my $image_name = $path.$file; - my $label_width = get_label_width($label); + # + # Note that spaces in e.. \includegraphics cause problems for Latex + # so they get replaced by _'s by lonprintout/printout and us: + # + $image_name =~ s/ /\_/g; + my $label_width = &get_label_width($label); $result .= '\includegraphics[width='.$label_width.'mm]{' .$image_name."}}\n"; @@ -527,7 +569,7 @@ sub start_label { &Apache::lonxml::startredirection; } elsif ($target eq 'edit') { $result.=&Apache::edit::tag_start($target,$token,"$type Label"); - my $text=&Apache::lonxml::get_all_text("/label",$parser); + my $text=&Apache::lonxml::get_all_text("/label",$parser,$style); if ($type eq 'image') { $result.=&Apache::edit::end_row(). &Apache::edit::start_spanning_row();