WebSVN – Moodle – Diff – /lib/graphlib.php

     function draw_zero_axis_left() {
       $colour = $this->parameter['zero_axis'];
       if ($colour == 'none') return;
+      // draw zero axis on left hand side
+      $this->calculated['zero_axis'] = (int) round(
-      // draw zero axis on left hand side
+        $this->calculated['boundary_box']['top'] +
+        ($this->calculated['y_axis_left']['max'] * $this->calculated['y_axis_left']['factor'])
-      $this->calculated['zero_axis'] = 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]);
+    }
     function draw_zero_axis_right() {
       $colour = $this->parameter['zero_axis'];
+      if ($colour == 'none') return;
+      // draw zero axis on right hand side
-      if ($colour == 'none') return;
+      $this->calculated['zero_axis'] = (int) round(
+        $this->calculated['boundary_box']['top'] +
-      // draw zero axis on right hand side
+        ($this->calculated['y_axis_right']['max'] * $this->calculated['y_axis_right']['factor'])
-      $this->calculated['zero_axis'] = 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]);
+    }
         foreach ($this->calculated['y_axis']['tick_y'] as $set => $tickY) {
           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;
+            }
+          }
           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...
           if ((string)$this->y_data[$set][$index] != 'none') {
             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']);
+            }
       foreach ($this->calculated['x_axis']['text'] as $set => $value) {
         //print "index: $set<br />";
         // 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;
+      }
       } else {
         if ($max < 0) $factor = - pow(10, (floor(log10(abs($max))) + $resolution) );
         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);
           break;
         case 'circle-open':
           ImageArc($this->image, $u, $v, $size, $size, 0, 360, $this->colour[$colour]);
           break;
         case 'diamond':
-          if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
-            ImageFilledPolygon($this->image, array($u, $v - $half, $u + $half, $v, $u, $v + $half, $u - $half, $v), $this->colour[$colour]);
+          ImageFilledPolygon($this->image, [$u, $v - $half, $u + $half, $v, $u, $v + $half, $u - $half, $v], $this->colour[$colour]);
-          } else {
-            ImageFilledPolygon($this->image, array($u, $v - $half, $u + $half, $v, $u, $v + $half, $u - $half, $v), 4, $this->colour[$colour]);
-          }
           break;
         case 'diamond-open':
-          if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
-            ImagePolygon($this->image, array($u, $v - $half, $u + $half, $v, $u, $v + $half, $u - $half, $v), $this->colour[$colour]);
+          ImagePolygon($this->image, [$u, $v - $half, $u + $half, $v, $u, $v + $half, $u - $half, $v], $this->colour[$colour]);
-          } else {
-            ImagePolygon($this->image, array($u, $v - $half, $u + $half, $v, $u, $v + $half, $u - $half, $v), 4, $this->colour[$colour]);
-          }
           break;
         case 'triangle':
-          if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
-            ImageFilledPolygon($this->image, array($u, $v - $half, $u + $half, $v + $half, $u - $half, $v + $half), $this->colour[$colour]);
+          ImageFilledPolygon($this->image, [$u, $v - $half, $u + $half, $v + $half, $u - $half, $v + $half], $this->colour[$colour]);
-          } else {
-            ImageFilledPolygon($this->image, array($u, $v - $half, $u + $half, $v + $half, $u - $half, $v + $half), 3, $this->colour[$colour]);
-          }
           break;
         case 'triangle-open':
-          if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
-            ImagePolygon($this->image, array($u, $v - $half, $u + $half, $v + $half, $u - $half, $v + $half), $this->colour[$colour]);
+          ImagePolygon($this->image, [$u, $v - $half, $u + $half, $v + $half, $u - $half, $v + $half], $this->colour[$colour]);
-          } else {
-            ImagePolygon($this->image, array($u, $v - $half, $u + $half, $v + $half, $u - $half, $v + $half), 3, $this->colour[$colour]);
-          }
           break;
         case 'dot':
           ImageSetPixel($this->image, $u, $v, $this->colour[$colour]);
           break;
+      }
         $u_right = (int) round($x_right + $offset - 1);
         $v       = $this->calculated['boundary_box']['bottom'] - $y + $offset;
         // 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
         $v_start = $bottom - $y_start + $offset;
         $v_end   = $bottom - $y_end + $offset;
         switch ($type) {
           case 'fill':
             // draw it this way 'cos the FilledPolygon routine seems a bit buggy.
-            if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
-              ImageFilledPolygon($this->image, array($u_start, $v_start, $u_end, $v_end, $u_end, $zero, $u_start, $zero), $this->colour[$colour]);
+            ImageFilledPolygon($this->image, [$u_start, $v_start, $u_end, $v_end, $u_end, $zero, $u_start, $zero], $this->colour[$colour]);
-              ImagePolygon($this->image, array($u_start, $v_start, $u_end, $v_end, $u_end, $zero, $u_start, $zero), $this->colour[$colour]);
+            ImagePolygon($this->image, [$u_start, $v_start, $u_end, $v_end, $u_end, $zero, $u_start, $zero], $this->colour[$colour]);
-            } else {
-              ImageFilledPolygon($this->image, array($u_start, $v_start, $u_end, $v_end, $u_end, $zero, $u_start, $zero), 4, $this->colour[$colour]);
-              ImagePolygon($this->image, array($u_start, $v_start, $u_end, $v_end, $u_end, $zero, $u_start, $zero), 4, $this->colour[$colour]);
-            }
             break;
           case 'open':
             ImageLine($this->image, $u_start, $v_start, $u_end, $v_end, $this->colour[$colour]);
             ImageLine($this->image, $u_start, $v_start, $u_start, $zero, $this->colour[$colour]);
             ImageLine($this->image, $u_end, $v_end, $u_end, $zero, $this->colour[$colour]);
         if ($this->parameter['shadow_below_axis'] ) $bottom  += $offset;
         if ($this->parameter['inner_border'] != 'none') $bottom -= 1; // 1 pixel above bottom if border is to be drawn.
         switch ($type) {
-          case 'fill':
-          if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
+          case 'fill':
-              ImageFilledPolygon($this->image, array($u_start, $v_start, $u_end, $v_end, $u_end, $bottom, $u_start, $bottom), $this->colour[$colour]);
-            } else {
-              ImageFilledPolygon($this->image, array($u_start, $v_start, $u_end, $v_end, $u_end, $bottom, $u_start, $bottom), 4, $this->colour[$colour]);
             ImageFilledPolygon($this->image, [$u_start, $v_start, $u_end, $v_end, $u_end, $bottom, $u_start, $bottom], $this->colour[$colour]);
            break;
-            case 'open':
-            if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
+          case 'open':
-              ImagePolygon($this->image, array($u_start, $v_start, $u_end, $v_end, $u_end, $bottom, $u_start, $bottom), $this->colour[$colour]);
-            } else {
-              ImagePolygon($this->image, array($u_start, $v_start, $u_end, $v_end, $u_end, $bottom, $u_start, $bottom), 4, $this->colour[$colour]);
             ImagePolygon($this->image, [$u_start, $v_start, $u_end, $v_end, $u_end, $bottom, $u_start, $bottom], $this->colour[$colour]);
             break;
+        }
+      }
         //$this->dbug("slope < 1");
         $m = $dy / $dx; // compute slope
         $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);
+        }
       } else { // slope >= 1
         //$this->dbug("slope >= 1");
         $m = $dx / $dy; // compute slope
         $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);
+        }
+      }
     }
     function draw_brush($x, $y, $size, $type, $colour) {
-      $x = round($x);
+      $x = (int) round($x);
-      $y = round($y);
+      $y = (int) round($y);
-      $half = round($size / 2);
+      $half = (int) round($size / 2);
       switch ($type) {
         case 'circle':
           break;
         case 'horizontal':
           ImageFilledRectangle($this->image, $x-$half, $y, $x+$half, $y+1, $this->colour[$colour]);
           break;
         case 'slash':
-          if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
-            ImageFilledPolygon($this->image, array(
+          ImageFilledPolygon(
-              $x + $half, $y - $half,
-              $x + $half + 1, $y - $half,
-              $x - $half + 1, $y + $half,
-              $x - $half, $y + $half
-            ), $this->colour[$colour]);
+            $this->image,
-          } else {
+            [
-            ImageFilledPolygon($this->image, array(
               $x + $half, $y - $half,
               $x + $half + 1, $y - $half,
               $x - $half + 1, $y + $half,
-              $x - $half, $y + $half
+              $x - $half, $y + $half,
+            ],
-            ), 4, $this->colour[$colour]);
+            $this->colour[$colour]
-          }
+          );
           break;
         case 'backslash':
-          if (version_compare(PHP_VERSION, '8.0.0', '>=')) {
+          ImageFilledPolygon(
-            ImageFilledPolygon($this->image, array(
+            $this->image,
+            [
               $x - $half, $y - $half,
               $x - $half + 1, $y - $half,
               $x + $half + 1, $y + $half,
-              $x + $half, $y + $half
+              $x + $half, $y + $half,
-            ), $this->colour[$colour]);
-          } else {
+            ],
-            ImageFilledPolygon($this->image, array(
-              $x - $half, $y-$half,
-              $x - $half + 1, $y - $half,
-              $x + $half + 1, $y + $half,
-              $x + $half, $y + $half
-            ), 4, $this->colour[$colour]);
+            $this->colour[$colour]
-          }
+          );
           break;
         default:
           @eval($type); // user can create own brush script.
+      }
+    }

Proyectos de Subversion Moodle

(root)/lib/graphlib.php – Rev 1 → 1441