version 1.51, 2004/03/08 23:23:04
|
version 1.57, 2004/11/13 16:28:21
|
Line 1
|
Line 1
|
|
|
# The LearningOnline Network with CAPA |
# The LearningOnline Network with CAPA |
# image click response style |
# image click response style |
# |
# |
Line 75 sub end_imageresponse {
|
Line 74 sub end_imageresponse {
|
sub start_foilgroup { |
sub start_foilgroup { |
%Apache::response::foilgroup=(); |
%Apache::response::foilgroup=(); |
$Apache::imageresponse::conceptgroup=0; |
$Apache::imageresponse::conceptgroup=0; |
&Apache::response::setrandomnumber(); |
&Apache::response::pushrandomnumber(); |
return ''; |
return ''; |
} |
} |
|
|
Line 85 sub getfoilcounts {
|
Line 84 sub getfoilcounts {
|
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
my $max = &Apache::lonxml::get_param('max',$parstack,$safeeval,'-2'); |
# +1 since instructors will count from 1 |
# +1 since instructors will count from 1 |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
my $count = $#{ $Apache::response::foilgroup{'names'} }+1; |
if (&Apache::response::showallfoils()) { $max=$count; } |
#if (&Apache::response::showallfoils()) { $max=$count; } |
return ($count,$max); |
return ($count,$max); |
} |
} |
|
|
Line 97 sub whichfoils {
|
Line 96 sub whichfoils {
|
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
while ((($#whichopt+1) < $max) && ($#names > -1)) { |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
&Apache::lonxml::debug("Have $#whichopt max is $max"); |
my $aopt; |
my $aopt; |
if (&Apache::response::showallfoils()) { |
# if (&Apache::response::showallfoils()) { |
$aopt=0; |
# $aopt=0; |
} else { |
# } else { |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
$aopt=int(&Math::Random::random_uniform() * ($#names+1)); |
} |
# } |
&Apache::lonxml::debug("From $#names elms, picking $aopt"); |
&Apache::lonxml::debug("From $#names elms, picking $aopt"); |
$aopt=splice(@names,$aopt,1); |
$aopt=splice(@names,$aopt,1); |
&Apache::lonxml::debug("Picked $aopt"); |
&Apache::lonxml::debug("Picked $aopt"); |
Line 131 sub prep_image {
|
Line 130 sub prep_image {
|
|
|
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax), |
$x{"cgi.$id.OBJ$i"}=join(':',(($x),($ymin),($x),($ymax), |
"FFFFFF",($width+$extrawidth))); |
"FFFFFF",($width+$extrawidth))); |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin), |
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($y),($xmax),($y), |
"FFFFFF",($width+$extrawidth))); |
"FFFFFF",($width+$extrawidth))); |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymin),($xmax),($ymax), |
$x{"cgi.$id.OBJ$i"}=join(':',(($x),($ymin),($x),($ymax), |
"FF0000",($width))); |
"FF0000",($width))); |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$x{"cgi.$id.OBJTYPE"}.='LINE:'; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$i=$x{"cgi.$id.OBJCOUNT"}++; |
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($ymax),($xmax),($ymin), |
$x{"cgi.$id.OBJ$i"}=join(':',(($xmin),($y),($xmax),($y), |
"FF0000",($width))); |
"FF0000",($width))); |
} |
} |
if ($mode eq 'answer') { |
if ($mode eq 'answer') { |
Line 270 sub gradefoils {
|
Line 269 sub gradefoils {
|
$temp++; |
$temp++; |
} |
} |
} |
} |
|
if ($result |
|
&& $Apache::lonhomework::type eq 'survey') { $result='SUBMITTED'; } |
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y"; |
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.submission"}="$x:$y"; |
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result; |
$Apache::lonhomework::results{"resource.$Apache::inputtags::part.$id.awarddetail"}=$result; |
return ''; |
return ''; |
Line 296 sub end_foilgroup {
|
Line 297 sub end_foilgroup {
|
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result=&Apache::edit::end_table(); |
$result=&Apache::edit::end_table(); |
} |
} |
|
&Apache::response::poprandomnumber(); |
return $result; |
return $result; |
} |
} |
|
|
Line 341 sub start_foil {
|
Line 343 sub start_foil {
|
if (defined($Apache::response::foilnames{$name})) { |
if (defined($Apache::response::foilnames{$name})) { |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
&Apache::lonxml::error(&mt("Foil name <b><tt>[_1]</tt></b> appears more than once. Foil names need to be unique.",$name)); |
} |
} |
|
$Apache::response::foilnames{$name}++; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
push(@{ $Apache::response::conceptgroup{'names'} }, $name); |
push(@{ $Apache::response::conceptgroup{'names'} }, $name); |
} else { |
} else { |
push(@{ $Apache::response::foilgroup{'names'} }, $name); |
push(@{ $Apache::response::foilgroup{'names'} }, $name); |
Line 383 sub end_text {
|
Line 387 sub end_text {
|
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils() ) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; |
$Apache::response::conceptgroup{"$name.text"} = &Apache::lonxml::endredirection; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; |
$Apache::response::foilgroup{"$name.text"} = &Apache::lonxml::endredirection; |
Line 423 sub end_image {
|
Line 428 sub end_image {
|
my $image = &Apache::lonxml::endredirection; |
my $image = &Apache::lonxml::endredirection; |
&Apache::lonxml::debug("original image is $image"); |
&Apache::lonxml::debug("original image is $image"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.image"} = $image; |
$Apache::response::conceptgroup{"$name.image"} = $image; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.image"} = $image; |
$Apache::response::foilgroup{"$name.image"} = $image; |
Line 431 sub end_image {
|
Line 437 sub end_image {
|
} elsif ($target eq 'analyze') { |
} elsif ($target eq 'analyze') { |
my $image = &Apache::lonxml::endredirection; |
my $image = &Apache::lonxml::endredirection; |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
$Apache::response::conceptgroup{"$name.image"} = $image; |
$Apache::response::conceptgroup{"$name.image"} = $image; |
} else { |
} else { |
$Apache::response::foilgroup{"$name.image"} = $image; |
$Apache::response::foilgroup{"$name.image"} = $image; |
Line 498 sub end_image {
|
Line 505 sub end_image {
|
} elsif ($width ne '') { |
} elsif ($width ne '') { |
$width_param = $width*$scaling; |
$width_param = $width*$scaling; |
} |
} |
|
$width_param=&Apache::randomlabel::adjust_textwidth($width_param); |
#where can we find the picture? |
#where can we find the picture? |
if (-e $newsrc) { |
if (-e $newsrc) { |
if ($path) { |
if ($path) { |
Line 550 sub end_rectangle {
|
Line 558 sub end_rectangle {
|
$target eq 'analyze') { |
$target eq 'analyze') { |
my $name = $Apache::imageresponse::curname; |
my $name = $Apache::imageresponse::curname; |
my $area = &Apache::lonxml::endredirection; |
my $area = &Apache::lonxml::endredirection; |
|
$area=~s/\s//g; |
&Apache::lonxml::debug("out is $area for $name"); |
&Apache::lonxml::debug("out is $area for $name"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; |
push @{ $Apache::response::conceptgroup{"$name.area"} },"rectangle:$area"; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; |
push @{ $Apache::response::foilgroup{"$name.area"} },"rectangle:$area"; |
Line 632 sub end_polygon {
|
Line 642 sub end_polygon {
|
$area=~s/\s*//g; |
$area=~s/\s*//g; |
&Apache::lonxml::debug("out is $area for $name"); |
&Apache::lonxml::debug("out is $area for $name"); |
if ( $Apache::imageresponse::conceptgroup |
if ( $Apache::imageresponse::conceptgroup |
&& !&Apache::response::showallfoils()) { |
#&& !&Apache::response::showallfoils() |
|
) { |
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area"; |
push @{ $Apache::response::conceptgroup{"$name.area"} },"polygon:$area"; |
} else { |
} else { |
push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area"; |
push @{ $Apache::response::foilgroup{"$name.area"} },"polygon:$area"; |