Merge pull request #1245 from somiaj/plots-improvements

Plots Improvements - A continuation of #966

Author: pstaabp

htdocs/js/ImageView/imageview.js

@@ -162,7 +162,11 @@
 			let width = naturalWidth;
 			let height = naturalHeight;
 
-			if (imgType == 'div') this.dispatchEvent(new Event('shown.imageview'));
+			if (graphDiv) {
+				graphDiv.style.width = `${naturalWidth}px`;
+				graphDiv.style.height = `${naturalHeight}px`;
+				this.dispatchEvent(new Event('shown.imageview'));
+			}
 
 			// Dialog position
 			let left;

lib/Plots/Axes.pm

@@ -31,7 +31,7 @@ Each axis and styles can be configured individually, such as:
 
     $plot->axes->xaxis(min => -10, max => 10,  tick_delta => 4);
     $plot->axes->yaxis(min => 0,   max => 100, tick_delta => 20);
-    $plot->axes->style(title => 'Graph of function y = f(x).', show_grid => 0);
+    $plot->axes->style(ariaLabel => 'Graph of function y = f(x).', show_grid => 0);
 
 This can be combined using the set method by prepending either C<x> or C<y> in front
 of each key of the axes to configure (note keys that do not start with C<x> or C<y>
@@ -44,7 +44,7 @@ sent to C<< $plot->axes->style >>):
         ymin        => 0,
         ymax        => 100,
         ytick_delta => 20,
-        title       => 'Graph of function y = f(x).',
+        ariaLabel   => 'Graph of function y = f(x).',
         show_grid   => 0,
     );
 
@@ -151,9 +151,20 @@ The following styles configure aspects about the axes.
 
 =over 5
 
-=item title
+=item aspect_ratio
 
-The title of the graph used as the ARIA label in JSX graph output. Default is ''.
+If this style is set, then the height of the graph will be computed using
+this aspect_ratio for the size of the image unless explicitly set.
+Default: ''
+
+=item ariaLabel
+
+The ARIA label in JSX graph output. Default is 'Graph'.
+
+=item ariaDescription
+
+The ARIA description in JSX graph output. This will be set to the images alt tag.
+Default is 'Generated graph'.
 
 =item show_grid
 
@@ -163,19 +174,14 @@ Either draw (1) or don't draw (0) the grid lines for the axis. Default is 1.
 
 The color of the grid lines. Default is 'gray'.
 
-=item grid_style
-
-The line style of grid lines. This can be 'dashed', 'dotted', 'solid', etc.
-Default is 'solid'.
-
 =item grid_alpha
 
 The alpha value to use to draw the grid lines in Tikz. This is a number from
 0 (fully transparent) to 100 (fully solid). Default is 40.
 
 =item axis_on_top
 
-Configures if the axis should be drawn on top of the graph (1) or below the graph (0).
+Configures if the Tikz axis should be drawn on top of the graph (1) or below the graph (0).
 Useful when filling a region that covers an axis, if the axis are on top they will still
 be visible after the fill, otherwise the fill will cover the axis. Default: 0
 
@@ -205,11 +211,11 @@ sub new {
 		xaxis  => {},
 		yaxis  => {},
 		styles => {
-			title      => '',
-			grid_color => 'gray',
-			grid_style => 'solid',
-			grid_alpha => 40,
-			show_grid  => 1,
+			ariaLabel       => 'Graph',
+			ariaDescription => 'Generated graph',
+			grid_color      => 'gray',
+			grid_alpha      => 40,
+			show_grid       => 1,
 		},
 		@_
 	}, $class;

lib/Plots/Data.pm

@@ -110,15 +110,17 @@ to add / change the styles.
 
     $data->style(color => 'blue', width => 3);
 
-=item C<< $str = $data->function_string($coord, $type, $nvars); >>
+=item C<< $str = $data->function_string($formula, $type, $xvar, $yvar); >>
 
-Takes a MathObject function string and replaces the function with either
+Takes a MathObject C<$formula> and replaces the function with either
 a JavaScript or PGF function string. If the function contains any function
 tokens not supported, a warning and empty string is returned.
 
-    $coord   'x' or 'y' coordinate function.
-    $type    'js' or 'PGF' (falls back to js for any input except 'PGF').
-    $nvars   1 (single variable functions) or 2 (used for slope/vector fields).
+    $formula   The mathobject formula object, either $self->{function}{Fx} or $self->{function}{Fy}.
+    $type      'js' or 'PGF' (falls back to js for any input except 'PGF').
+    $xvar      The x-variable name, $self->{function}{xvar}.
+    $yvar      The y-variable name, $self->{function}{yvar}, for vector fields.
+               Leave undefined for single variable functions.
 
 =item C<< $data->update_min_max >>
 
@@ -185,7 +187,7 @@ sub style {
 		map { $self->{styles}{$_} = $style_hash{$_} } keys %style_hash;
 		return;
 	}
-	return $self->{styles}{ $styles[0] };
+	return $self->{styles}{ $styles[0] } // '';
 }
 
 sub get_math_object {
@@ -249,22 +251,22 @@ sub update_min_max {
 }
 
 sub function_string {
-	my ($self, $coord, $type, $nvars) = @_;
-	my $f  = $self->{function};
-	my $MO = $coord eq 'y' ? $f->{Fy} : $f->{Fx};
-	return '' if ref($MO) eq 'CODE';
+	my ($self, $formula, $type, $xvar, $yvar, $xtransform) = @_;
+	return '' unless Value::isFormula($formula);
+	my %vars = ($xvar => $xtransform || 'x', $yvar ? ($yvar => 'y') : ());
 
 	# Ensure -x^2 gets print as -(x^2), since JavaScript finds this ambiguous.
-	my $extraParens = $MO->context->flag('showExtraParens');
-	$MO->context->flags->set(showExtraParens => 2);
-	my $func = $MO->string;
+	my $extraParens = $formula->context->flag('showExtraParens');
+	my $format      = $formula->context->{format}{number};
+	$formula->context->flags->set(showExtraParens => 2);
+	$formula->context->{format}{number} = "%f#";
+	my $func = $formula->string;
 	$func =~ s/\s//g;
-	$MO->context->flags->set(showExtraParens => $extraParens);
+	$formula->context->flags->set(showExtraParens => $extraParens);
+	$formula->context->{format}{number} = $format;
 
-	$nvars = 1 unless $nvars;
 	my %tokens;
 	if ($type eq 'PGF') {
-		my %vars = ($nvars == 2 ? ($f->{xvar} => 'x', $f->{yvar} => 'y') : ($f->{xvar} => 'x'));
 		%tokens = (
 			sqrt   => 'sqrt',
 			pow    => 'pow',
@@ -302,7 +304,6 @@ sub function_string {
 			%vars
 		);
 	} else {
-		my %vars = ($nvars == 2 ? ($f->{xvar} => 'x', $f->{yvar} => 'y') : ($f->{xvar} => 't'));
 		%tokens = (
 			sqrt    => 'Math.sqrt',
 			cbrt    => 'Math.cbrt',
@@ -367,6 +368,8 @@ sub function_string {
 		}
 	}
 
+	$out =~ s/\[/(/g;
+	$out =~ s/\]/)/g;
 	return $out;
 }