Changeset 346 for trunk/client/modules/Elezioni/grafici

Timestamp:

Mar 30, 2021, 11:16:34 PM (4 years ago)

Author:

roby

Message:

ulteriori modifiche per adeguamento a php7
Client: aggiornamento jpgraph

Location:

trunk/client/modules/Elezioni/grafici

Files:

• gd_image.inc.php (modified) (3 diffs)
• jpgraph.php (modified) (3 diffs)
• jpgraph_bar.php (modified) (2 diffs)
• jpgraph_date.php (modified) (1 diff)
• jpgraph_errhandler.inc.php (modified) (2 diffs)
• jpgraph_pie.php (modified) (1 diff)
• votanti_graf.php (modified) (2 diffs)
• voti_graf.php (modified) (3 diffs)

trunk/client/modules/Elezioni/grafici/gd_image.inc.php

@@ -109 +109 @@
         }
         else {
-        //    JpGraphError::RaiseL(25128);//('The function imageantialias() is not available in your PHP installation. Use the GD version that comes with PHP and not the standalone version.')
+            JpGraphError::RaiseL(25128);//('The function imageantialias() is not available in your PHP installation. Use the GD version that comes with PHP and not the standalone version.')
         }
     }
@@ -221 +221 @@
     }
 
-    static function GetWidth($aImg=null) {
-        if( $aImg === null ) {
-            $aImg = $this->img;
-        }
+    static function GetWidth($aImg) {
         return imagesx($aImg);
     }
 
-    static function GetHeight($aImg=null) {
-        if( $aImg === null ) {
-            $aImg = $this->img;
-        }
+    static function GetHeight($aImg) {
         return imagesy($aImg);
     }
@@ -2271 +2265 @@
     function GetAndStream($aImage,$aCacheFileName) {
         if( $this->Isvalid($aCacheFileName) ) {
-            $this->StreamImgFile($aImage,$aCacheFileName);
+            return $this->StreamImgFile($aImage,$aCacheFileName);
         }
         else {

trunk/client/modules/Elezioni/grafici/jpgraph.php

@@ -20 +20 @@
 
 // Version info
-define('JPG_VERSION','4.2.6');
+define('JPG_VERSION','4.3.4');
 
 // Minimum required PHP version
@@ -3643 +3643 @@
             // to many gridlines
             $i=0;
-            $x=$aTicksPos[$i];
             while( $i<count($aTicksPos) && ($x=$aTicksPos[$i]) <= $limit ) {
                 if    ( $aType == 'solid' )      $this->img->Line($x,$yl,$x,$yu);
@@ -5571 +5570 @@
     function Clear() {
         $this->isRunningClear = true;
-        $this->__construct($this->inputValues['aDatay'], $this->inputValues['aDatax']);
+        Plot::__construct($this->inputValues['aDatay'], $this->inputValues['aDatax']);
         $this->isRunningClear = false;
     }

trunk/client/modules/Elezioni/grafici/jpgraph_bar.php

@@ -310 +310 @@
     }
 
+
+    /**
+     * @override
+     * Without overriding this method, $this->numpoints does not updated correctly.
+     */
+    function Clear() {
+        $this->isRunningClear = true;
+        $this->__construct($this->inputValues['aDatay'], $this->inputValues['aDatax']);
+        $this->isRunningClear = false;
+    }
+
     function Stroke($img,$xscale,$yscale) {
 
@@ -717 +728 @@
         for($i=0; $i < $n; ++$i) {
             list($xm,$ym) = $this->plots[$i]->Min();
-            $xmin = max($xmin,$xm);
+            $xmin = min($xmin,$xm);
             $ymin = min($ymin,$ym);
         }

trunk/client/modules/Elezioni/grafici/jpgraph_date.php

@@ -407 +407 @@
         if( $aStartTime == $aEndTime ) {
             // Special case when we only have one data point.
-            // Create a small artifical intervall to do the autoscaling
+            // Create a small artificial interval to do the autoscaling
             $aStartTime -= 10;
             $aEndTime += 10;
+        }
+        if( abs($aEndTime - $aStartTime) <= 1 ) {
+            // Special case when we only have one second.
+            // Create a small artificial interval to do the autoscaling
+            $aStartTime -= 1;
+            $aEndTime += 1;
         }
         $done=false;

trunk/client/modules/Elezioni/grafici/jpgraph_errhandler.inc.php

@@ -17 +17 @@
 if( !defined('USE_IMAGE_ERROR_HANDLER') ) {
     define('USE_IMAGE_ERROR_HANDLER',true);
+}
+
+if( !defined('IMG_PNG') ) {
+    define('IMG_PNG',true);
 }
 
@@ -156 +160 @@
         $errobj->Raise($this->getMessage());
     }
-    static public function defaultHandler(Exception $exception) {
+    static public function defaultHandler(Throwable $exception) {
         global $__jpg_OldHandler;
         if( $exception instanceof JpGraphException ) {

trunk/client/modules/Elezioni/grafici/jpgraph_pie.php

@@ -335 +335 @@
 
             if( $this->setslicecolors==null ) {
-                $graph->legend->Add($l,$colors[$ta[$i%$numcolors]],"",0,$this->csimtargets[$i],$alt,$wintarg);
+                $csimtarget = isset($this->csimtargets[$i]) ? $this->csimtargets[$i] : null;
+                $graph->legend->Add($l,$colors[$ta[$i%$numcolors]],"",0,$csimtarget,$alt,$wintarg);
             }
             else {
-                $graph->legend->Add($l,$this->setslicecolors[$i%$numcolors],"",0,$this->csimtargets[$i],$alt,$wintarg);
+                $csimtarget = isset($this->csimtargets[$i]) ? $this->csimtargets[$i] : null;
+                $graph->legend->Add($l,$this->setslicecolors[$i%$numcolors],"",0,$csimtarget,$alt,$wintarg);
             }
         }

trunk/client/modules/Elezioni/grafici/votanti_graf.php

@@ -9 +9 @@
 include ("jpgraph.php");
 include ("jpgraph_pie.php");
-
+require_once ('jpgraph_pie3d.php');
 $e=$_GET['e'];$f=$_GET['f'];$e1=$_GET['e1'];$f1=$_GET['f1'];
 $titolo=$_GET['titolo'];
 if (isset($_GET['cop'])) $cop=$_GET['cop'];else $cop='';
-if (isset($_GET['x'])) $dim_x=$_GET['x']; else $dim_x='350';
-if (isset($_GET['y'])) $dim_y=$_GET['y']; else $dim_y='200';
+if (isset($_GET['x'])) $dim_x=$_GET['x']; else $dim_x='450';
+if (isset($_GET['y'])) $dim_y=$_GET['y']; else $dim_y='300';
 if (isset($_GET['logo'])) $logo=$_GET['logo'];else $logo='';
 $data = array($e,$f);
@@ -20 +20 @@
 $graph = new PieGraph($dim_x,$dim_y,"auto");
 $graph->SetShadow();
-
+$theme_class= new VividTheme;
+$graph->SetTheme($theme_class);
 $graph->title->Set($titolo);
 $graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph ->legend->Pos( 0.55,0.75,"left" ,"center");
-
+$graph->legend->Pos( 0,0.41,"left" ,"center");
+$graph->legend->SetColumns(1);
 $graph->SetBackgroundImage("../images/$logo",BGIMG_COPY);
 
 $graph->SetBackgroundGradient('red','yellow',GRAD_HOR,BGRAD_MARGIN);
 
-$p1 = new PiePlot($data);
+$p1 = new PiePlot3D($data);
 $p1->value->SetFormat('');
 $p1->value->Show();
 $p1->SetLegends($legend);
-$p1->SetCenter(0.45,0.5);
+$p1->SetCenter(0.65,0.35);
 
 $graph->Add($p1);
+$p1->ExplodeSlice(1);
 $graph->Stroke();
 

trunk/client/modules/Elezioni/grafici/voti_graf.php

@@ -9 +9 @@
 include ("jpgraph.php");
 include ("jpgraph_pie.php");
-
+require_once ('jpgraph_pie3d.php');
 $a=$_GET['a'];$b=$_GET['b'];$c=$_GET['c'];$d=$_GET['d'];
 $a1=$_GET['a1'];$b1=$_GET['b1'];$c1=$_GET['c1'];$d1=$_GET['d1'];
@@ -17 +17 @@
 $data = array($a,$b,$c,$d);
 $legend = array("$a $a1","$b $b1", "$c $c1", "$d $d1");
-$graph = new PieGraph(350,250,"auto");
+$graph = new PieGraph(450,300,"auto");
 $graph->SetShadow();
-
-
-
+$theme_class= new VividTheme;
+$graph->SetTheme($theme_class);
 $graph->title->Set($titolo);
 $graph->title->SetFont(FF_FONT1,FS_BOLD);
-$graph ->legend->Pos( 0.52,0.70,"left" ,"center");
+$graph->legend->Pos( 0.0,0.41,"left" ,"center");
+$graph->legend->SetColumns(1);
 $graph->SetBackgroundGradient('white','yellow',GRAD_HOR,BGRAD_MARGIN);
 
@@ -34 +34 @@
 //$graph->AdjBackgroundImage(0.4,0.3,-1);
 
-$p1 = new PiePlot($data);
+$p1 = new PiePlot3D($data);
 $p1->value->SetFormat('');
 $p1->value->Show();
 $p1->SetLegends($legend);
-$p1->SetCenter(0.25,0.65);
+$p1->SetCenter(0.65,0.35);
 $graph->Add($p1);
+$p1->ExplodeSlice(1);
 $graph->Stroke();
-
-
-
-
-
-
-$graph->Add($p1);
-$graph->Stroke();
-
-
-
-
 
 ?>