--- loncom/homework/imagechoice.pm 2005/04/07 06:56:21 1.8
+++ loncom/homework/imagechoice.pm 2008/03/12 02:46:53 1.14
@@ -1,4 +1,4 @@
-# $Id: imagechoice.pm,v 1.8 2005/04/07 06:56:21 albertel Exp $
+# $Id: imagechoice.pm,v 1.14 2008/03/12 02:46:53 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -26,6 +26,8 @@ package Apache::imagechoice;
use strict;
use Apache::Constants qw(:common :http);
use Apache::lonnet;
+use LONCAPA;
+
sub deletedata {
my ($id)=@_;
@@ -33,23 +35,35 @@ sub deletedata {
}
sub closewindow {
- my ($r,$output,$filename,$needimage)=@_;
+ my ($r,$output,$filename,$needimage,$display)=@_;
if ($needimage) {
$needimage="";
}
- $r->print(<<"ENDSUBM");
-
-
-
+ENDSUBM
+
+ my $start_page =
+ &Apache::loncommon::start_page('Close Window',$js,
+ {'bgcolor' => '#FFFFFF',
+ 'only_body' => 1,
+ 'add_entries' => {
+ onload => 'submitthis();'},});
+
+ my $end_page =
+ &Apache::loncommon::end_page();
+
+ $r->print(<<"ENDSUBM");
+$start_page
Position Selected
+$display
$needimage
-
-
+$end_page
ENDSUBM
}
@@ -69,13 +83,16 @@ sub storedata {
$needimage=1;
}
+ my $display;
if ($type eq 'point') {
my (undef,$x,$y)=split(':',$env{"imagechoice.$id.coords"});
if ($env{"imagechoice.$id.formx"}) {
$output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formx"}.'.value='.$x.';';
+ $display.="
The X coordinate is $x
\n";
}
if ($env{"imagechoice.$id.formy"}) {
$output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formy"}.'.value='.$y.';';
+ $display.="
The Y coordinate is $y
\n";
}
} elsif ($type eq 'polygon' or $type eq 'box') {
my $coordstr;
@@ -83,11 +100,14 @@ sub storedata {
$coordstr.='('.shift(@coords).','.shift(@coords).')-';
}
chop($coordstr);
+ $display.="
The selected coordinates are $coordstr
\n";
$output.='opener.document.forms.'.$env{"imagechoice.$id.formname"}.'.'.$env{"imagechoice.$id.formcoord"}.'.value="'.$coordstr.'";';
}
-
+ if ($display) {
+ $display.="
If this window fails to close you may need to manually replace the old coordinates with the above value.
\n";
+ }
&deletedata($id);
- &closewindow($r,$output,$filename,$needimage);
+ &closewindow($r,$output,$filename,$needimage,$display);
}
sub getcoord {
@@ -104,19 +124,26 @@ sub getcoord {
$heading='Select Second Coordinate on Image';
#$nextstage='';
} else {
- $heading='Select Finish to store selection.';
+ $heading='Select Finish to save selection.';
$nextstage='';
}
} elsif ($type eq 'polygon') {
$heading='Enter Coordinate or click finish to close Polygon';
$nextstage='';
} elsif ($type eq 'point') {
- $heading='Click to select a Coordinate or click Finish to store current selection.';
+ $heading='Click to select a Coordinate or click Finish to save current selection.';
$nextstage='';
}
+
+ my $start_page =
+ &Apache::loncommon::start_page('Get Coordinates',undef,
+ {'bgcolor' => '#FFFFFF',
+ 'only_body' => 1,});
+
+ my $end_page =
+ &Apache::loncommon::end_page();
$r->print(<<"END");
-
-
+$start_page
$heading
-
-
+$end_page
END
}
@@ -139,7 +165,7 @@ sub savecoord {
$data=join(':',($env{"imagechoice.$id.coords"},
$env{"form.image.x"},$env{"form.image.y"}));
}
- &Apache::lonnet::appenv("imagechoice.$id.coords"=>$data);
+ &Apache::lonnet::appenv({"imagechoice.$id.coords"=>$data});
}
return int(scalar(split(':',$env{"imagechoice.$id.coords"}))/2);
}
@@ -211,7 +237,7 @@ sub drawimage {
&drawX(\%data,$imid,$x,$y);
if ($type eq "polygon") { &drawPolygon(\%data,$id,$imid); }
if ($type eq "box") { &drawBox(\%data,$id,$imid); }
- &Apache::lonnet::appenv(%data);
+ &Apache::lonnet::appenv(\%data);
return "/adm/randomlabel.png?token=$imid"
}
@@ -221,7 +247,7 @@ sub handler {
$r->send_http_header;
my %data;
my (undef,$id) = split(/=/,$ENV{'QUERY_STRING'});
- my $filename = &Apache::lonnet::unescape($env{"imagechoice.$id.file"});
+ my $filename = &unescape($env{"imagechoice.$id.file"});
my $formname = $env{"imagechoice.$id.formname"};
if ($env{'form.cancel'} eq 'Cancel') {
&deletedata($id);