Merge pull request #1322 from drgrice1/plots-fixes

Fix some issues with plots.pl and the graph tool.

Author: pstaabp

htdocs/js/GraphTool/graphtool.js

@@ -69,7 +69,6 @@ window.graphTool = (containerId, options) => {
 	if ('htmlInputId' in options) gt.html_input = document.getElementById(options.htmlInputId);
 	const cfgOptions = {
 		title: 'WeBWorK Graph Tool',
-		description: options.ariaDescription ?? 'Interactively graph objects',
 		showCopyright: false,
 		pan: { enabled: false },
 		zoom: { enabled: false },
@@ -116,6 +115,14 @@ window.graphTool = (containerId, options) => {
 
 	const setupBoard = () => {
 		gt.board = JXG.JSXGraph.initBoard(`${containerId}_graph`, cfgOptions);
+
+		const descriptionSpan = document.createElement('span');
+		descriptionSpan.id = `${containerId}_description`;
+		descriptionSpan.classList.add('visually-hidden');
+		descriptionSpan.textContent = options.ariaDescription ?? 'Interactively graph objects';
+		gt.board.containerObj.after(descriptionSpan);
+		gt.board.containerObj.setAttribute('aria-describedby', descriptionSpan.id);
+
 		gt.board.suspendUpdate();
 
 		// Move the axes defining points to the end so that the arrows go to the board edges.

lib/Plots/GD.pm

@@ -63,7 +63,8 @@ sub im_y {
 	return unless defined($y);
 	my $plots = $self->plots;
 	my ($ymin, $ymax) = ($plots->axes->yaxis('min'), $plots->axes->yaxis('max'));
-	return int(($ymax - $y) * $plots->{height} / ($ymax - $ymin));
+	(undef, my $height) = $plots->size;
+	return int(($ymax - $y) * $height / ($ymax - $ymin));
 }
 
 sub moveTo {
@@ -217,12 +218,11 @@ sub draw_circle_stamp {
 }
 
 sub draw {
-	my $self   = shift;
-	my $plots  = $self->plots;
-	my $axes   = $plots->axes;
-	my $grid   = $axes->grid;
-	my $width  = $plots->{width};
-	my $height = $plots->{height};
+	my $self  = shift;
+	my $plots = $self->plots;
+	my $axes  = $plots->axes;
+	my $grid  = $axes->grid;
+	my ($width, $height) = $plots->size;
 
 	# Initialize image
 	$self->im->interlaced('true');

lib/Plots/JSXGraph.pm

@@ -404,7 +404,6 @@ sub init_graph {
 
 	my $JSXOptions = Mojo::JSON::encode_json({
 		title          => $axes->style('aria_label'),
-		description    => $axes->style('aria_description'),
 		boundingBox    => [ $xmin, $ymax, $xmax, $ymin ],
 		axis           => 0,
 		showNavigation => $allow_navigation,
@@ -497,6 +496,12 @@ sub init_graph {
 	$self->{JSend} = '';
 	$self->{JS}    = <<~ "END_JS";
 			const board = JXG.JSXGraph.initBoard(id, $JSXOptions);
+			const descriptionSpan = document.createElement('span');
+			descriptionSpan.id = `\${id}_description`;
+			descriptionSpan.classList.add('visually-hidden');
+			descriptionSpan.textContent = '${\($axes->style('aria_description'))}';
+			board.containerObj.after(descriptionSpan);
+			board.containerObj.setAttribute('aria-describedby', descriptionSpan.id);
 			board.suspendUpdate();
 			board.create('axis', [[$xmin, $xaxis_pos], [$xmax, $xaxis_pos]], $XAxisOptions);
 			board.create('axis', [[$yaxis_pos, $ymin], [$yaxis_pos, $ymax]], $YAxisOptions);

lib/Plots/Tikz.pm

@@ -221,7 +221,7 @@ sub get_plot_opts {
 	}
 	my $end_markers = ($start || $end) ? ", $start-$end" : '';
 	$marks = $self->get_mark($marks);
-	$marks = $marks ? $mark_size ? ", mark=$marks, mark size=${mark_size}px" : ", mark=$marks" : '';
+	$marks = $marks ? $mark_size ? ", mark=$marks, mark size=${mark_size}pt" : ", mark=$marks" : '';
 
 	$linestyle =~ s/ /_/g;
 	$linestyle = {

macros/core/PGbasicmacros.pl

@@ -2928,9 +2928,9 @@ sub image {
 			$image_item->{width}    = $width    if $out_options{width};
 			$image_item->{height}   = $height   if $out_options{height};
 			$image_item->{tex_size} = $tex_size if $out_options{tex_size};
-			$image_item->axes->style(aria_description => shift @alt_list) if $out_options{alt};
 
 			if ($image_item->ext eq 'html') {
+				$image_item->axes->style(aria_description => shift @alt_list) if $out_options{alt};
 				$image_item->{description_details} = $description_details;
 				push(@output_list, $image_item->draw);
 				next;