L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-79215 lib/graphlib: Typecasting round() function to INT.

Browse Source
This commit is contained in:
KarlReyesCatalyst
2024-08-22 10:28:25 -04:00
committed by KarlReyesCatalyst
parent 869921831d
commit 37bca6ce6b
2 changed files with 75 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/graphlib.php
+23 -17
View File
@@ -537,7 +537,10 @@ class graph {
$colour = $this->parameter['zero_axis'];
if ($colour == 'none') return;
// draw zero axis on left hand side
$this->calculated['zero_axis'] = round($this->calculated['boundary_box']['top'] + ($this->calculated['y_axis_left']['max'] * $this->calculated['y_axis_left']['factor']));
$this->calculated['zero_axis'] = (int) round(
$this->calculated['boundary_box']['top'] +
($this->calculated['y_axis_left']['max'] * $this->calculated['y_axis_left']['factor'])
);
ImageLine($this->image, $this->calculated['boundary_box']['left'], $this->calculated['zero_axis'], $this->calculated['boundary_box']['right'], $this->calculated['zero_axis'], $this->colour[$colour]);
}
@@ -545,7 +548,10 @@ class graph {
$colour = $this->parameter['zero_axis'];
if ($colour == 'none') return;
// draw zero axis on right hand side
$this->calculated['zero_axis'] = round($this->calculated['boundary_box']['top'] + ($this->calculated['y_axis_right']['max'] * $this->calculated['y_axis_right']['factor']));
$this->calculated['zero_axis'] = (int) round(
$this->calculated['boundary_box']['top'] +
($this->calculated['y_axis_right']['max'] * $this->calculated['y_axis_right']['factor'])
);
ImageLine($this->image, $this->calculated['boundary_box']['left'], $this->calculated['zero_axis'], $this->calculated['boundary_box']['right'], $this->calculated['zero_axis'], $this->colour[$colour]);
}
@@ -691,10 +697,10 @@ class graph {
if (!$this->calculated['y_axis_left']['has_data'] && $yGrid != 'none') { // draw grid if not drawn already (above)
switch ($yGrid) {
case 'line':
ImageLine($this->image, round($gridLeft), round($tickY), round($gridRight), round($tickY), $gridColour);
ImageLine($this->image, (int) round($gridLeft), (int) round($tickY), (int) round($gridRight), (int) round($tickY), $gridColour);
break;
case 'dash':
$this->image_dashed_line($this->image, round($gridLeft), round($tickY), round($gridRight), round($tickY), $gridColour); // Moodle
$this->image_dashed_line($this->image, (int) round($gridLeft), (int) round($tickY), (int) round($gridRight), (int) round($tickY), $gridColour); // Moodle
break;
}
}
@@ -702,7 +708,7 @@ class graph {
if ($this->parameter['y_axis_text_right'] && !($set % $this->parameter['y_axis_text_right'])) { // test if tick should be displayed
// draw tick
if ($tickColour != 'none')
ImageLine($this->image, round($tickLeft), round($tickY), round($tickRight), round($tickY), $tickColour);
ImageLine($this->image, (int) round($tickLeft), (int) round($tickY), (int) round($tickRight), (int) round($tickY), $tickColour);
// draw axis text...
$coords = array('x' => $textLeft, 'y' => $tickY, 'reference' => $reference);
@@ -767,12 +773,12 @@ class graph {
if (isset($this->y_format[$set]['y_axis']) && $this->y_format[$set]['y_axis'] == 'right') {
$this->calculated['y_plot'][$set][$index] =
round(($this->y_data[$set][$index] - $this->calculated['y_axis_right']['min'])
(int) round(($this->y_data[$set][$index] - $this->calculated['y_axis_right']['min'])
* $this->calculated['y_axis_right']['factor']);
} else {
//print "$set $index<br />";
$this->calculated['y_plot'][$set][$index] =
round(($this->y_data[$set][$index] - $this->calculated['y_axis_left']['min'])
(int) round(($this->y_data[$set][$index] - $this->calculated['y_axis_left']['min'])
* $this->calculated['y_axis_left']['factor']);
}
@@ -812,7 +818,7 @@ class graph {
// x tick value
$this->calculated['x_axis']['tick_x'][$set] = $tickX;
// if num ticks is auto then x plot value is same as x tick
if ($this->parameter['x_axis_gridlines'] == 'auto') $this->calculated['x_plot'][$set] = round($tickX);
if ($this->parameter['x_axis_gridlines'] == 'auto') $this->calculated['x_plot'][$set] = (int) round($tickX);
//print $this->calculated['x_plot'][$set].'<br />';
$tickX += $xStep;
}
@@ -1179,7 +1185,7 @@ class graph {
else $factor = pow(10, (floor(log10(abs($max))) - $resolution) );
}
if ($factor > 0.1) { // To avoid some wierd rounding errors (Moodle)
$factor = round($factor * 1000.0) / 1000.0; // To avoid some wierd rounding errors (Moodle)
$factor = (int) round($factor * 1000.0) / 1000.0; // To avoid some wierd rounding errors (Moodle)
} // To avoid some wierd rounding errors (Moodle)
$max = $factor * @ceil($max / $factor);
@@ -1671,7 +1677,7 @@ class graph {
// Moodle addition, plus the function parameter yoffset
if ($yoffset) { // Moodle
$yoffset = $yoffset - round(($bottom - $v) / 2.0); // Moodle
$yoffset = $yoffset - (int) round(($bottom - $v) / 2.0); // Moodle
$bottom -= $yoffset; // Moodle
$v -= $yoffset; // Moodle
} // Moodle
@@ -1779,11 +1785,11 @@ class graph {
$t += $y0;
$dx = ($dx < 0) ? -1 : 1;
$m *= $dx;
while (round($x0) != round($x1)) {
while ((int) round($x0) != (int) round($x1)) {
if (!$watchdog--) break;
$x0 += $dx; // step to next x value
$t += $m; // add slope to y value
$y = round($t);
$y = (int) round($t);
//$this->dbug("x0=$x0, x1=$x1, y=$y watchdog=$watchdog");
$this->draw_brush($x0, $y, $size, $type, $colour);
@@ -1794,11 +1800,11 @@ class graph {
$t += $x0;
$dy = ($dy < 0) ? -1 : 1;
$m *= $dy;
while (round($y0) != round($y1)) {
while ((int) round($y0) != (int) round($y1)) {
if (!$watchdog--) break;
$y0 += $dy; // step to next y value
$t += $m; // add slope to x value
$x = round($t);
$x = (int) round($t);
//$this->dbug("x=$x, y0=$y0, y1=$y1 watchdog=$watchdog");
$this->draw_brush($x, $y0, $size, $type, $colour);
@@ -1807,9 +1813,9 @@ class graph {
}
function draw_brush($x, $y, $size, $type, $colour) {
$x = round($x);
$y = round($y);
$half = round($size / 2);
$x = (int) round($x);
$y = (int) round($y);
$half = (int) round($size / 2);
switch ($type) {
case 'circle':
ImageArc($this->image, $x, $y, $size, $size, 0, 360, $this->colour[$colour]);