--- loncom/homework/randomlabel.pm 2005/12/01 18:46:31 1.81 +++ loncom/homework/randomlabel.pm 2008/11/25 13:16:17 1.93 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # random labelling tool # -# $Id: randomlabel.pm,v 1.81 2005/12/01 18:46:31 albertel Exp $ +# $Id: randomlabel.pm,v 1.93 2008/11/25 13:16:17 jms Exp $ # # Copyright Michigan State University Board of Trustees # @@ -24,35 +24,84 @@ # /home/httpd/html/adm/gpl.txt # # http://www.lon-capa.org/ -# -# SYNTAX: -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# -# =========================================== -# side effect: -# location (123,456): $GroupOne[0] = 2 # images give out indexes -# (321,654): $GroupOne[1] = 1 -# (213,546): $GroupOne[2] = 0 -# location (12,45) : $GroupTwo[0] = "TEXT-3" -# (32,65) : $GroupTwo[1] = "TEXT-1" -# (21,54) : $GroupTwo[2] = "TEXT-2" -# =========================================== + +=pod + +=head1 NAME + +Apache::randomlable.pm + +=head1 SYNOPSIS + +Interface for producing applet code which +randomizes the labelling of an image. + +This is part of the LearningOnline Network with CAPA project +described at http://www.lon-capa.org. + + +=head1 SYNTAX + + + + + + + + + + + + + + + + + + + + =========================================== + side effect: + location (123,456): $GroupOne[0] = 2 images give out indexes + (321,654): $GroupOne[1] = 1 + (213,546): $GroupOne[2] = 0 + location (12,45) : $GroupTwo[0] = "TEXT-3" + (32,65) : $GroupTwo[1] = "TEXT-1" + (21,54) : $GroupTwo[2] = "TEXT-2" + =========================================== + + +=head1 NOTABLE SUBROUTINES + +=over + +=item check_int() + + utility function to do error checking on a integer. + +=item extract_tag_sizes() + +Parameters: + tag - tag potentially containing height/width attributes. + def_width - Default width. + def_height - Default height. + Returns: + list containing width/height. + +=item get_label_width() + + Utility sub to compute the width of a label. + +=item end_labelgroup() + +begin to assign labels to locations + +=back + +=cut + + + package Apache::randomlabel; use Apache::lonnet; use strict; @@ -61,13 +110,15 @@ use Apache::File(); use Apache::Constants qw(:common :http); use Image::Magick; use Apache::lonplot; +use LONCAPA; + my %args; 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')); @@ -87,15 +138,8 @@ sub check_int { return $num; } -# Get width/height from an image tag... -# -# Parameters: -# tag - tag potentially containing height/width attributes. -# def_width - Default width. -# def_height - Default height. -# Returns: -# list containing width/height. -# + + sub extract_tag_sizes { my ($tag, $dw, $dh) = @_; $tag =~ s/\s+/ /g; # Collapse whitespace. @@ -138,18 +182,19 @@ 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)) { $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').'
'. &Apache::edit::text_arg('Width(pixel):' ,'width' ,$token,6). &Apache::edit::text_arg('Height(pixel):','height' ,$token,6). @@ -161,7 +206,6 @@ sub start_randomlabel { 'height','texwidth'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); } } return $result; @@ -176,7 +220,7 @@ sub end_randomlabel { $count = $Apache::randomlabel::obj_cnt; if( $count != 0) { $args{"cgi.$cgi_id.OBJCOUNT"}=$count; } $result.='
'."\n"; - &Apache::lonnet::appenv(%args); + &Apache::lonnet::appenv(\%args); } elsif ($target eq 'tex') { $result='\end{picture}\\\\'; $result.= ' \vskip -'.$height_param.' mm } \\\\ '; @@ -223,7 +267,7 @@ sub end_bgimg { &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, @@ -265,12 +309,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; @@ -293,6 +342,7 @@ sub make_eps_image { &Apache::lonxml::debug("Image size: $height_param x $width_param"); my $dirtywidth=$width_param+5; + my $result ="\n".'\vspace*{2mm}\noindent'."\n". '\parbox{'.$dirtywidth. ' mm}{ \noindent \epsfxsize='.$width_param. @@ -345,15 +395,13 @@ sub start_labelgroup { 'TeXsize'); if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); - $result.=&Apache::edit::handle_insert(); } } return $result; } -# -# Utility sub to compute the width of a label. -# + + sub get_label_width { my $label = shift; &Apache::lonxml::debug("image label = $label"); @@ -403,7 +451,8 @@ sub add_vars { $out=Apache::run::run($code,$safeeval); } -# begin to assign labels to locations + + sub end_labelgroup { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $gname = $Apache::randomlabel::groupname; @@ -422,13 +471,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.':'); @@ -479,6 +528,10 @@ sub end_labelgroup { } elsif ( $type eq 'image') { my ($path,$file) = &Apache::londefdef::get_eps_image($label); my $image_name = $path.$file; + # + # Note that spaces in e.. \includegraphics cause problems for Latex + # so they get replaced by _'s by lonprintout/printout and us: + # my $label_width = &get_label_width($label); $result .= '\includegraphics[width='.$label_width.'mm]{' @@ -527,7 +580,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; @@ -542,6 +594,14 @@ sub end_location { } # +sub insert_label { + my ($after) = @_; + my $depth = scalar(@Apache::lonxml::depthcounter); + $depth-- if ($after); + my $inset = "\t"x$depth; + return "\n$inset"; +} + sub start_label { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result='';