BOINC / boinc

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pSpring.class.php

Braces +112 added lines, -223 removed lines

@@ -29,8 +29,7 @@ 
  define("LABEL_LIGHT"		, 690032);
 
  /* pSpring class definition */
- class pSpring
-  {
+ class pSpring {
    var $History;
    var $pChartObject;
    var $Data;
@@ -43,8 +42,7 @@ 
    var $Labels;
 
    /* Class creator */
-   function pSpring()
-    {
+   function pSpring() {
      /* Initialise data arrays */
      $this->Data = "";
      $this->Links = "";
@@ -83,8 +81,7 @@ 
     }
 
    /* Set default links options */
-   function setLinkDefaults($Settings="")
-    {
+   function setLinkDefaults($Settings="") {
      if ( isset($Settings["R"]) )     { $this->Default["LinkR"] = $Settings["R"]; }
      if ( isset($Settings["G"]) )     { $this->Default["LinkG"] = $Settings["G"]; }
      if ( isset($Settings["B"]) )     { $this->Default["LinkB"] = $Settings["B"]; }
@@ -92,8 +89,7 @@ 
     }
 
    /* Set default links options */
-   function setLabelsSettings($Settings="")
-    {
+   function setLabelsSettings($Settings="") {
      if ( isset($Settings["Type"]) )  { $this->Labels["Type"] = $Settings["Type"]; }
      if ( isset($Settings["R"]) )     { $this->Labels["R"] = $Settings["R"]; }
      if ( isset($Settings["G"]) )     { $this->Labels["G"] = $Settings["G"]; }
@@ -102,22 +98,18 @@ 
     }
 
    /* Auto compute the FreeZone size based on the number of connections */
-   function autoFreeZone()
-    {
+   function autoFreeZone() {
      /* Check connections reciprocity */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        if ( isset($Settings["Connections"]) )
-        { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; }
-       else
+        { $this->Data[$Key]["FreeZone"] = count($Settings["Connections"])*10 + 20; } else
         { $this->Data[$Key]["FreeZone"] = 20; }
       }
 
     }
 
    /* Set link properties */
-   function linkProperties($FromNode,$ToNode,$Settings)
-    {
+   function linkProperties($FromNode,$ToNode,$Settings) {
      if ( !isset($this->Data[$FromNode]) ) { return(0); }
      if ( !isset($this->Data[$ToNode]) )   { return(0); }
 
@@ -136,8 +128,7 @@ 
      $this->Links[$FromNode][$ToNode]["Ticks"] = $Ticks; $this->Links[$ToNode][$FromNode]["Ticks"] = $Ticks;
     }
 
-   function setNodeDefaults($Settings="")
-    {
+   function setNodeDefaults($Settings="") {
      if ( isset($Settings["R"]) ) { $this->Default["R"]					= $Settings["R"]; }
      if ( isset($Settings["G"]) ) { $this->Default["G"]					= $Settings["G"]; }
      if ( isset($Settings["B"]) ) { $this->Default["B"]					= $Settings["B"]; }
@@ -158,8 +149,7 @@ 
     }
 
    /* Add a node */
-   function addNode($NodeID,$Settings="")
-    {
+   function addNode($NodeID,$Settings="") {
      /* if the node already exists, ignore */
      if (isset($this->Data[$NodeID])) { return(0); }
 
@@ -196,27 +186,21 @@ 
      $this->Data[$NodeID]["Size"]		= $Size;
      $this->Data[$NodeID]["Shape"]		= $Shape;
      $this->Data[$NodeID]["FreeZone"]		= $FreeZone;
-     if ( $Connections != NULL )
-      {
-       if ( is_array($Connections ) )
-        {
-         foreach($Connections as $Key => $Value)
-          $this->Data[$NodeID]["Connections"][] = $Value;
-        }
-       else
+     if ( $Connections != NULL ) {
+       if ( is_array($Connections ) ) {
+         foreach($Connections as $Key => $Value) {
+                   $this->Data[$NodeID]["Connections"][] = $Value;
+         }
+        } else
         $this->Data[$NodeID]["Connections"][] = $Connections;
       }
     }
 
    /* Set color attribute for a list of nodes */
-   function setNodesColor($Nodes,$Settings="")
-    {
-     if ( is_array($Nodes) )
-      {
-       foreach ($Nodes as $Key => $NodeID)
-        {
-         if (isset($this->Data[$NodeID]) )
-          {
+   function setNodesColor($Nodes,$Settings="") {
+     if ( is_array($Nodes) ) {
+       foreach ($Nodes as $Key => $NodeID) {
+         if (isset($this->Data[$NodeID]) ) {
            if ( isset($Settings["R"]) ) { $this->Data[$NodeID]["R"] = $Settings["R"]; }
            if ( isset($Settings["G"]) ) { $this->Data[$NodeID]["G"] = $Settings["G"]; }
            if ( isset($Settings["B"]) ) { $this->Data[$NodeID]["B"] = $Settings["B"]; }
@@ -228,9 +212,7 @@ 
            if ( isset($Settings["Surrounding"]) ) { $this->Data[$NodeID]["BorderR"] = $this->Data[$NodeID]["R"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderG"] = $this->Data[$NodeID]["G"] + $Settings["Surrounding"]; $this->Data[$NodeID]["BorderB"] = $this->Data[$NodeID]["B"] + $Settings["Surrounding"]; }
           }
         }
-      }
-     else
-      {
+      } else {
        if ( isset($Settings["R"]) ) { $this->Data[$Nodes]["R"] = $Settings["R"]; }
        if ( isset($Settings["G"]) ) { $this->Data[$Nodes]["G"] = $Settings["G"]; }
        if ( isset($Settings["B"]) ) { $this->Data[$Nodes]["B"] = $Settings["B"]; }
@@ -248,25 +230,19 @@ 
     { return($this->Data); }
 
    /* Check if a connection exists and create it if required */
-   function checkConnection($SourceID, $TargetID)
-    {
-     if ( isset($this->Data[$SourceID]["Connections"]) )
-      {
+   function checkConnection($SourceID, $TargetID) {
+     if ( isset($this->Data[$SourceID]["Connections"]) ) {
        foreach ($this->Data[$SourceID]["Connections"] as $Key => $ConnectionID)
         { if ( $TargetID == $ConnectionID ) { return(TRUE); } }
       }
      $this->Data[$SourceID]["Connections"][] = $TargetID;
     }
    /* Get the median linked nodes position */
-   function getMedianOffset($Key,$X,$Y)
-    {
+   function getMedianOffset($Key,$X,$Y) {
      $Cpt = 1;
-     if ( isset($this->Data[$Key]["Connections"]) )
-      {
-       foreach($this->Data[$Key]["Connections"] as $ID => $NodeID)
-        {
-         if ( isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]) )
-          {
+     if ( isset($this->Data[$Key]["Connections"]) ) {
+       foreach($this->Data[$Key]["Connections"] as $ID => $NodeID) {
+         if ( isset($this->Data[$NodeID]["X"]) && isset($this->Data[$NodeID]["Y"]) ) {
            $X = $X + $this->Data[$NodeID]["X"];
            $Y = $Y + $this->Data[$NodeID]["Y"];
            $Cpt++;
@@ -277,13 +253,11 @@ 
     }
 
    /* Return the ID of the attached partner with the biggest weight */
-   function getBiggestPartner($Key)
-    {
+   function getBiggestPartner($Key) {
      if ( !isset($this->Data[$Key]["Connections"]) ) { return(""); }
 
      $MaxWeight = 0; $Result = "";
-     foreach($this->Data[$Key]["Connections"] as $Key => $PeerID)
-      {
+     foreach($this->Data[$Key]["Connections"] as $Key => $PeerID) {
        if ( $this->Data[$PeerID]["Weight"] > $MaxWeight )
         { $MaxWeight = $this->Data[$PeerID]["Weight"]; $Result = $PeerID; }
       }
@@ -291,18 +265,16 @@ 
     }
 
    /* Do the initial node positions computing pass */
-   function firstPass($Algorithm)
-    {
+   function firstPass($Algorithm) {
      $CenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
      $CenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
 
      /* Check connections reciprocity */
-     foreach($this->Data as $Key => $Settings)
-      {
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach($Settings["Connections"] as $ID => $ConnectionID)
-          $this->checkConnection($ConnectionID,$Key);
+     foreach($this->Data as $Key => $Settings) {
+       if ( isset($Settings["Connections"]) ) {
+         foreach($Settings["Connections"] as $ID => $ConnectionID) {
+                   $this->checkConnection($ConnectionID,$Key);
+         }
         }
       }
 
@@ -313,16 +285,12 @@ 
      foreach($this->Data as $Key => $Settings)
       { if ( isset($Settings["Connections"]) ) { if ( $MaxConnections < count($Settings["Connections"] ) ) { $MaxConnections = count($Settings["Connections"]); } } }
 
-     if ( $Algorithm == ALGORITHM_WEIGHTED )
-      {
-       foreach($this->Data as $Key => $Settings)
-        {
+     if ( $Algorithm == ALGORITHM_WEIGHTED ) {
+       foreach($this->Data as $Key => $Settings) {
          if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-         if ( $Settings["Type"] == NODE_TYPE_FREE )
-          {
+         if ( $Settings["Type"] == NODE_TYPE_FREE ) {
            if ( isset($Settings["Connections"]) )
-            { $Connections = count($Settings["Connections"]); }
-           else
+            { $Connections = count($Settings["Connections"]); } else
             { $Connections = 0; }
 
            $Ring  = $MaxConnections - $Connections;
@@ -332,12 +300,9 @@ 
            $this->Data[$Key]["Y"] = sin(deg2rad($Angle)) * ($Ring*$this->RingSize) + $CenterY;
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_CENTRAL )
-      {
+      } elseif ( $Algorithm == ALGORITHM_CENTRAL ) {
        /* Put a weight on each nodes */
-       foreach($this->Data as $Key => $Settings)
-        {
+       foreach($this->Data as $Key => $Settings) {
          if ( isset($Settings["Connections"]) )
           $this->Data[$Key]["Weight"] = count($Settings["Connections"]);
          else
@@ -345,33 +310,25 @@ 
         }
 
        $MaxConnections = $MaxConnections + 1;
-       for($i=$MaxConnections;$i>=0;$i--)
-        {
-         foreach($this->Data as $Key => $Settings)
-          {
+       for($i=$MaxConnections;$i>=0;$i--) {
+         foreach($this->Data as $Key => $Settings) {
            if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-           if ( $Settings["Type"] == NODE_TYPE_FREE )
-            {
+           if ( $Settings["Type"] == NODE_TYPE_FREE ) {
              if ( isset($Settings["Connections"]) )
-              { $Connections = count($Settings["Connections"]); }
-             else
+              { $Connections = count($Settings["Connections"]); } else
               { $Connections = 0; }
 
-             if ( $Connections == $i )
-              {
+             if ( $Connections == $i ) {
                $BiggestPartner = $this->getBiggestPartner($Key);
-               if ( $BiggestPartner != "" )
-                {
+               if ( $BiggestPartner != "" ) {
                  $Ring          = $this->Data[$BiggestPartner]["FreeZone"];
                  $Weight        = $this->Data[$BiggestPartner]["Weight"];
                  $AngleDivision = 360 / $this->Data[$BiggestPartner]["Weight"];
                  $Done          = FALSE; $Tries = 0;
-                 while (!$Done && $Tries <= $Weight*2)
-                  {
+                 while (!$Done && $Tries <= $Weight*2) {
                    $Tries++;
                    $Angle = floor(rand(0,$Weight)*$AngleDivision);
-                   if ( !isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]) )
-                    {
+                   if ( !isset($this->Data[$BiggestPartner]["Angular"][$Angle]) || !isset($this->Data[$BiggestPartner]["Angular"]) ) {
                      $this->Data[$BiggestPartner]["Angular"][$Angle] = $Angle;
                      $Done = TRUE; 
                     }
@@ -389,24 +346,17 @@ 
             }
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_CIRCULAR )
-      {
+      } elseif ( $Algorithm == ALGORITHM_CIRCULAR ) {
        $MaxConnections = $MaxConnections + 1;
-       for($i=$MaxConnections;$i>=0;$i--)
-        {
-         foreach($this->Data as $Key => $Settings)
-          {
+       for($i=$MaxConnections;$i>=0;$i--) {
+         foreach($this->Data as $Key => $Settings) {
            if ( $Settings["Type"] == NODE_TYPE_CENTRAL ) { $this->Data[$Key]["X"] = $CenterX; $this->Data[$Key]["Y"] = $CenterY; }
-           if ( $Settings["Type"] == NODE_TYPE_FREE )
-            {
+           if ( $Settings["Type"] == NODE_TYPE_FREE ) {
              if ( isset($Settings["Connections"]) )
-              { $Connections = count($Settings["Connections"]); }
-             else
+              { $Connections = count($Settings["Connections"]); } else
               { $Connections = 0; }
 
-             if ( $Connections == $i )
-              {
+             if ( $Connections == $i ) {
                $Ring  = $MaxConnections - $Connections;
                $Angle = rand(0,360);
 
@@ -421,13 +371,9 @@ 
             }
           }
         }
-      }
-     elseif ( $Algorithm == ALGORITHM_RANDOM )
-      {
-       foreach($this->Data as $Key => $Settings)
-        {
-         if ( $Settings["Type"] == NODE_TYPE_FREE )
-          {
+      } elseif ( $Algorithm == ALGORITHM_RANDOM ) {
+       foreach($this->Data as $Key => $Settings) {
+         if ( $Settings["Type"] == NODE_TYPE_FREE ) {
            $this->Data[$Key]["X"] = $CenterX + rand(-20,20);
            $this->Data[$Key]["Y"] = $CenterY + rand(-20,20);
           }
@@ -437,23 +383,18 @@ 
     }
 
    /* Compute one pass */
-   function doPass()
-    {
+   function doPass() {
      /* Compute vectors */
-     foreach($this->Data as $Key => $Settings)
-      {
-       if ( $Settings["Type"] != NODE_TYPE_CENTRAL )
-        {
+     foreach($this->Data as $Key => $Settings) {
+       if ( $Settings["Type"] != NODE_TYPE_CENTRAL ) {
          unset($this->Data[$Key]["Vectors"]);
 
          $X1 = $Settings["X"];
          $Y1 = $Settings["Y"];
 
          /* Repulsion vectors */
-         foreach($this->Data as $Key2 => $Settings2)
-          {
-           if ( $Key != $Key2 )
-            {
+         foreach($this->Data as $Key2 => $Settings2) {
+           if ( $Key != $Key2 ) {
              $X2 = $this->Data[$Key2]["X"];
              $Y2 = $this->Data[$Key2]["Y"];
              $FreeZone = $this->Data[$Key2]["FreeZone"];
@@ -462,8 +403,7 @@ 
              $Angle    = $this->getAngle($X1,$Y1,$X2,$Y2) + 180;
 
              /* Nodes too close, repulsion occurs */
-             if ( $Distance < $FreeZone )
-              {
+             if ( $Distance < $FreeZone ) {
                $Force = log(pow(2,$FreeZone-$Distance));
                if ( $Force > 1 )
                 { $this->Data[$Key]["Vectors"][] = array("Type"=>"R","Angle"=>$Angle % 360,"Force"=>$Force); }
@@ -472,12 +412,9 @@ 
           }
 
          /* Attraction vectors */
-         if ( isset($Settings["Connections"]) )
-          {
-           foreach($Settings["Connections"] as $ID => $NodeID)
-            {
-             if ( isset($this->Data[$NodeID]) )
-              {
+         if ( isset($Settings["Connections"]) ) {
+           foreach($Settings["Connections"] as $ID => $NodeID) {
+             if ( isset($this->Data[$NodeID]) ) {
                $X2 = $this->Data[$NodeID]["X"];
                $Y2 = $this->Data[$NodeID]["Y"];
                $FreeZone = $this->Data[$Key2]["FreeZone"];
@@ -499,15 +436,12 @@ 
       }
 
      /* Move the nodes accoding to the vectors */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
-       if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
-        {
-         foreach($Settings["Vectors"] as $ID => $Vector)
-          {
+       if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL ) {
+         foreach($Settings["Vectors"] as $ID => $Vector) {
            $Type  = $Vector["Type"];
            $Force = $Vector["Force"];
            $Angle = $Vector["Angle"];
@@ -523,11 +457,9 @@ 
       }
     }
 
-   function lastPass()
-    {
+   function lastPass() {
      /* Put everything inside the graph area */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
@@ -542,17 +474,13 @@ 
 
      /* Dump all links */
      $Links = "";
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X1 = $Settings["X"];
        $Y1 = $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
-           if ( isset($this->Data[$NodeID]) )
-            {
+       if ( isset($Settings["Connections"]) ) {
+         foreach ($Settings["Connections"] as $ID => $NodeID) {
+           if ( isset($this->Data[$NodeID]) ) {
              $X2 = $this->Data[$NodeID]["X"];
              $Y2 = $this->Data[$NodeID]["Y"];
 
@@ -564,28 +492,21 @@ 
 
      /* Check collisions */
      $Conflicts = 0;
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X1 = $Settings["X"];
        $Y1 = $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
-           if ( isset($this->Data[$NodeID]) )
-            {
+       if ( isset($Settings["Connections"]) ) {
+         foreach ($Settings["Connections"] as $ID => $NodeID) {
+           if ( isset($this->Data[$NodeID]) ) {
              $X2 = $this->Data[$NodeID]["X"];
              $Y2 = $this->Data[$NodeID]["Y"];
 
-             foreach($Links as $IDLinks => $Link)
-              {
+             foreach($Links as $IDLinks => $Link) {
                $X3 = $Link["X1"]; $Y3 = $Link["Y1"]; $X4 = $Link["X2"]; $Y4 = $Link["Y2"];
 
-               if ( !($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4 ) )
-                {
-                 if ( $this->intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) )
-                  {
+               if ( !($X1 == $X3 && $X2 == $X4 && $Y1 == $Y3 && $Y2 == $Y4 ) ) {
+                 if ( $this->intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) ) {
                    if ( $Link["Source"] != $Settings["Name"] && $Link["Source"] != $this->Data[$NodeID]["Name"] && $Link["Destination"] != $Settings["Name"] && $Link["Destination"] != $this->Data[$NodeID]["Name"] )
                     { $Conflicts++; }
                   }
@@ -599,8 +520,7 @@ 
     }
 
    /* Center the graph */
-   function center()
-    {
+   function center() {
      /* Determine the real center */
      $TargetCenterX = ($this->X2 - $this->X1) / 2 + $this->X1;
      $TargetCenterY = ($this->Y2 - $this->Y1) / 2 + $this->Y1;
@@ -608,8 +528,7 @@ 
      /* Get current boundaries */
      $XMin = $this->X2; $XMax = $this->X1;
      $YMin = $this->Y2; $YMax = $this->Y1;
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X = $Settings["X"];
        $Y = $Settings["Y"];
 
@@ -626,16 +545,14 @@ 
      $YOffset = $TargetCenterY - $CurrentCenterY;
 
      /* Correct the points position */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $this->Data[$Key]["X"] = $Settings["X"] + $XOffset;
        $this->Data[$Key]["Y"] = $Settings["Y"] + $YOffset;
       }
     }
 
    /* Create the encoded string */
-   function drawSpring($Object,$Settings="")
-    {
+   function drawSpring($Object,$Settings="") {
      $this->pChartObject = $Object;
 
      $Pass			= isset($Settings["Pass"]) ? $Settings["Pass"] : 50;
@@ -656,16 +573,14 @@ 
      $this->Y2		= $Object->GraphAreaY2;
 
      $Conflicts = 1; $Jobs = 0; $this->History["MinimumConflicts"] = -1;
-     while ($Conflicts != 0 && $Jobs < $Retries )
-      {
+     while ($Conflicts != 0 && $Jobs < $Retries ) {
        $Jobs++;
 
        /* Compute the initial settings */
        $this->firstPass($Algorithm);
 
        /* Apply the vectors */
-       if ( $Pass > 0 ) 
-        {
+       if ( $Pass > 0 ) {
          for ($i=0; $i<=$Pass; $i++) { $this->doPass(); }
         }
 
@@ -681,24 +596,19 @@ 
 
      /* Draw the connections */
      $Drawn = "";
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X	= $Settings["X"];
        $Y	= $Settings["Y"];
 
-       if ( isset($Settings["Connections"]) )
-        {
-         foreach ($Settings["Connections"] as $ID => $NodeID)
-          {
+       if ( isset($Settings["Connections"]) ) {
+         foreach ($Settings["Connections"] as $ID => $NodeID) {
            if ( !isset($Drawn[$Key]) )    { $Drawn[$Key] = ""; }
            if ( !isset($Drawn[$NodeID]) ) { $Drawn[$NodeID] = ""; }
 
-           if ( isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]) )
-            {
+           if ( isset($this->Data[$NodeID]) && !isset($Drawn[$Key][$NodeID]) && !isset($Drawn[$NodeID][$Key]) ) {
              $Color = array("R"=>$this->Default["LinkR"],"G"=>$this->Default["LinkG"],"B"=>$this->Default["LinkB"],"Alpha"=>$this->Default["Alpha"]);
 
-             if ( $this->Links != "" )
-              {
+             if ( $this->Links != "" ) {
                if ( isset($this->Links[$Key][$NodeID]["R"]) )
                 { $Color = array("R"=>$this->Links[$Key][$NodeID]["R"],"G"=>$this->Links[$Key][$NodeID]["G"],"B"=>$this->Links[$Key][$NodeID]["B"],"Alpha"=>$this->Links[$Key][$NodeID]["Alpha"]); }
 
@@ -711,10 +621,8 @@ 
              $this->pChartObject->drawLine($X,$Y,$X2,$Y2,$Color);
              $Drawn[$Key][$NodeID] = TRUE;
 
-             if ( isset($this->Links) && $this->Links != "" )
-              {
-               if ( isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]) )
-                {
+             if ( isset($this->Links) && $this->Links != "" ) {
+               if ( isset($this->Links[$Key][$NodeID]["Name"]) || isset($this->Links[$NodeID][$Key]["Name"]) ) {
                  $Name  = isset($this->Links[$Key][$NodeID]["Name"]) ? $this->Links[$Key][$NodeID]["Name"] : $this->Links[$NodeID][$Key]["Name"];
                  $TxtX  = ($X2 - $X)/2 + $X;
                  $TxtY  = ($Y2 - $Y)/2 + $Y;
@@ -736,10 +644,8 @@ 
       }
 
      /* Draw the quiet zones */
-     if ( $DrawQuietZone )
-      {
-       foreach($this->Data as $Key => $Settings)
-        {
+     if ( $DrawQuietZone ) {
+       foreach($this->Data as $Key => $Settings) {
          $X	 = $Settings["X"];
          $Y	 = $Settings["Y"];
          $FreeZone = $Settings["FreeZone"];
@@ -750,8 +656,7 @@ 
 
 
      /* Draw the nodes */
-     foreach($this->Data as $Key => $Settings)
-      {
+     foreach($this->Data as $Key => $Settings) {
        $X	 = $Settings["X"];
        $Y	 = $Settings["Y"];
        $Name	 = $Settings["Name"];
@@ -761,35 +666,26 @@ 
 
        $Color	 = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>$Settings["Alpha"],"BorderR"=>$Settings["BorderR"],"BorderG"=>$Settings["BorderG"],"BorderB"=>$Settings["BorderB"],"BorderApha"=>$Settings["BorderAlpha"]);
 
-       if ( $Shape == NODE_SHAPE_CIRCLE )
-        {
+       if ( $Shape == NODE_SHAPE_CIRCLE ) {
          $this->pChartObject->drawFilledCircle($X,$Y,$Size,$Color);
-        }
-       elseif ( $Shape == NODE_SHAPE_TRIANGLE )
-        {
+        } elseif ( $Shape == NODE_SHAPE_TRIANGLE ) {
          $Points = "";
          $Points[] = cos(deg2rad(270)) * $Size + $X; $Points[] = sin(deg2rad(270)) * $Size + $Y;
          $Points[] = cos(deg2rad(45)) * $Size + $X;  $Points[] = sin(deg2rad(45)) * $Size + $Y;
          $Points[] = cos(deg2rad(135)) * $Size + $X; $Points[] = sin(deg2rad(135)) * $Size + $Y;
          $this->pChartObject->drawPolygon($Points,$Color);
-        }
-       elseif ( $Shape == NODE_SHAPE_SQUARE )
-        {
+        } elseif ( $Shape == NODE_SHAPE_SQUARE ) {
          $Offset = $Size/2; $Size = $Size / 2;
          $this->pChartObject->drawFilledRectangle($X-$Offset,$Y-$Offset,$X+$Offset,$Y+$Offset,$Color);
         }
 
-       if ( $Name != "" )
-        {
+       if ( $Name != "" ) {
          $LabelOptions = array("R"=>$this->Labels["R"],"G"=>$this->Labels["G"],"B"=>$this->Labels["B"],"Alpha"=>$this->Labels["Alpha"]);
 
-         if ( $this->Labels["Type"] == LABEL_LIGHT )
-          {
+         if ( $this->Labels["Type"] == LABEL_LIGHT ) {
            $LabelOptions["Align"] = TEXT_ALIGN_BOTTOMLEFT;
            $this->pChartObject->drawText($X,$Y,$Name,$LabelOptions);
-          }
-         elseif ( $this->Labels["Type"] == LABEL_CLASSIC )
-          {
+          } elseif ( $this->Labels["Type"] == LABEL_CLASSIC ) {
            $LabelOptions["Align"]         = TEXT_ALIGN_TOPMIDDLE;
            $LabelOptions["DrawBox"]       = TRUE;
            $LabelOptions["BoxAlpha"]      = 50;
@@ -804,17 +700,13 @@ 
       }
 
      /* Draw the vectors */
-     if ( $DrawVectors )
-      {
-       foreach($this->Data as $Key => $Settings)
-        {
+     if ( $DrawVectors ) {
+       foreach($this->Data as $Key => $Settings) {
          $X1 = $Settings["X"];
          $Y1 = $Settings["Y"];
 
-         if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL )
-          {
-           foreach($Settings["Vectors"] as $ID => $Vector)
-            {
+         if ( isset($Settings["Vectors"]) && $Settings["Type"] != NODE_TYPE_CENTRAL ) {
+           foreach($Settings["Vectors"] as $ID => $Vector) {
              $Type  = $Vector["Type"];
              $Force = $Vector["Force"];
              $Angle = $Vector["Angle"];
@@ -838,14 +730,12 @@ 
     { return (sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1))); }
 
    /* Return the angle made by a line and the X axis */
-   function getAngle($X1,$Y1,$X2,$Y2)
-    {
+   function getAngle($X1,$Y1,$X2,$Y2) {
      $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
      if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
     }
 
-   function intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4)
-    {
+   function intersect($X1,$Y1,$X2,$Y2,$X3,$Y3,$X4,$Y4) {
      $A = (($X3 * $Y4 - $X4 * $Y3) * ($X1 - $X2) - ($X1 * $Y2 - $X2 * $Y1) * ($X3 - $X4));
      $B = (($Y1 - $Y2) * ($X3 - $X4) - ($Y3 - $Y4) * ($X1 - $X2));
 
@@ -856,8 +746,7 @@ 
      if ( $C == 0 ) { return(FALSE); }
      $Yi = $Xi * (($Y1 - $Y2)/$C) + (($X1 * $Y2 - $X2 * $Y1)/$C);
 
-     if ( $Xi >= min($X1,$X2) && $Xi >= min($X3,$X4) && $Xi <= max($X1,$X2) && $Xi <= max($X3,$X4))
-      {
+     if ( $Xi >= min($X1,$X2) && $Xi >= min($X3,$X4) && $Xi <= max($X1,$X2) && $Xi <= max($X3,$X4)) {
        if ( $Yi >= min($Y1,$Y2) && $Yi >= min($Y3,$Y4) && $Yi <= max($Y1,$Y2) && $Yi <= max($Y3,$Y4))
         { return(TRUE); }
       }

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pPie.class.php

Braces +124 added lines, -254 removed lines

@@ -29,15 +29,13 @@ 
  define("PIE_VALUE_OUTSIDE"     , 140031);
 
  /* pPie class definition */
- class pPie
-  {
+ class pPie {
    var $pChartObject;
    var $pDataObject;
    var $LabelPos = "" ;
 
    /* Class creator */
-   function pPie($Object,$pDataObject)
-    {
+   function pPie($Object,$pDataObject) {
      /* Cache the pChart object reference */
      $this->pChartObject = $Object;
 
@@ -46,8 +44,7 @@ 
     }
 
    /* Draw a pie chart */
-   function draw2DPie($X,$Y,$Format="")
-    {
+   function draw2DPie($X,$Y,$Format="") {
      $Radius		= isset($Format["Radius"]) ? $Format["Radius"] : 60;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
      $DataGapAngle	= isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
@@ -111,8 +108,7 @@ 
      $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
 
      $RestoreShadow = $this->pChartObject->Shadow;
-     if ( $this->pChartObject->Shadow )
-      {
+     if ( $this->pChartObject->Shadow ) {
        $this->pChartObject->Shadow = FALSE;
 
        $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
@@ -122,18 +118,15 @@ 
      /* Draw the polygon pie elements */
      $Step = 360 / (2 * PI * $Radius);
      $Offset = 0; $ID = 0;
-     foreach($Values as $Key => $Value)
-      {
+     foreach($Values as $Key => $Value) {
        if ( $Shadow )
         $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
-       else
-        {
+       else {
          if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
          $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
         }
 
-       if ( !$SecondPass && !$Shadow )
-        {
+       if ( !$SecondPass && !$Shadow ) {
          if ( !$Border )
           $Settings["Surrounding"] = 10;
          else
@@ -145,9 +138,7 @@ 
 
        $Angle = ($EndAngle - $Offset)/2 + $Offset;
        if ($DataGapAngle == 0)
-        { $X0 = $X; $Y0 = $Y; }
-       else
-        {
+        { $X0 = $X; $Y0 = $Y; } else {
          $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
          $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
         }
@@ -155,8 +146,7 @@ 
        $Plots[] = $X0; $Plots[] = $Y0;
 
 
-       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
-        {
+       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step) {
          $Xc = cos(($i-90)*PI/180) * $Radius + $X;
          $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
 
@@ -170,11 +160,9 @@ 
        $this->pChartObject->drawPolygon($Plots,$Settings);
        if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots),$this->pChartObject->toHTMLColor($Palette[$ID]["R"],$Palette[$ID]["G"],$Palette[$ID]["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$Key],$Value); }
 
-       if ( $DrawLabels && !$Shadow && !$SecondPass )
-        {
+       if ( $DrawLabels && !$Shadow && !$SecondPass ) {
          if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-         else
+          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
           { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -193,17 +181,14 @@ 
       }
 
      /* Second pass to smooth the angles */
-     if ( $SecondPass )
-      {
+     if ( $SecondPass ) {
        $Step = 360 / (2 * PI * $Radius);
        $Offset = 0; $ID = 0;
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          $FirstPoint = TRUE;
          if ( $Shadow )
           $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
-         else
-          {
+         else {
            if ( $Border )
             $Settings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB);
            else
@@ -213,17 +198,14 @@ 
          $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
 
          if ($DataGapAngle == 0)
-          { $X0 = $X; $Y0 = $Y; }
-         else
-          {
+          { $X0 = $X; $Y0 = $Y; } else {
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
            $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
            $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius + $Y;
           }
          $Plots[] = $X0; $Plots[] = $Y0;
 
-         for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
-          {
+         for($i=$Offset;$i<=$EndAngle;$i=$i+$Step) {
            $Xc = cos(($i-90)*PI/180) * $Radius + $X;
            $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
 
@@ -233,11 +215,9 @@ 
           }
          $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
 
-         if ( $DrawLabels && !$Shadow )
-          {
+         if ( $DrawLabels && !$Shadow ) {
            if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-            { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-           else
+            { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
             { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -256,23 +236,18 @@ 
         }
       }
 
-     if ( $WriteValues != NULL && !$Shadow )
-      {
+     if ( $WriteValues != NULL && !$Shadow ) {
        $Step = 360 / (2 * PI * $Radius);
        $Offset = 0; $ID = count($Values)-1;
        $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB,"Alpha"=>$ValueAlpha);
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          $EndAngle = ($Value*$ScaleFactor) + $Offset; if ( $EndAngle > 360 ) { $EndAngle = 0; }
          $Angle    = ($EndAngle - $Offset)/2 + $Offset;
 
-         if ( $ValuePosition == PIE_VALUE_OUTSIDE )
-          {
+         if ( $ValuePosition == PIE_VALUE_OUTSIDE ) {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $Y;
-          }
-         else
-          {
+          } else {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($Radius)/2 + $Y;
           }
@@ -296,8 +271,7 @@ 
     }
 
    /* Draw a 3D pie chart */
-   function draw3DPie($X,$Y,$Format="")
-    {
+   function draw3DPie($X,$Y,$Format="") {
      /* Rendering layout */
      $Radius		= isset($Format["Radius"]) ? $Format["Radius"] : 80;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
@@ -371,8 +345,7 @@ 
      $Offset = 360; $ID = count($Values)-1;
      $Values = array_reverse($Values);
      $Slice  = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
-     foreach($Values as $Key => $Value)
-      {
+     foreach($Values as $Key => $Value) {
        if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
        $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
 
@@ -385,17 +358,14 @@ 
        if ( $EndAngle < 180 )   { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
 
        if ($DataGapAngle == 0)
-        { $X0 = $X; $Y0 = $Y; }
-       else
-        {
+        { $X0 = $X; $Y0 = $Y; } else {
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
          $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
          $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius*$SkewFactor + $Y;
         }
        $Slices[$Slice][] = $X0; $Slices[$Slice][] = $Y0; $SliceAngle[$Slice][] = 0;
 
-       for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
-        {
+       for($i=$Offset;$i>=$EndAngle;$i=$i-$Step) {
          $Xc = cos(($i-90)*PI/180) * $Radius + $X;
          $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y;
 
@@ -411,10 +381,8 @@ 
       }
 
      /* Draw the bottom shadow if needed */
-     if ( $RestoreShadow && ($this->pChartObject->ShadowX != 0 || $this->pChartObject->ShadowY !=0 ))
-      {
-       foreach($Slices as $SliceID => $Plots)
-        {
+     if ( $RestoreShadow && ($this->pChartObject->ShadowX != 0 || $this->pChartObject->ShadowY !=0 )) {
+       foreach($Slices as $SliceID => $Plots) {
          $ShadowPie = "";
          for($i=0;$i<count($Plots);$i=$i+2)
           { $ShadowPie[] = $Plots[$i]+$this->pChartObject->ShadowX; $ShadowPie[] = $Plots[$i+1]+$this->pChartObject->ShadowY; }
@@ -425,12 +393,10 @@ 
 
        $Step = 360 / (2 * PI * $Radius);
        $Offset = 360;
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
 
-         for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
-          {
+         for($i=$Offset;$i>=$EndAngle;$i=$i-$Step) {
            $Xc = cos(($i-90)*PI/180) * $Radius + $X + $this->pChartObject->ShadowX;
            $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y + $this->pChartObject->ShadowY;
 
@@ -442,13 +408,11 @@ 
       }
 
      /* Draw the bottom pie splice */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $this->pChartObject->drawPolygon($Plots,$Settings);
 
-       if ( $SecondPass )
-        {
+       if ( $SecondPass ) {
          $Settings = $SliceColors[$SliceID];
          if ( $Border )
           { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30;; }
@@ -471,8 +435,7 @@ 
      /* Draw the two vertical edges */
      $Slices      = array_reverse($Slices);
      $SliceColors = array_reverse($SliceColors);
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];
        $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
 
@@ -488,12 +451,10 @@ 
 
      $Slices      = array_reverse($Slices);
      $SliceColors = array_reverse($SliceColors);
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];
        $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
-       if ( $Visible[$SliceID]["End"] )
-        {
+       if ( $Visible[$SliceID]["End"] ) {
          $this->pChartObject->drawLine($Plots[count($Plots)-2],$Plots[count($Plots)-1],$Plots[count($Plots)-2],$Plots[count($Plots)-1]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
 
          $Border = "";
@@ -504,16 +465,13 @@ 
       }
 
      /* Draw the rounded edges */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];
        $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
 
-       for ($j=2;$j<count($Plots)-2;$j=$j+2)
-        {
+       for ($j=2;$j<count($Plots)-2;$j=$j+2) {
          $Angle = $SliceAngle[$SliceID][$j/2];
-         if ( $Angle < 270 && $Angle > 90 )
-          {
+         if ( $Angle < 270 && $Angle > 90 ) {
            $Border = "";
            $Border[] = $Plots[$j];   $Border[] = $Plots[$j+1];
            $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3];
@@ -523,8 +481,7 @@ 
           }
         }
 
-       if ( $SecondPass )
-        {
+       if ( $SecondPass ) {
          $Settings = $SliceColors[$SliceID];
          if ( $Border )
           { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30; }
@@ -532,8 +489,7 @@ 
          if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
           {
            $Angle = $SliceAngle[$SliceID][1];
-           if ( $Angle < 270 && $Angle > 90 )
-            {
+           if ( $Angle < 270 && $Angle > 90 ) {
              $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
              $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
              $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
@@ -541,22 +497,19 @@ 
           }
 
          $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
-         if ( $Angle < 270 && $Angle > 90 )
-          {
+         if ( $Angle < 270 && $Angle > 90 ) {
            $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
            $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
            $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
           }
 
-         if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 270 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 270 )
-          {
+         if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 270 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 270 ) {
            $Xc = cos((270-90)*PI/180) * $Radius + $X;
            $Yc = sin((270-90)*PI/180) * $Radius*$SkewFactor + $Y;
            $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
           }
 
-         if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 90 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 90 )
-          {
+         if ( isset($SliceAngle[$SliceID][1]) && $SliceAngle[$SliceID][1] > 90 && $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1] < 90 ) {
            $Xc = cos((0)*PI/180) * $Radius + $X;
            $Yc = sin((0)*PI/180) * $Radius*$SkewFactor + $Y;
            $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
@@ -566,8 +519,7 @@ 
       }
 
      /* Draw the top splice */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];
        $Settings["R"]+= 20; $Settings["G"]+= 20; $Settings["B"]+= 20;
 
@@ -580,37 +532,30 @@ 
 
 
      /* Second pass to smooth the angles */
-     if ( $SecondPass )
-      {
+     if ( $SecondPass ) {
        $Step = 360 / (2 * PI * $Radius);
        $Offset = 360; $ID = count($Values)-1;
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          $FirstPoint = TRUE;
          if ( $Shadow )
           $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
-         else
-          {
+         else {
            if ( $Border )
-            { $Settings = array("R"=>$Palette[$ID]["R"]+30,"G"=>$Palette[$ID]["G"]+30,"B"=>$Palette[$ID]["B"]+30,"Alpha"=>$Palette[$ID]["Alpha"]); }
-           else
+            { $Settings = array("R"=>$Palette[$ID]["R"]+30,"G"=>$Palette[$ID]["G"]+30,"B"=>$Palette[$ID]["B"]+30,"Alpha"=>$Palette[$ID]["Alpha"]); } else
             $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
           }
 
          $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
 
          if ($DataGapAngle == 0)
-          { $X0 = $X; $Y0 = $Y- $SliceHeight; }
-         else
-          {
+          { $X0 = $X; $Y0 = $Y- $SliceHeight; } else {
            $Angle = ($EndAngle - $Offset)/2 + $Offset;
            $X0 = cos(($Angle-90)*PI/180) * $DataGapRadius + $X;
            $Y0 = sin(($Angle-90)*PI/180) * $DataGapRadius*$SkewFactor + $Y - $SliceHeight;
           }
          $Plots[] = $X0; $Plots[] = $Y0;
 
-         for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
-          {
+         for($i=$Offset;$i>=$EndAngle;$i=$i-$Step) {
            $Xc = cos(($i-90)*PI/180) * $Radius + $X;
            $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
 
@@ -625,24 +570,19 @@ 
         }
       }
 
-     if ( $WriteValues != NULL )
-      {
+     if ( $WriteValues != NULL ) {
        $Step = 360 / (2 * PI * $Radius);
        $Offset = 360; $ID = count($Values)-1;
        $Settings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB,"Alpha"=>$ValueAlpha);
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
 
-         if ( $ValuePosition == PIE_VALUE_OUTSIDE )
-          {
+         if ( $ValuePosition == PIE_VALUE_OUTSIDE ) {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
            $Yc = sin(($Angle-90)*PI/180) * (($Radius*$SkewFactor)+$ValuePadding) + $Y - $SliceHeight;
-          }
-         else
-          {
+          } else {
            $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($Radius*$SkewFactor)/2 + $Y - $SliceHeight;
           }
@@ -658,15 +598,12 @@ 
         }
       }
 
-     if ( $DrawLabels )
-      {
+     if ( $DrawLabels ) {
        $Step = 360 / (2 * PI * $Radius);
        $Offset = 360; $ID = count($Values)-1;
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-         else
+          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
           { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
          $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
@@ -675,8 +612,7 @@ 
          $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
          $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
 
-         if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$ID]) )
-          {
+         if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$ID]) ) {
            $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$ID];
 
            if ( $LabelStacked )
@@ -697,8 +633,7 @@ 
     }
 
    /* Draw the legend of pie chart */
-   function drawPieLegend($X,$Y,$Format="")
-    {
+   function drawPieLegend($X,$Y,$Format="") {
      $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
      $FontR		= isset($Format["FontR"]) ? $Format["FontR"] : $this->pChartObject->FontColorR;
@@ -730,19 +665,15 @@ 
      if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
-      {
+     foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value) {
        $BoxArray = $this->pChartObject->getTextBox($vX+$BoxSize+4,$vY+$BoxSize/2,$FontName,$FontSize,0,$Value);
 
-       if ( $Mode == LEGEND_VERTICAL )
-        {
+       if ( $Mode == LEGEND_VERTICAL ) {
          if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
          if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
          if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
          $vY=$vY+$YStep;
-        }
-       elseif ( $Mode == LEGEND_HORIZONTAL )
-        {
+        } elseif ( $Mode == LEGEND_HORIZONTAL ) {
          if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$BoxSize/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$BoxSize/2; }
          if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
          if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$BoxSize/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$BoxSize/2; }
@@ -760,19 +691,15 @@ 
       $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
 
      $RestoreShadow = $this->pChartObject->Shadow; $this->pChartObject->Shadow = FALSE;
-     foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value)
-      {
+     foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $Value) {
        $R = $Palette[$Key]["R"]; $G = $Palette[$Key]["G"]; $B = $Palette[$Key]["B"];
 
        $this->pChartObject->drawFilledRectangle($X+1,$Y+1,$X+$BoxSize+1,$Y+$BoxSize+1,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
        $this->pChartObject->drawFilledRectangle($X,$Y,$X+$BoxSize,$Y+$BoxSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-       if ( $Mode == LEGEND_VERTICAL )
-        {
+       if ( $Mode == LEGEND_VERTICAL ) {
          $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
          $Y=$Y+$YStep;
-        }
-       elseif ( $Mode == LEGEND_HORIZONTAL )
-        {
+        } elseif ( $Mode == LEGEND_HORIZONTAL ) {
          $BoxArray = $this->pChartObject->drawText($X+$BoxSize+4,$Y+$BoxSize/2,$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontName"=>$FontName,"FontSize"=>$FontSize));
          $X=$BoxArray[1]["X"]+2+$XStep;
         }
@@ -782,8 +709,7 @@ 
     }
 
    /* Set the color of the specified slice */
-   function setSliceColor($SliceID,$Format="")
-    {
+   function setSliceColor($SliceID,$Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : 0;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
      $B		= isset($Format["B"]) ? $Format["B"] : 0;
@@ -796,22 +722,18 @@ 
     }
 
    /* Internally used compute the label positions */
-   function writePieLabel($X,$Y,$Label,$Angle,$Settings,$Stacked,$Xc=0,$Yc=0,$Radius=0,$Reversed=FALSE)
-    {
+   function writePieLabel($X,$Y,$Label,$Angle,$Settings,$Stacked,$Xc=0,$Yc=0,$Radius=0,$Reversed=FALSE) {
      $LabelOffset	= 30;
      $FontName		= $this->pChartObject->FontName;
      $FontSize		= $this->pChartObject->FontSize;
 
-     if ( !$Stacked )
-      {
+     if ( !$Stacked ) {
        $Settings["Angle"]  = 360-$Angle;
        $Settings["Length"] = 25;
        $Settings["Size"]   = 8;
 
        $this->pChartObject->drawArrowLabel($X,$Y," ".$Label." ",$Settings);
-      }
-     else
-      {
+      } else {
        $X2 = cos(deg2rad($Angle-90))*20+$X;
        $Y2 = sin(deg2rad($Angle-90))*20+$Y;
 
@@ -820,13 +742,10 @@ 
        $YTop    = $Y2 - $Height/2 - 2;
        $YBottom = $Y2 + $Height/2 + 2;
 
-       if ( $this->LabelPos != "" )
-        {
+       if ( $this->LabelPos != "" ) {
          $Done = FALSE;
-         foreach($this->LabelPos as $Key => $Settings)
-          {
-           if ( !$Done )
-            {
+         foreach($this->LabelPos as $Key => $Settings) {
+           if ( !$Done ) {
              if ( $Angle <= 90 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
               { $this->shift(0,180,-($Height+2),$Reversed); $Done = TRUE; }
              if ( $Angle > 90 && $Angle <= 180 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
@@ -847,21 +766,17 @@ 
     }
 
    /* Internally used to shift label positions */
-   function shift($StartAngle,$EndAngle,$Offset,$Reversed)
-    {
+   function shift($StartAngle,$EndAngle,$Offset,$Reversed) {
      if ( $Reversed ) { $Offset = -$Offset; }
-     foreach($this->LabelPos as $Key => $Settings)
-      {
+     foreach($this->LabelPos as $Key => $Settings) {
        if ( $Settings["Angle"] > $StartAngle && $Settings["Angle"] <= $EndAngle ) { $this->LabelPos[$Key]["YTop"] = $Settings["YTop"] + $Offset; $this->LabelPos[$Key]["YBottom"] = $Settings["YBottom"] + $Offset; $this->LabelPos[$Key]["Y2"] = $Settings["Y2"] + $Offset; }
       }
     }
 
    /* Internally used to write the re-computed labels */
-   function writeShiftedLabels()
-    {
+   function writeShiftedLabels() {
      if ( $this->LabelPos == "" ) { return(0); }
-     foreach($this->LabelPos as $Key => $Settings)
-      {
+     foreach($this->LabelPos as $Key => $Settings) {
        $X1 = $Settings["X1"]; $Y1 = $Settings["Y1"];
        $X2 = $Settings["X2"]; $Y2 = $Settings["Y2"];
        $X3 = $Settings["X3"];
@@ -869,13 +784,10 @@ 
        $Label = $Settings["Label"];
 
        $this->pChartObject->drawArrow($X2,$Y2,$X1,$Y1,array("Size"=>8));
-       if ( $Angle <= 180 )
-        {
+       if ( $Angle <= 180 ) {
          $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
          $this->pChartObject->drawText($X3+2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
-        }
-       else
-        {
+        } else {
          $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
          $this->pChartObject->drawText($X3-2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
         }
@@ -883,8 +795,7 @@ 
     }
 
    /* Draw a ring chart */
-   function draw2DRing($X,$Y,$Format="")
-    {
+   function draw2DRing($X,$Y,$Format="") {
      $OuterRadius	= isset($Format["Radius"]) ? $Format["Radius"] : 60;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
      $InnerRadius	= isset($Format["Radius"]) ? $Format["Radius"] : 30;
@@ -947,8 +858,7 @@ 
      $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
 
      $RestoreShadow = $this->pChartObject->Shadow;
-     if ( $this->pChartObject->Shadow )
-      {
+     if ( $this->pChartObject->Shadow ) {
        $this->pChartObject->Shadow = FALSE;
 
        $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
@@ -958,15 +868,11 @@ 
      /* Draw the polygon pie elements */
      $Step = 360 / (2 * PI * $OuterRadius);
      $Offset = 0; $ID = 0;
-     foreach($Values as $Key => $Value)
-      {
-       if ( $Shadow )
-        {
+     foreach($Values as $Key => $Value) {
+       if ( $Shadow ) {
          $Settings    = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa);
          $BorderColor = $Settings;
-        }
-       else
-        {
+        } else {
          if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
          $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
 
@@ -978,8 +884,7 @@ 
 
        $Plots = ""; $Boundaries = ""; $AAPixels = "";
        $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
-       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
-        {
+       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step) {
          $Xc = cos(($i-90)*PI/180) * $OuterRadius + $X;
          $Yc = sin(($i-90)*PI/180) * $OuterRadius + $Y;
 
@@ -995,8 +900,7 @@ 
        $Boundaries[1]["X1"] = $Xc; $Boundaries[1]["Y1"] = $Yc;
        $Lasti = $EndAngle;
 
-       for($i=$EndAngle;$i>=$Offset;$i=$i-$Step)
-        {
+       for($i=$EndAngle;$i>=$Offset;$i=$i-$Step) {
          $Xc = cos(($i-90)*PI/180) * ($InnerRadius-1) + $X;
          $Yc = sin(($i-90)*PI/180) * ($InnerRadius-1) + $Y;
 
@@ -1023,11 +927,9 @@ 
        $this->pChartObject->drawLine($Boundaries[0]["X1"],$Boundaries[0]["Y1"],$Boundaries[0]["X2"],$Boundaries[0]["Y2"],$BorderColor);
        $this->pChartObject->drawLine($Boundaries[1]["X1"],$Boundaries[1]["Y1"],$Boundaries[1]["X2"],$Boundaries[1]["Y2"],$BorderColor);
 
-       if ( $DrawLabels && !$Shadow )
-        {
+       if ( $DrawLabels && !$Shadow ) {
          if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-         else
+          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
           { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -1047,27 +949,22 @@ 
 
      if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
 
-     if ( $WriteValues && !$Shadow )
-      {
+     if ( $WriteValues && !$Shadow ) {
        $Step = 360 / (2 * PI * $OuterRadius);
        $Offset = 0;
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          $EndAngle = $Offset+($Value*$ScaleFactor);
          if ( $EndAngle > 360 ) { $EndAngle = 360; }
 
          $Angle = $Offset+($Value*$ScaleFactor)/2;
-         if ( $ValuePosition == PIE_VALUE_OUTSIDE )
-          {
+         if ( $ValuePosition == PIE_VALUE_OUTSIDE ) {
            $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$ValuePadding) + $X;
            $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$ValuePadding) + $Y;
            if ( $Angle >=0 && $Angle <= 90 ) { $Align = TEXT_ALIGN_BOTTOMLEFT; }
            if ( $Angle > 90 && $Angle <= 180 ) { $Align = TEXT_ALIGN_TOPLEFT; }
            if ( $Angle > 180 && $Angle <= 270 ) { $Align = TEXT_ALIGN_TOPRIGHT; }
            if ( $Angle > 270 ) { $Align = TEXT_ALIGN_BOTTOMRIGHT; }
-          }
-         else
-          {
+          } else {
            $Xc = cos(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $X;
            $Yc = sin(($Angle-90)*PI/180) * (($OuterRadius-$InnerRadius)/2+$InnerRadius) + $Y;
            $Align = TEXT_ALIGN_MIDDLEMIDDLE;
@@ -1091,8 +988,7 @@ 
     }
 
    /* Draw a 3D ring chart */
-   function draw3DRing($X,$Y,$Format="")
-    {
+   function draw3DRing($X,$Y,$Format="") {
      $OuterRadius	= isset($Format["OuterRadius"]) ? $Format["OuterRadius"] : 100;
      $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
      $InnerRadius	= isset($Format["InnerRadius"]) ? $Format["InnerRadius"] : 30;
@@ -1165,8 +1061,7 @@ 
      $Offset = 360; $ID = count($Values)-1;
      $Values = array_reverse($Values);
      $Slice  = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
-     foreach($Values as $Key => $Value)
-      {
+     foreach($Values as $Key => $Value) {
        if ( !isset($Palette[$ID]["R"]) ) { $Color = $this->pChartObject->getRandomColor(); $Palette[$ID] = $Color; $this->pDataObject->savePalette($ID,$Color); }
        $Settings = array("R"=>$Palette[$ID]["R"],"G"=>$Palette[$ID]["G"],"B"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);
 
@@ -1180,8 +1075,7 @@ 
 
        $Step   = (360 / (2 * PI * $OuterRadius))/2;
        $OutX1 = VOID; $OutY1 = VOID;
-       for($i=$Offset;$i>=$EndAngle;$i=$i-$Step)
-        {
+       for($i=$Offset;$i>=$EndAngle;$i=$i-$Step) {
          $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-2) + $X;
          $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-2)*$SkewFactor + $Y;
          $Slices[$Slice]["AA"][] = array($Xc,$Yc);
@@ -1212,8 +1106,7 @@ 
 
        $Step   = (360 / (2 * PI * $InnerRadius))/2;
        $InX1 = VOID; $InY1 = VOID;
-       for($i=$EndAngle;$i<=$Offset;$i=$i+$Step)
-        {
+       for($i=$EndAngle;$i<=$Offset;$i=$i+$Step) {
          $Xc = cos(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius-1) + $X;
          $Yc = sin(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius-1)*$SkewFactor + $Y;
          $Slices[$Slice]["AA"][] = array($Xc,$Yc);
@@ -1244,13 +1137,13 @@ 
       }
 
      /* Draw the bottom pie splice */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $this->pChartObject->drawPolygon($Plots["BottomPoly"],$Settings);
 
-       foreach($Plots["AA"] as $Key => $Pos)
-        $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$Settings);
+       foreach($Plots["AA"] as $Key => $Pos) {
+               $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$Settings);
+       }
 
        $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["OutX2"],$Plots["OutY2"],$Settings);
        $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["OutX1"],$Plots["OutY1"],$Settings);
@@ -1260,8 +1153,7 @@ 
      $SliceColors = array_reverse($SliceColors);
 
      /* Draw the vertical edges (semi-visible) */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
 
@@ -1278,21 +1170,16 @@ 
       }
 
      /* Draw the inner vertical slices */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
 
        $Outer = TRUE; $Inner = FALSE;
        $InnerPlotsA = ""; $InnerPlotsB = "";
-       foreach($Plots["Angle"] as $ID => $Angle)
-        {
+       foreach($Plots["Angle"] as $ID => $Angle) {
          if ( $Angle == VOID )
-          { $Outer = FALSE; $Inner = TRUE; }
-         elseif( $Inner )
-          {
-           if (( $Angle < 90 || $Angle > 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
-            {
+          { $Outer = FALSE; $Inner = TRUE; } elseif( $Inner ) {
+           if (( $Angle < 90 || $Angle > 270 ) && isset($Plots["BottomPoly"][$ID*2]) ) {
              $Xo = $Plots["BottomPoly"][$ID*2];
              $Yo = $Plots["BottomPoly"][$ID*2+1];
 
@@ -1307,16 +1194,14 @@ 
       }
 
      /* Draw the splice top and left poly */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $Settings["R"] = $Settings["R"]+$Cf*1.5; $Settings["G"] = $Settings["G"]+$Cf*1.5; $Settings["B"] = $Settings["B"]+$Cf*1.5;
 
        $StartAngle = $Plots["Angle"][0];
        foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
 
-       if ( $StartAngle < 180 )
-        {
+       if ( $StartAngle < 180 ) {
          $Points = "";
          $Points[] = $Plots["InX2"];
          $Points[] = $Plots["InY2"];
@@ -1330,8 +1215,7 @@ 
          $this->pChartObject->drawPolygon($Points,$Settings);
         }
 
-       if ( $EndAngle > 180 )
-        {
+       if ( $EndAngle > 180 ) {
          $Points = "";
          $Points[] = $Plots["InX1"];
          $Points[] = $Plots["InY1"];
@@ -1348,8 +1232,7 @@ 
 
 
      /* Draw the vertical edges (visible) */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
 
@@ -1364,21 +1247,16 @@ 
 
 
      /* Draw the outer vertical slices */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $Settings["R"] = $Settings["R"]+$Cf; $Settings["G"] = $Settings["G"]+$Cf; $Settings["B"] = $Settings["B"]+$Cf;
 
        $Outer = TRUE; $Inner = FALSE;
        $OuterPlotsA = ""; $OuterPlotsB = ""; $InnerPlotsA = ""; $InnerPlotsB = "";
-       foreach($Plots["Angle"] as $ID => $Angle)
-        {
+       foreach($Plots["Angle"] as $ID => $Angle) {
          if ( $Angle == VOID )
-          { $Outer = FALSE; $Inner = TRUE; }
-         elseif( $Outer )
-          {
-           if ( ( $Angle > 90 && $Angle < 270 ) && isset($Plots["BottomPoly"][$ID*2]) )
-            {
+          { $Outer = FALSE; $Inner = TRUE; } elseif( $Outer ) {
+           if ( ( $Angle > 90 && $Angle < 270 ) && isset($Plots["BottomPoly"][$ID*2]) ) {
              $Xo = $Plots["BottomPoly"][$ID*2];
              $Yo = $Plots["BottomPoly"][$ID*2+1];
 
@@ -1396,8 +1274,7 @@ 
 
 
      /* Draw the top pie splice */
-     foreach($Slices as $SliceID => $Plots)
-      {
+     foreach($Slices as $SliceID => $Plots) {
        $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
        $Settings["R"] = $Settings["R"]+$Cf*2; $Settings["G"] = $Settings["G"]+$Cf*2; $Settings["B"] = $Settings["B"]+$Cf*2;
  
@@ -1405,24 +1282,22 @@ 
 
        if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Plots["TopPoly"]),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][$SliceID],$Data["Series"][$DataSerie]["Data"][count($Slices)-$SliceID-1]); }
 
-       foreach($Plots["AA"] as $Key => $Pos)
-        $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1]-$SliceHeight,$Settings);
+       foreach($Plots["AA"] as $Key => $Pos) {
+               $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1]-$SliceHeight,$Settings);
+       }
 
        $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
        $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
       }
 
-     if ( $DrawLabels )
-      {
+     if ( $DrawLabels ) {
        $Offset = 360;
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          $StartAngle = $Offset;
          $EndAngle   = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
 
          if ( $LabelColor == PIE_LABEL_COLOR_AUTO )
-          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);}
-         else
+          { $Settings = array("FillR"=>$Palette[$ID]["R"],"FillG"=>$Palette[$ID]["G"],"FillB"=>$Palette[$ID]["B"],"Alpha"=>$Palette[$ID]["Alpha"]);} else
           { $Settings = array("FillR"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
 
          $Angle = ($EndAngle - $Offset)/2 + $Offset;
@@ -1452,8 +1327,7 @@ 
     }
 
   /* Serialize an array */
-  function arraySerialize($Data)
-   {
+  function arraySerialize($Data) {
     $Result = "";
     foreach($Data as $Key => $Value)
      { if ($Result == "") { $Result = floor($Value); } else { $Result = $Result.",".floor($Value); } }
@@ -1462,8 +1336,7 @@ 
    }
 
   /* Reverse an array */
-  function arrayReverse($Plots)
-   {
+  function arrayReverse($Plots) {
     $Result = "";
 
     for($i=count($Plots)-1;$i>=0;$i=$i-2)
@@ -1473,8 +1346,7 @@ 
    }
 
   /* Remove unused series & values */
-  function clean0Values($Data,$Palette,$DataSerie,$AbscissaSerie)
-   {
+  function clean0Values($Data,$Palette,$DataSerie,$AbscissaSerie) {
     $NewPalette = ""; $NewData = ""; $NewAbscissa = "";
 
     /* Remove unused series */
@@ -1482,10 +1354,8 @@ 
      { if ( $SerieName != $DataSerie && $SerieName != $AbscissaSerie ) { unset($Data["Series"][$SerieName]); } }
 
     /* Remove NULL values */
-    foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
-     {
-      if ($Value != 0 )
-       {
+    foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value) {
+      if ($Value != 0 ) {
         $NewData[]     = $Value;
         $NewAbscissa[] = $Data["Series"][$AbscissaSerie]["Data"][$Key];
         if ( isset($Palette[$Key]) ) { $NewPalette[]  = $Palette[$Key]; }

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pBubble.class.php

Braces +40 added lines, -86 removed lines

@@ -17,54 +17,44 @@ 
  define("BUBBLE_SHAPE_SQUARE"		, 700002);
 
  /* pBubble class definition */
- class pBubble
-  {
+ class pBubble {
    var $pChartObject;
    var $pDataObject;
 
    /* Class creator */
-   function pBubble($pChartObject,$pDataObject)
-    {
+   function pBubble($pChartObject,$pDataObject) {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Prepare the scale */
-   function bubbleScale($DataSeries,$WeightSeries)
-    {
+   function bubbleScale($DataSeries,$WeightSeries) {
      if ( !is_array($DataSeries) )	{ $DataSeries = array($DataSeries); }
      if ( !is_array($WeightSeries) )	{ $WeightSeries = array($WeightSeries); }
 
      /* Parse each data series to find the new min & max boundaries to scale */
      $NewPositiveSerie = ""; $NewNegativeSerie = ""; $MaxValues = 0; $LastPositive = 0; $LastNegative = 0;
-     foreach($DataSeries as $Key => $SerieName)
-      {
+     foreach($DataSeries as $Key => $SerieName) {
        $SerieWeightName = $WeightSeries[$Key];
 
        $this->pDataObject->setSerieDrawable($SerieWeightName,FALSE);
 
        if ( count($this->pDataObject->Data["Series"][$SerieName]["Data"]) > $MaxValues ) { $MaxValues = count($this->pDataObject->Data["Series"][$SerieName]["Data"]); }
 
-       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value)
-        {
-         if ( $Value >= 0 )
-          {
+       foreach($this->pDataObject->Data["Series"][$SerieName]["Data"] as $Key => $Value) {
+         if ( $Value >= 0 ) {
            $BubbleBounds = $Value + $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
            if ( !isset($NewPositiveSerie[$Key]) )
-            { $NewPositiveSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
+            { $NewPositiveSerie[$Key] = $BubbleBounds; } elseif ( $NewPositiveSerie[$Key] < $BubbleBounds )
             { $NewPositiveSerie[$Key] = $BubbleBounds; }
 
            $LastPositive = $BubbleBounds;
-          }
-         else
-          {
+          } else {
            $BubbleBounds = $Value - $this->pDataObject->Data["Series"][$SerieWeightName]["Data"][$Key];
 
            if ( !isset($NewNegativeSerie[$Key]) )
-            { $NewNegativeSerie[$Key] = $BubbleBounds; }
-           elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
+            { $NewNegativeSerie[$Key] = $BubbleBounds; } elseif ( $NewNegativeSerie[$Key] > $BubbleBounds )
             { $NewNegativeSerie[$Key] = $BubbleBounds; }
 
            $LastNegative = $BubbleBounds;
@@ -73,32 +63,27 @@ 
       }
 
      /* Check for missing values and all the fake positive serie */
-     if ( $NewPositiveSerie != "" )
-      {
+     if ( $NewPositiveSerie != "" ) {
        for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewPositiveSerie[$i])) { $NewPositiveSerie[$i] = $LastPositive; } }
 
        $this->pDataObject->addPoints($NewPositiveSerie,"BubbleFakePositiveSerie");
       }
 
      /* Check for missing values and all the fake negative serie */
-     if ( $NewNegativeSerie != "" )
-      {
+     if ( $NewNegativeSerie != "" ) {
        for ($i=0; $i<$MaxValues; $i++) { if (!isset($NewNegativeSerie[$i])) { $NewNegativeSerie[$i] = $LastNegative; } }
 
        $this->pDataObject->addPoints($NewNegativeSerie,"BubbleFakeNegativeSerie");
       }
     }
 
-   function resetSeriesColors()
-    {
+   function resetSeriesColors() {
      $Data    = $this->pDataObject->getData();
      $Palette = $this->pDataObject->getPalette();
 
      $ID = 0;
-     foreach($Data["Series"] as $SerieName => $SeriesParameters)
-      {
-       if ( $SeriesParameters["isDrawable"] )
-        {
+     foreach($Data["Series"] as $SerieName => $SeriesParameters) {
+       if ( $SeriesParameters["isDrawable"] ) {
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["R"]     = $Palette[$ID]["R"];
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["G"]     = $Palette[$ID]["G"];
          $this->pDataObject->Data["Series"][$SerieName]["Color"]["B"]     = $Palette[$ID]["B"];
@@ -109,8 +94,7 @@ 
     }
 
    /* Prepare the scale */
-   function drawBubbleChart($DataSeries,$WeightSeries,$Format="")
-    {
+   function drawBubbleChart($DataSeries,$WeightSeries,$Format="") {
      $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : VOID;
      $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
      $BorderWidth	= isset($Format["BorderWidth"]) ? $Format["BorderWidth"] : 1;
@@ -135,8 +119,7 @@ 
 
      list($XMargin,$XDivs) = $this->pChartObject->scaleGetXSettings();
 
-     foreach($DataSeries as $Key => $SerieName)
-      {
+     foreach($DataSeries as $Key => $SerieName) {
        $AxisID	= $Data["Series"][$SerieName]["Axis"];
        $Mode	= $Data["Axis"][$AxisID]["Display"];
        $Format	= $Data["Axis"][$AxisID]["Format"];
@@ -153,95 +136,71 @@ 
 
        if ( $ForceAlpha != VOID ) { $Color["Alpha"]=$ForceAlpha; }
 
-       if ( $DrawBorder )
-        {
-         if ( $BorderWidth != 1 )
-          {
+       if ( $DrawBorder ) {
+         if ( $BorderWidth != 1 ) {
            if ( $Surrounding != NULL )
-            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            { $BorderR = $Palette[$Key]["R"]+$Surrounding; $BorderG = $Palette[$Key]["G"]+$Surrounding; $BorderB = $Palette[$Key]["B"]+$Surrounding; } else
             { $BorderR = $BorderR; $BorderG = $BorderG; $BorderB = $BorderB; }
            if ( $ForceAlpha != VOID ) { $BorderAlpha = $ForceAlpha/2; }
            $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
-          }
-         else
-          {
+          } else {
            $Color["BorderAlpha"] = $BorderAlpha;
 
            if ( $Surrounding != NULL )
-            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; }
-           else
+            { $Color["BorderR"] = $Palette[$Key]["R"]+$Surrounding; $Color["BorderG"] = $Palette[$Key]["G"]+$Surrounding; $Color["BorderB"] = $Palette[$Key]["B"]+$Surrounding; } else
             { $Color["BorderR"] = $BorderR; $Color["BorderG"] = $BorderG; $Color["BorderB"] = $BorderB; }
            if ( $ForceAlpha != VOID ) { $Color["BorderAlpha"] = $ForceAlpha/2; }
           }
         }
 
-       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point)
-        {
+       foreach($Data["Series"][$SerieName]["Data"] as $iKey => $Point) {
          $Weight = $Point + $Data["Series"][$WeightSeries[$Key]]["Data"][$iKey];
 
          $PosArray    = $this->pChartObject->scaleComputeY($Point,array("AxisID"=>$AxisID));
          $WeightArray = $this->pChartObject->scaleComputeY($Weight,array("AxisID"=>$AxisID));
 
-         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-          {
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
            $Y = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
-            {
+           if ( $Shape == BUBBLE_SHAPE_SQUARE ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-            }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
-            {
+            } elseif ( $Shape == BUBBLE_SHAPE_ROUND ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
             }
 
            $X = $X + $XStep;
-          }
-         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
-          {
+          } elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM ) {
            if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
            $X = floor($PosArray); $CircleRadius = floor(abs($PosArray - $WeightArray)/2);
 
-           if ( $Shape == BUBBLE_SHAPE_SQUARE )
-            {
+           if ( $Shape == BUBBLE_SHAPE_SQUARE ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("RECT",floor($X-$CircleRadius).",".floor($Y-$CircleRadius).",".floor($X+$CircleRadius).",".floor($Y+$CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius-$BorderWidth,$Y-$CircleRadius-$BorderWidth,$X+$CircleRadius+$BorderWidth,$Y+$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledRectangle($X-$CircleRadius,$Y-$CircleRadius,$X+$CircleRadius,$Y+$CircleRadius,$Color);
-            }
-           elseif ( $Shape == BUBBLE_SHAPE_ROUND )
-            {
+            } elseif ( $Shape == BUBBLE_SHAPE_ROUND ) {
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($CircleRadius),$this->pChartObject->toHTMLColor($Palette[$Key]["R"],$Palette[$Key]["G"],$Palette[$Key]["B"]),$SerieDescription,$Data["Series"][$WeightSeries[$Key]]["Data"][$iKey]); }
 
-             if ( $BorderWidth != 1 )
-              {
+             if ( $BorderWidth != 1 ) {
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius+$BorderWidth,$BorderColor);
                $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
-              }
-             else
+              } else
               $this->pChartObject->drawFilledCircle($X,$Y,$CircleRadius,$Color);
             }
 
@@ -251,8 +210,7 @@ 
       }
     }
 
-   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="")
-    {
+   function writeBubbleLabel($SerieName,$SerieWeightName,$Points,$Format="") {
      $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
      $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
 
@@ -277,8 +235,7 @@ 
 
      $Color = array("R"=>$Data["Series"][$SerieName]["Color"]["R"],"G"=>$Data["Series"][$SerieName]["Color"]["G"],"B"=>$Data["Series"][$SerieName]["Color"]["B"],"Alpha"=>$Data["Series"][$SerieName]["Color"]["Alpha"]);
 
-     foreach($Points as $Key => $Point)
-      {
+     foreach($Points as $Key => $Point) {
        $Value    = $Data["Series"][$SerieName]["Data"][$Point];
        $PosArray = $this->pChartObject->scaleComputeY($Value,array("AxisID"=>$AxisID));
 
@@ -299,15 +256,12 @@ 
        $Series = "";
        $Series[] = array("Format"=>$Color,"Caption"=>$Caption);
 
-       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
-        {
+       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT ) {
          if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1-$XMargin*2)/$XDivs; }
 
          $X = floor($X + $Point * $XStep);
          $Y = floor($PosArray);
-        }
-       else
-        {
+        } else {
          if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1-$XMargin*2)/$XDivs; }
 
          $X = floor($PosArray);

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pImage.class.php

Braces +46 added lines, -98 removed lines

@@ -14,8 +14,7 @@ 
  */
 
  /* The GD extension is mandatory */
- if (!extension_loaded('gd') && !extension_loaded('gd2'))
-  {
+ if (!extension_loaded('gd') && !extension_loaded('gd2')) {
    echo "GD extension must be loaded. \r\n";
    exit();
   }
@@ -31,8 +30,7 @@ 
  /* ImageMap string delimiter */
  define("IMAGE_MAP_DELIMITER"		, chr(1));
 
- class pImage extends pDraw
-  {
+ class pImage extends pDraw {
    /* Image settings, size, quality, .. */
    var $XSize		= NULL;				// Width of the picture
    var $YSize		= NULL;				// Height of the picture
@@ -82,8 +80,7 @@ 
    var $LastChartLayout	= CHART_LAST_LAYOUT_REGULAR;	// Last layout : regular or stacked
 
    /* Class constructor */
-   function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
-    {
+   function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE) {
      $this->TransparentBackground = $TransparentBackground;
 
      if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
@@ -92,23 +89,19 @@ 
      $this->YSize   = $YSize;
      $this->Picture = imagecreatetruecolor($XSize,$YSize);
 
-     if ( $this->TransparentBackground )
-      {
+     if ( $this->TransparentBackground ) {
        imagealphablending($this->Picture,FALSE);
        imagefilledrectangle($this->Picture, 0,0,$XSize, $YSize, imagecolorallocatealpha($this->Picture, 255, 255, 255, 127));
        imagealphablending($this->Picture,TRUE);
        imagesavealpha($this->Picture,true); 
-      }
-     else
-      {
+      } else {
        $C_White = $this->AllocateColor($this->Picture,255,255,255);
        imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
       }
     }
 
    /* Enable / Disable and set shadow properties */
-   function setShadow($Enabled=TRUE,$Format="")
-    {
+   function setShadow($Enabled=TRUE,$Format="") {
      $X	    = isset($Format["X"]) ? $Format["X"] : 2;
      $Y	    = isset($Format["Y"]) ? $Format["Y"] : 2;
      $R	    = isset($Format["R"]) ? $Format["R"] : 0;
@@ -126,8 +119,7 @@ 
     }
 
    /* Set the graph area position */
-   function setGraphArea($X1,$Y1,$X2,$Y2)
-    {
+   function setGraphArea($X1,$Y1,$X2,$Y2) {
      if ( $X2 < $X1 || $X1 == $X2 || $Y2 < $Y1 || $Y1 == $Y2 ) { return(-1); }
 
      $this->GraphAreaX1 = $X1; $this->DataSet->Data["GraphArea"]["X1"] = $X1;
@@ -145,19 +137,16 @@ 
     { return($this->YSize); }
 
    /* Render the picture to a file */
-   function render($FileName)
-    {
+   function render($FileName) {
      if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
      imagepng($this->Picture,$FileName);
     }
 
    /* Render the picture to a web browser stream */
-   function stroke($BrowserExpire=FALSE)
-    {
+   function stroke($BrowserExpire=FALSE) {
      if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
 
-     if ( $BrowserExpire )
-      {
+     if ( $BrowserExpire ) {
        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
        header("Cache-Control: no-cache");
        header("Pragma: no-cache");
@@ -168,8 +157,7 @@ 
     }
 
    /* Automatic output method based on the calling interface */
-   function autoOutput($FileName="output.png")
-    {
+   function autoOutput($FileName="output.png") {
      if (php_sapi_name() == "cli")
       $this->Render($FileName);
      else
@@ -181,15 +169,13 @@ 
     { return(sqrt(pow(max($X1,$X2)-min($X1,$X2),2)+pow(max($Y1,$Y2)-min($Y1,$Y2),2))); }
 
    /* Return the orientation of a line */
-   function getAngle($X1,$Y1,$X2,$Y2)
-    {
+   function getAngle($X1,$Y1,$X2,$Y2) {
      $Opposite = $Y2 - $Y1; $Adjacent = $X2 - $X1;$Angle = rad2deg(atan2($Opposite,$Adjacent));
      if ($Angle > 0) { return($Angle); } else { return(360-abs($Angle)); }
     }
 
    /* Return the surrounding box of text area */
-   function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text)
-    {
+   function getTextBox_deprecated($X,$Y,$FontName,$FontSize,$Angle,$Text) {
      $Size    = imagettfbbox($FontSize,$Angle,$FontName,$Text);
      $Width   = $this->getLength($Size[0],$Size[1],$Size[2],$Size[3])+1;
      $Height  = $this->getLength($Size[2],$Size[3],$Size[4],$Size[5])+1;
@@ -206,13 +192,11 @@ 
     }
 
    /* Return the surrounding box of text area */
-   function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text)
-    {
+   function getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text) {
      $coords = imagettfbbox($FontSize, 0, $FontName, $Text);
 
      $a = deg2rad($Angle); $ca = cos($a); $sa = sin($a); $RealPos = array();
-     for($i = 0; $i < 7; $i += 2)
-      {
+     for($i = 0; $i < 7; $i += 2) {
        $RealPos[$i/2]["X"] = $X + round($coords[$i] * $ca + $coords[$i+1] * $sa);
        $RealPos[$i/2]["Y"] = $Y + round($coords[$i+1] * $ca - $coords[$i] * $sa);
       }
@@ -231,8 +215,7 @@ 
     }
 
    /* Set current font properties */
-   function setFontProperties($Format="")
-    {
+   function setFontProperties($Format="") {
      $R		= isset($Format["R"]) ? $Format["R"] : -1;
      $G		= isset($Format["G"]) ? $Format["G"] : -1;
      $B		= isset($Format["B"]) ? $Format["B"] : -1;
@@ -253,8 +236,7 @@ 
     }
 
    /* Returns the 1st decimal values (used to correct AA bugs) */
-   function getFirstDecimal($Value)
-    {
+   function getFirstDecimal($Value) {
      $Values = preg_split("/\./",$Value);
      if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
     }
@@ -268,18 +250,14 @@ 
     { print_r($this->DataSet); }
 
    /* Initialise the image map methods */
-   function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
-    {
+   function initialiseImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp") {
      $this->ImageMapIndex 		= $Name;
      $this->ImageMapStorageMode		= $StorageMode;
 
-     if ($StorageMode == IMAGE_MAP_STORAGE_SESSION)
-      {
+     if ($StorageMode == IMAGE_MAP_STORAGE_SESSION) {
        if(!isset($_SESSION)) { session_start(); }
        $_SESSION[$this->ImageMapIndex]    = NULL;
-      }
-     elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
-      {
+      } elseif($StorageMode == IMAGE_MAP_STORAGE_FILE) {
        $this->ImageMapFileName 		= $UniqueID;
        $this->ImageMapStorageFolder	= $StorageFolder;
 
@@ -288,27 +266,22 @@ 
     }
 
    /* Add a zone to the image map */
-   function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE)
-    {
+   function addToImageMap($Type,$Plots,$Color=NULL,$Title=NULL,$Message=NULL,$HTMLEncode=FALSE) {
      if ( $this->ImageMapStorageMode == NULL ) { $this->initialiseImageMap(); }
 
      /* Encode the characters in the imagemap in HTML standards */
      $Title   = str_replace("&#8364;","\u20AC",$Title);
      $Title   = htmlentities($Title,ENT_QUOTES,"ISO-8859-15");
-     if ( $HTMLEncode )
-      {
+     if ( $HTMLEncode ) {
        $Message = htmlentities($Message,ENT_QUOTES,"ISO-8859-15");
        $Message = str_replace("&lt;","<",$Message);
        $Message = str_replace("&gt;",">",$Message);
       }
 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION ) {
        if(!isset($_SESSION)) { $this->initialiseImageMap(); }
        $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
-      }
-     elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE)
-      {
+      } elseif($this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE) {
        $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'a');
        fwrite($Handle, $Type.IMAGE_MAP_DELIMITER.$Plots.IMAGE_MAP_DELIMITER.$Color.IMAGE_MAP_DELIMITER.$Title.IMAGE_MAP_DELIMITER.$Message."\r\n");
        fclose($Handle);
@@ -316,8 +289,7 @@ 
     }
 
    /* Remove VOID values from an imagemap custom values array */
-   function removeVOIDFromArray($SerieName, $Values)
-    {
+   function removeVOIDFromArray($SerieName, $Values) {
      if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
 
      $Result = "";
@@ -327,36 +299,28 @@ 
     }
 
    /* Replace the title of one image map serie */
-   function replaceImageMapTitle($OldTitle, $NewTitle)
-    {
+   function replaceImageMapTitle($OldTitle, $NewTitle) {
      if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
 
      if ( is_array($NewTitle) ) { $NewTitle = $this->removeVOIDFromArray($OldTitle, $NewTitle); }
  
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION ) {
        if(!isset($_SESSION)) { return(-1); }
        if ( is_array($NewTitle) )
-        { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } }
-       else
+        { $ID = 0; foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID])) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle[$ID]; $ID++; } } } else
         { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE ) {
        $TempArray = "";
        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
-       if ($Handle)
-        {
-         while (($Buffer = fgets($Handle, 4096)) !== false)
-          {
+       if ($Handle) {
+         while (($Buffer = fgets($Handle, 4096)) !== false) {
            $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
            $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
           }
          fclose($Handle);
 
          if ( is_array($NewTitle) )
-          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } }
-         else
+          { $ID = 0; foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle && isset($NewTitle[$ID]) ) { $TempArray[$Key][3] = $NewTitle[$ID]; $ID++; } } } else
           { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
 
          $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
@@ -368,25 +332,19 @@ 
     }
 
    /* Replace the values of the image map contents */
-   function replaceImageMapValues($Title, $Values)
-    {
+   function replaceImageMapValues($Title, $Values) {
      if ( $this->ImageMapStorageMode == NULL ) { return(-1); }
 
      $Values = $this->removeVOIDFromArray($Title, $Values);
      $ID = 0; 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION ) {
        if(!isset($_SESSION)) { return(-1); }
        foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $_SESSION[$this->ImageMapIndex][$Key][4] = $Values[$ID]; } $ID++; } }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE ) {
        $TempArray = "";
        $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
-       if ($Handle)
-        {
-         while (($Buffer = fgets($Handle, 4096)) !== false)
-          {
+       if ($Handle) {
+         while (($Buffer = fgets($Handle, 4096)) !== false) {
            $Fields      = split(IMAGE_MAP_DELIMITER,str_replace(array(chr(10),chr(13)),"",$Buffer));
            $TempArray[] = array($Fields[0],$Fields[1],$Fields[2],$Fields[3],$Fields[4]);
           }
@@ -403,24 +361,18 @@ 
     }
 
    /* Dump the image map */
-   function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp")
-    {
+   function dumpImageMap($Name="pChart",$StorageMode=IMAGE_MAP_STORAGE_SESSION,$UniqueID="imageMap",$StorageFolder="tmp") {
      $this->ImageMapIndex 		= $Name;
      $this->ImageMapStorageMode		= $StorageMode;
 
-     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION )
-      {
+     if ( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_SESSION ) {
        if(!isset($_SESSION)) { session_start(); }
-       if ( $_SESSION[$Name] != NULL )
-        {
+       if ( $_SESSION[$Name] != NULL ) {
          foreach($_SESSION[$Name] as $Key => $Params)
           { echo $Params[0].IMAGE_MAP_DELIMITER.$Params[1].IMAGE_MAP_DELIMITER.$Params[2].IMAGE_MAP_DELIMITER.$Params[3].IMAGE_MAP_DELIMITER.$Params[4]."\r\n"; }
         }
-      }
-     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
-      {
-       if (file_exists($StorageFolder."/".$UniqueID.".map"))
-        {
+      } elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE ) {
+       if (file_exists($StorageFolder."/".$UniqueID.".map")) {
          $Handle = @fopen($StorageFolder."/".$UniqueID.".map", "r");
          if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
          fclose($Handle);
@@ -434,8 +386,7 @@ 
     }
 
    /* Return the HTML converted color from the RGB composite values */
-   function toHTMLColor($R,$G,$B)
-    {
+   function toHTMLColor($R,$G,$B) {
      $R=intval($R); $G=intval($G); $B=intval($B);
      $R=dechex($R<0?0:($R>255?255:$R)); $G=dechex($G<0?0:($G>255?255:$G));$B=dechex($B<0?0:($B>255?255:$B));
      $Color="#".(strlen($R) < 2?'0':'').$R; $Color.=(strlen($G) < 2?'0':'').$G; $Color.= (strlen($B) < 2?'0':'').$B;
@@ -443,16 +394,14 @@ 
     }
 
    /* Reverse an array of points */
-   function reversePlots($Plots)
-    {
+   function reversePlots($Plots) {
      $Result = "";
      for($i=count($Plots)-2;$i>=0;$i=$i-2) { $Result[] = $Plots[$i]; $Result[] = $Plots[$i+1]; }
      return($Result);
     }
 
    /* Mirror Effect */
-   function drawAreaMirror($X,$Y,$Width,$Height,$Format="")
-    {
+   function drawAreaMirror($X,$Y,$Width,$Height,$Format="") {
      $StartAlpha	= isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
      $EndAlpha		= isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
 
@@ -461,8 +410,7 @@ 
      $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
      imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
      
-     for($i=1;$i<=$Height;$i++)
-      {
+     for($i=1;$i<=$Height;$i++) {
        if ( $Y+($i-1) < $this->YSize && $Y-$i > 0 ) { imagecopymerge($Picture,$this->Picture,$X,$Y+($i-1),$X,$Y-$i,$Width,1,$StartAlpha-$AlphaStep*$i); }
       }
 

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pCache.class.php

Braces +19 added lines, -38 removed lines

@@ -14,15 +14,13 @@ 
  */
 
  /* pData class definition */
- class pCache
-  {
+ class pCache {
    var $CacheFolder;
    var $CacheIndex;
    var $CacheDB;
 
    /* Class creator */
-   function pCache($Settings="")
-    {
+   function pCache($Settings="") {
      $CacheFolder	= isset($Settings["CacheFolder"]) ? $Settings["CacheFolder"] : "cache";
      $CacheIndex	= isset($Settings["CacheIndex"]) ? $Settings["CacheIndex"] : "index.db";
      $CacheDB		= isset($Settings["CacheDB"]) ? $Settings["CacheDB"] : "cache.db";
@@ -36,8 +34,7 @@ 
     }
 
    /* Flush the cache contents */
-   function flush()
-    {
+   function flush() {
      if (file_exists($this->CacheFolder."/".$this->CacheIndex)) { unlink($this->CacheFolder."/".$this->CacheIndex); touch($this->CacheFolder."/".$this->CacheIndex); }
      if (file_exists($this->CacheFolder."/".$this->CacheDB))    { unlink($this->CacheFolder."/".$this->CacheDB); touch($this->CacheFolder."/".$this->CacheDB); }
     }
@@ -47,8 +44,7 @@ 
     { return(md5($Marker.serialize($Data->Data))); }
 
    /* Write the generated picture to the cache */
-   function writeToCache($ID,$pChartObject)
-    {
+   function writeToCache($ID,$pChartObject) {
      /* Compute the paths */
      $TemporaryFile = $this->CacheFolder."/tmp_".rand(0,1000).".png";
      $Database      = $this->CacheFolder."/".$this->CacheDB;
@@ -89,8 +85,7 @@ 
     { $this->dbRemoval(array("Name"=>$ID)); }
 
    /* Remove with specified criterias */
-   function dbRemoval($Settings)
-    {
+   function dbRemoval($Settings) {
      $ID     = isset($Settings["Name"]) ? $Settings["Name"] : NULL;
      $Expiry = isset($Settings["Expiry"]) ? $Settings["Expiry"] : -(24*60*60);
      $TS     = time()-$Expiry;
@@ -102,8 +97,7 @@ 
      $IndexTemp    = $this->CacheFolder."/".$this->CacheIndex.".tmp";
 
      /* Single file removal */
-     if ( $ID != NULL )
-      {
+     if ( $ID != NULL ) {
        /* Retrieve object informations */
        $Object = $this->isInCache($ID,TRUE);
 
@@ -122,23 +116,20 @@ 
      $DBTempHandle    = @fopen($DatabaseTemp, "w");
 
      /* Remove the selected ID from the database */
-     while (!feof($IndexHandle))
-      {
+     while (!feof($IndexHandle)) {
        $Entry    = fgets($IndexHandle, 4096);
        $Entry    = str_replace("\r","",$Entry);
        $Entry    = str_replace("\n","",$Entry);
        $Settings = preg_split("/,/",$Entry);
 
-       if ( $Entry != "" )
-        {
+       if ( $Entry != "" ) {
          $PicID       = $Settings[0];
          $DBPos       = $Settings[1];
          $PicSize     = $Settings[2];
          $GeneratedTS = $Settings[3];
          $Hits        = $Settings[4];
 
-         if ( $Settings[0] != $ID && $GeneratedTS > $TS)
-          {
+         if ( $Settings[0] != $ID && $GeneratedTS > $TS) {
            $CurrentPos  = ftell($DBTempHandle);
            fwrite($IndexTempHandle, $PicID.",".$CurrentPos.",".$PicSize.",".$GeneratedTS.",".$Hits."\r\n");
 
@@ -164,23 +155,19 @@ 
      rename($IndexTemp,$Index);
     }
 
-   function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE)
-    {
+   function isInCache($ID,$Verbose=FALSE,$UpdateHitsCount=FALSE) {
      /* Compute the paths */
      $Index = $this->CacheFolder."/".$this->CacheIndex;
 
      /* Search the picture in the index file */
      $Handle = @fopen($Index, "r");
-     while (!feof($Handle))
-      {
+     while (!feof($Handle)) {
        $IndexPos = ftell($Handle);
        $Entry = fgets($Handle, 4096);
-       if ( $Entry != "" )
-        {
+       if ( $Entry != "" ) {
          $Settings = preg_split("/,/",$Entry);
          $PicID    = $Settings[0];
-         if ( $PicID == $ID )
-          {
+         if ( $PicID == $ID ) {
            fclose($Handle);
 
            $DBPos       = $Settings[1];
@@ -188,8 +175,7 @@ 
            $GeneratedTS = $Settings[3];
            $Hits        = intval($Settings[4]);
 
-           if ( $UpdateHitsCount )
-            {
+           if ( $UpdateHitsCount ) {
              $Hits++;
              if ( strlen($Hits) < 7 ) { $Hits = $Hits.str_repeat(" ",7-strlen($Hits)); }
 
@@ -200,8 +186,7 @@ 
             }
 
            if ($Verbose)
-            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); }
-           else
+            { return(array("DBPos"=>$DBPos,"PicSize"=>$PicSize,"GeneratedTS"=>$GeneratedTS,"Hits"=>$Hits)); } else
             { return(TRUE); }
           }
         }
@@ -213,16 +198,14 @@ 
     }
 
    /* Automatic output method based on the calling interface */
-   function autoOutput($ID,$Destination="output.png")
-    {
+   function autoOutput($ID,$Destination="output.png") {
      if (php_sapi_name() == "cli")
       $this->saveFromCache($ID,$Destination);
      else
       $this->strokeFromCache($ID);
     }
 
-   function strokeFromCache($ID)
-    {
+   function strokeFromCache($ID) {
      /* Get the raw picture from the cache */
      $Picture = $this->getFromCache($ID);
 
@@ -235,8 +218,7 @@ 
      return(TRUE);
     }
 
-   function saveFromCache($ID,$Destination)
-    {
+   function saveFromCache($ID,$Destination) {
      /* Get the raw picture from the cache */
      $Picture = $this->getFromCache($ID);
 
@@ -252,8 +234,7 @@ 
      return(TRUE);
     }
 
-   function getFromCache($ID)
-    {
+   function getFromCache($ID) {
      /* Compute the path */
      $Database = $this->CacheFolder."/".$this->CacheDB;
 

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pIndicator.class.php

Braces +26 added lines, -55 removed lines

@@ -23,19 +23,16 @@ 
  define("INDICATOR_VALUE_LABEL"		, 700022);
 
  /* pIndicator class definition */
- class pIndicator
-  {
+ class pIndicator {
    var $pChartObject;
 
    /* Class creator */
-   function pIndicator($pChartObject)
-    {
+   function pIndicator($pChartObject) {
      $this->pChartObject = $pChartObject;
     }
 
    /* Draw an indicator */
-   function draw($X,$Y,$Width,$Height,$Format="")
-    {
+   function draw($X,$Y,$Width,$Height,$Format="") {
      $Values			= isset($Format["Values"]) ? $Format["Values"] : VOID;
      $IndicatorSections		= isset($Format["IndicatorSections"]) ? $Format["IndicatorSections"] : NULL;
      $ValueDisplay		= isset($Format["ValueDisplay"]) ? $Format["ValueDisplay"] : INDICATOR_VALUE_BUBBLE;
@@ -70,8 +67,7 @@ 
 
      /* Determine indicator visual configuration */
      $OverallMin = $IndicatorSections[0]["End"]; $OverallMax = $IndicatorSections[0]["Start"];
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
+     foreach ($IndicatorSections as $Key => $Settings) {
        if ( $Settings["End"] > $OverallMax )   { $OverallMax = $Settings["End"]; }
        if ( $Settings["Start"] < $OverallMin ) { $OverallMin = $Settings["Start"]; }
       }
@@ -79,16 +75,14 @@ 
      $XScale    = $RealWidth / ($OverallMax-$OverallMin);
 
      $X1 = $X; $ValuesPos = "";
-     foreach ($IndicatorSections as $Key => $Settings)
-      {
+     foreach ($IndicatorSections as $Key => $Settings) {
        $Color      = array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]);
        $Caption    = $Settings["Caption"];
        $SubCaption = $Settings["Start"]." - ".$Settings["End"];
 
        $X2 = $X1 + ($Settings["End"] - $Settings["Start"]) * $XScale;
 
-       if ( $Key == 0 && $DrawLeftHead )
-        {
+       if ( $Key == 0 && $DrawLeftHead ) {
          $Poly = ""; $Poly[] = $X1-1; $Poly[] = $Y; $Poly[] = $X1-1; $Poly[] = $Y+$Height; $Poly[] = $X1-1-$HeadSize; $Poly[] = $Y+($Height/2);
          $this->pChartObject->drawPolygon($Poly,$Color);
          $this->pChartObject->drawLine($X1-2,$Y,$X1-2-$HeadSize,$Y+($Height/2),$Color);
@@ -97,30 +91,23 @@ 
 
        /* Determine the position of the breaks */
        $Break = "";
-       foreach($Values as $iKey => $Value)
-        {
-         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
-          {
+       foreach($Values as $iKey => $Value) {
+         if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] ) {
            $XBreak  = $X1 + ($Value - $Settings["Start"]) * $XScale;
            $ValuesPos[$Value] = $XBreak;
            $Break[] = floor($XBreak);
           }
         }
 
-       if ( $ValueDisplay == INDICATOR_VALUE_LABEL )
-        {
+       if ( $ValueDisplay == INDICATOR_VALUE_LABEL ) {
          if ( $Break == "" )
           $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
-         else
-          {
+         else {
            sort($Break);
            $Poly = ""; $Poly[] = $X1; $Poly[] = $Y; $LastPointWritten = FALSE;
-           foreach($Break as $iKey => $Value)
-            {
+           foreach($Break as $iKey => $Value) {
              if ( $Value-5 >= $X1 )
-              { $Poly[] = $Value-5; $Poly[] = $Y; }
-             elseif ($X1 - ($Value-5) > 0 )
-              {
+              { $Poly[] = $Value-5; $Poly[] = $Y; } elseif ($X1 - ($Value-5) > 0 ) {
                $Offset = $X1 - ($Value-5);
                $Poly = ""; $Poly[] = $X1; $Poly[] = $Y + $Offset;
               }
@@ -128,9 +115,7 @@ 
              $Poly[] = $Value;   $Poly[] = $Y+5;
 
              if ( $Value+5 <= $X2 )
-              { $Poly[] = $Value+5; $Poly[] = $Y; }
-             elseif (($Value+5) > $X2 )
-              {
+              { $Poly[] = $Value+5; $Poly[] = $Y; } elseif (($Value+5) > $X2 ) {
                $Offset = ($Value+5) - $X2;
                $Poly[] = $X2; $Poly[] = $Y + $Offset;
                $LastPointWritten = TRUE;
@@ -143,37 +128,31 @@ 
 
            $this->pChartObject->drawPolygon($Poly,$Color);
           }
-        }
-       else
+        } else
         $this->pChartObject->drawFilledRectangle($X1,$Y,$X2,$Y+$Height,$Color);
 
-       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead )
-        {
+       if ( $Key == count($IndicatorSections)-1 && $DrawRightHead ) {
          $Poly = ""; $Poly[] = $X2+1; $Poly[] = $Y; $Poly[] = $X2+1; $Poly[] = $Y+$Height; $Poly[] = $X2+1+$HeadSize; $Poly[] = $Y+($Height/2);
          $this->pChartObject->drawPolygon($Poly,$Color);
          $this->pChartObject->drawLine($X2+1,$Y,$X2+1+$HeadSize,$Y+($Height/2),$Color);
          $this->pChartObject->drawLine($X2+1,$Y+$Height,$X2+1+$HeadSize,$Y+($Height/2),$Color);
         }
 
-       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE )
-        {
+       if ( $CaptionPosition == INDICATOR_CAPTION_INSIDE ) {
          $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
          $YOffset = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding;
 
-         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
-          {
+         if ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED ) {
            $TxtPos  = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$SubCaption);
            $YOffset = $YOffset + ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]) + $TextPadding*2;
           }
 
          $XOffset = $TextPadding;
-        }
-       else
+        } else
         { $YOffset = 0; $XOffset = 0; }
 
        if ( $CaptionColorFactor == NULL )
-        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); }
-       else
+        { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha); } else
         { $CaptionColor    = array("Align"=>TEXT_ALIGN_TOPLEFT,"FontName"=>$CaptionFontName,"FontSize"=>$CaptionFontSize,"R"=>$Settings["R"]+$CaptionColorFactor,"G"=>$Settings["G"]+$CaptionColorFactor,"B"=>$Settings["B"]+$CaptionColorFactor); }
 
        if ( $SubCaptionColorFactor == NULL )
@@ -186,8 +165,7 @@ 
 
        if ( $CaptionLayout == INDICATOR_CAPTION_DEFAULT )
         $this->pChartObject->drawText($X1,$Y+$Height+$TextPadding,$Caption,$CaptionColor);
-       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED )
-        {
+       elseif ( $CaptionLayout == INDICATOR_CAPTION_EXTENDED ) {
          $TxtPos        = $this->pChartObject->getTextBox($X1,$Y+$Height+$TextPadding,$CaptionFontName,$CaptionFontSize,0,$Caption);
          $CaptionHeight = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
 
@@ -203,18 +181,13 @@ 
      $RestoreShadow = $this->pChartObject->Shadow;
      $this->pChartObject->Shadow = FALSE;
 
-     foreach($Values as $Key => $Value)
-      {
-       if ( $Value >= $OverallMin && $Value <= $OverallMax )
-        {
-         foreach ($IndicatorSections as $Key => $Settings)
-          {
-           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] )
-            {
+     foreach($Values as $Key => $Value) {
+       if ( $Value >= $OverallMin && $Value <= $OverallMax ) {
+         foreach ($IndicatorSections as $Key => $Settings) {
+           if ( $Value >= $Settings["Start"] && $Value <= $Settings["End"] ) {
              $X1 = $ValuesPos[$Value]; //$X + $Key*$SectionsMargin + ($Value - $OverallMin) * $XScale;
 
-             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE )
-              {
+             if ( $ValueDisplay == INDICATOR_VALUE_BUBBLE ) {
                $TxtPos = $this->pChartObject->getTextBox($X1,$Y,$ValueFontName,$ValueFontSize,0,$Value.$Unit);
                $Radius = floor(($TxtPos[1]["X"] - $TxtPos[0]["X"] + $TextPadding*4)/2);
 
@@ -223,9 +196,7 @@ 
 
                $TextSettings = array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontName"=>$ValueFontName,"FontSize"=>$ValueFontSize);
                $this->pChartObject->drawText($X1-1,$Y-1,$Value.$Unit,$TextSettings);
-              }
-             elseif( $ValueDisplay == INDICATOR_VALUE_LABEL )
-              {
+              } elseif( $ValueDisplay == INDICATOR_VALUE_LABEL ) {
                $Caption = "";
                $Caption[] = array("Format"=>array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"],"Alpha"=>100),"Caption"=>$Value.$Unit);
                $this->pChartObject->drawLabelBox(floor($X1),floor($Y)+2,"Value - ".$Settings["Caption"],$Caption);

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pData.class.php

Braces +83 added lines, -163 removed lines

@@ -52,8 +52,7 @@ 
  define("EURO_SYMBOL"			, utf8_encode("€"));
 
  /* pData class definition */
- class pData
-  {
+ class pData {
    var $Data;
 
    var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
@@ -66,8 +65,7 @@ 
                         "7"=>array("R"=>224,"G"=>176,"B"=>46,"Alpha"=>100));
 
    /* Class creator */
-   function pData()
-    {
+   function pData() {
      $this->Data = "";
      $this->Data["XAxisDisplay"]	= AXIS_FORMAT_DEFAULT;
      $this->Data["XAxisFormat"]		= NULL;
@@ -82,21 +80,17 @@ 
     }
 
    /* Add a single point or an array to the given serie */
-   function addPoints($Values,$SerieName="Serie1")
-    {
+   function addPoints($Values,$SerieName="Serie1") {
      if (!isset($this->Data["Series"][$SerieName]))
       $this->initialise($SerieName);
 
-     if ( is_array($Values) )
-      {
+     if ( is_array($Values) ) {
        foreach($Values as $Key => $Value)
         { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
-      }
-     else
+      } else
       $this->Data["Series"][$SerieName]["Data"][] = $Values;
 
-     if ( $Values != VOID )
-      {
+     if ( $Values != VOID ) {
        $StrippedData = $this->stripVOID($this->Data["Series"][$SerieName]["Data"]);
        if ( empty($StrippedData) ) { $this->Data["Series"][$SerieName]["Max"] = 0; $this->Data["Series"][$SerieName]["Min"] =0; return(0); }
        $this->Data["Series"][$SerieName]["Max"] = max($StrippedData);
@@ -113,8 +107,7 @@ 
     { if (isset($this->Data["Series"][$Serie]["Data"])) { return(sizeof($this->Data["Series"][$Serie]["Data"])); } else { return(0); } }
 
    /* Remove a serie from the pData object */
-   function removeSerie($Series)
-    {
+   function removeSerie($Series) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
     }
@@ -128,8 +121,7 @@ 
     { if (isset($this->Data["Series"][$Serie]["Data"])) { return($this->Data["Series"][$Serie]["Data"]); } else { return(NULL); } }
 
    /* Reverse the values in the given serie */
-   function reverseSerie($Series)
-    {
+   function reverseSerie($Series) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]["Data"])) { $this->Data["Series"][$Serie]["Data"] = array_reverse($this->Data["Series"][$Serie]["Data"]); } }
     }
@@ -147,29 +139,25 @@ 
     { if (isset($this->Data["Series"][$Serie]["Min"])) { return($this->Data["Series"][$Serie]["Min"]); } else { return(NULL); } }
 
    /* Set the description of a given serie */
-   function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
-    {
+   function setSerieShape($Series,$Shape=SERIE_SHAPE_FILLEDCIRCLE) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Shape"] = $Shape; } }
     }
 
    /* Set the description of a given serie */
-   function setSerieDescription($Series,$Description="My serie")
-    {
+   function setSerieDescription($Series,$Description="My serie") {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Description"] = $Description; } }
     }
 
    /* Set a serie as "drawable" while calling a rendering function */
-   function setSerieDrawable($Series,$Drawable=TRUE)
-    {
+   function setSerieDrawable($Series,$Drawable=TRUE) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["isDrawable"] = $Drawable; } }
     }
 
    /* Set the icon associated to a given serie */
-   function setSeriePicture($Series,$Picture=NULL)
-    {
+   function setSeriePicture($Series,$Picture=NULL) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Picture"] = $Picture; } }
     }
@@ -226,15 +214,13 @@ 
     { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Weight"] = $Weight; } }
 
    /* Associate a color to a scatter serie */
-   function setScatterSerieColor($ID,$Format)
-    {
+   function setScatterSerieColor($ID,$Format) {
      $R	    = isset($Format["R"]) ? $Format["R"] : 0;
      $G	    = isset($Format["G"]) ? $Format["G"] : 0;
      $B	    = isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
-     if ( isset($this->Data["ScatterSeries"][$ID]) )
-      {
+     if ( isset($this->Data["ScatterSeries"][$ID]) ) {
        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
        $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
@@ -243,15 +229,12 @@ 
     }
 
    /* Compute the series limits for an individual and global point of view */
-   function limits()
-    {
+   function limits() {
      $GlobalMin = ABSOLUTE_MAX;
      $GlobalMax = ABSOLUTE_MIN;
 
-     foreach($this->Data["Series"] as $Key => $Value)
-      {
-       if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE)
-        {
+     foreach($this->Data["Series"] as $Key => $Value) {
+       if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"] == TRUE) {
          if ( $GlobalMin > $this->Data["Series"][$Key]["Min"] ) { $GlobalMin = $this->Data["Series"][$Key]["Min"]; }
          if ( $GlobalMax < $this->Data["Series"][$Key]["Max"] ) { $GlobalMax = $this->Data["Series"][$Key]["Max"]; }
         }
@@ -267,68 +250,55 @@ 
     { foreach($this->Data["Series"] as $Key => $Value) { if ( $this->Data["Abscissa"] != $Key ) { $this->Data["Series"][$Key]["isDrawable"]=TRUE; } } }    
 
    /* Return the average value of the given serie */
-   function getSerieAverage($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getSerieAverage($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        return(array_sum($SerieData)/sizeof($SerieData));
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the geometric mean of the given serie */
-   function getGeometricMean($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getGeometricMean($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        $Seriesum  = 1; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum * $Value; }
        return(pow($Seriesum,1/sizeof($SerieData)));
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the harmonic mean of the given serie */
-   function getHarmonicMean($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getHarmonicMean($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        $Seriesum  = 0; foreach($SerieData as $Key => $Value) { $Seriesum = $Seriesum + 1/$Value; }
        return(sizeof($SerieData)/$Seriesum);
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the standard deviation of the given serie */
-   function getStandardDeviation($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getStandardDeviation($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $Average   = $this->getSerieAverage($Serie);
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
 
        $DeviationSum = 0;
-       foreach($SerieData as $Key => $Value)
-        $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
+       foreach($SerieData as $Key => $Value) {
+               $DeviationSum = $DeviationSum + ($Value-$Average)*($Value-$Average);
+       }
 
        $Deviation = sqrt($DeviationSum/count($SerieData));
 
        return($Deviation);
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the Coefficient of variation of the given serie */
-   function getCoefficientOfVariation($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getCoefficientOfVariation($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $Average           = $this->getSerieAverage($Serie);
        $StandardDeviation = $this->getStandardDeviation($Serie);
 
@@ -336,16 +306,13 @@ 
         return($StandardDeviation/$Average);
        else
         return(NULL);
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the median value of the given serie */
-   function getSerieMedian($Serie)
-    {
-     if ( isset($this->Data["Series"][$Serie]) )
-      {
+   function getSerieMedian($Serie) {
+     if ( isset($this->Data["Series"][$Serie]) ) {
        $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
        sort($SerieData);
        $SerieCenter = floor(sizeof($SerieData)/2);
@@ -354,14 +321,12 @@ 
         return($SerieData[$SerieCenter]);
        else
         return(NULL);
-      }
-     else
+      } else
       return(NULL);
     }
 
    /* Return the x th percentil of the given serie */
-   function getSeriePercentile($Serie="Serie1",$Percentil=95)
-    {
+   function getSeriePercentile($Serie="Serie1",$Percentil=95) {
      if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
 
      $Values = count($this->Data["Series"][$Serie]["Data"])-1;
@@ -378,23 +343,20 @@ 
     }
 
    /* Add random values to a given serie */
-   function addRandomValues($SerieName="Serie1",$Options="")
-    {
+   function addRandomValues($SerieName="Serie1",$Options="") {
      $Values    = isset($Options["Values"]) ? $Options["Values"] : 20;
      $Min       = isset($Options["Min"]) ? $Options["Min"] : 0;
      $Max       = isset($Options["Max"]) ? $Options["Max"] : 100;
      $withFloat = isset($Options["withFloat"]) ? $Options["withFloat"] : FALSE;
 
-     for ($i=0;$i<=$Values;$i++)
-      {
+     for ($i=0;$i<=$Values;$i++) {
        if ( $withFloat ) { $Value = rand($Min*100,$Max*100)/100; } else { $Value = rand($Min,$Max); }
        $this->addPoints($Value,$SerieName);
       }
     }
 
    /* Test if we have valid data */
-   function containsData()
-    {
+   function containsData() {
      if (!isset($this->Data["Series"])) { return(FALSE); }
 
      $Result = FALSE;
@@ -404,10 +366,8 @@ 
     }
 
    /* Set the display mode of an Axis */
-   function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL)
-    {
-     if ( isset($this->Data["Axis"][$AxisID] ) )
-      {
+   function setAxisDisplay($AxisID,$Mode=AXIS_FORMAT_DEFAULT,$Format=NULL) {
+     if ( isset($this->Data["Axis"][$AxisID] ) ) {
        $this->Data["Axis"][$AxisID]["Display"] = $Mode;
        if ( $Format != NULL ) { $this->Data["Axis"][$AxisID]["Format"] = $Format; }
       }
@@ -426,15 +386,13 @@ 
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Name"] = $Name; } }
 
    /* Associate a color to an axis */
-   function setAxisColor($AxisID,$Format)
-    {
+   function setAxisColor($AxisID,$Format) {
      $R	    = isset($Format["R"]) ? $Format["R"] : 0;
      $G	    = isset($Format["G"]) ? $Format["G"] : 0;
      $B	    = isset($Format["B"]) ? $Format["B"] : 0;
      $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
-     if ( isset($this->Data["Axis"][$AxisID] ) )
-      {
+     if ( isset($this->Data["Axis"][$AxisID] ) ) {
        $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
        $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
        $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
@@ -448,11 +406,9 @@ 
     { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Identity"] = $Identity; } }
 
    /* Associate one data serie with one axis */
-   function setSerieOnAxis($Series,$AxisID)
-    {
+   function setSerieOnAxis($Series,$AxisID) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $Serie)
-      {
+     foreach($Series as $Key => $Serie) {
        $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
 
        /* Create missing axis */
@@ -469,22 +425,19 @@ 
     }
 
    /* Define if a serie should be draw with ticks */
-   function setSerieTicks($Series,$Width=0)
-    {
+   function setSerieTicks($Series,$Width=0) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Ticks"] = $Width; } }
     }
 
    /* Define if a serie should be draw with a special weight */
-   function setSerieWeight($Series,$Weight=0)
-    {
+   function setSerieWeight($Series,$Weight=0) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
      foreach($Series as $Key => $Serie) { if ( isset($this->Data["Series"][$Serie]) ) { $this->Data["Series"][$Serie]["Weight"] = $Weight; } }
     }
 
    /* Returns the palette of the given serie */
-   function getSeriePalette($Serie)
-    {
+   function getSeriePalette($Serie) {
      if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
 
      $Result = "";
@@ -497,19 +450,16 @@ 
     }
 
    /* Set the color of one serie */
-   function setPalette($Series,$Format=NULL)
-    {
+   function setPalette($Series,$Format=NULL) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
 
-     foreach($Series as $Key => $Serie)
-      {
+     foreach($Series as $Key => $Serie) {
        $R	    = isset($Format["R"]) ? $Format["R"] : 0;
        $G	    = isset($Format["G"]) ? $Format["G"] : 0;
        $B	    = isset($Format["B"]) ? $Format["B"] : 0;
        $Alpha = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
 
-       if ( isset($this->Data["Series"][$Serie]) )
-        {
+       if ( isset($this->Data["Series"][$Serie]) ) {
          $OldR = $this->Data["Series"][$Serie]["Color"]["R"]; $OldG = $this->Data["Series"][$Serie]["Color"]["G"]; $OldB = $this->Data["Series"][$Serie]["Color"]["B"];
          $this->Data["Series"][$Serie]["Color"]["R"] = $R;
          $this->Data["Series"][$Serie]["Color"]["G"] = $G;
@@ -524,18 +474,15 @@ 
     }
 
    /* Load a palette file */
-   function loadPalette($FileName,$Overwrite=FALSE)
-    {
+   function loadPalette($FileName,$Overwrite=FALSE) {
      if ( !file_exists($FileName) ) { return(-1); }
      if ( $Overwrite ) { $this->Palette = ""; }
 
      $fileHandle = @fopen($FileName, "r");
      if (!$fileHandle) { return(-1); }
-     while (!feof($fileHandle))
-      {
+     while (!feof($fileHandle)) {
        $buffer = fgets($fileHandle, 4096);
-       if ( preg_match("/,/",$buffer) )
-        {
+       if ( preg_match("/,/",$buffer) ) {
          list($R,$G,$B,$Alpha) = preg_split("/,/",$buffer);
          if ( $this->Palette == "" ) { $ID = 0; } else { $ID = count($this->Palette); }
          $this->Palette[$ID] = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
@@ -545,10 +492,8 @@ 
 
      /* Apply changes to current series */
      $ID = 0;
-     if ( isset($this->Data["Series"]))
-      {
-       foreach($this->Data["Series"] as $Key => $Value)
-        {
+     if ( isset($this->Data["Series"])) {
+       foreach($this->Data["Series"] as $Key => $Value) {
          if ( !isset($this->Palette[$ID]) )
           $this->Data["Series"][$Key]["Color"] = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>0);
          else
@@ -559,8 +504,7 @@ 
     }
 
    /* Initialise a given scatter serie */
-   function initScatterSerie($ID)
-    {
+   function initScatterSerie($ID) {
      if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
 
      $this->Data["ScatterSeries"][$ID]["Description"]	= "Scatter ".$ID;
@@ -571,8 +515,7 @@ 
 
      if ( isset($this->Palette[$ID]) )
       $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
-     else
-      {
+     else {
        $this->Data["ScatterSeries"][$ID]["Color"]["R"] = rand(0,255);
        $this->Data["ScatterSeries"][$ID]["Color"]["G"] = rand(0,255);
        $this->Data["ScatterSeries"][$ID]["Color"]["B"] = rand(0,255);
@@ -581,8 +524,7 @@ 
     }
 
    /* Initialise a given serie */
-   function initialise($Serie)
-    {
+   function initialise($Serie) {
      if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
 
      $this->Data["Series"][$Serie]["Description"]	= $Serie;
@@ -597,8 +539,7 @@ 
 
      if ( isset($this->Palette[$ID]) )
       $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
-     else
-      {
+     else {
        $this->Data["Series"][$Serie]["Color"]["R"] = rand(0,255);
        $this->Data["Series"][$Serie]["Color"]["G"] = rand(0,255);
        $this->Data["Series"][$Serie]["Color"]["B"] = rand(0,255);
@@ -606,20 +547,16 @@ 
       }
     }
      
-   function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
-    {
+   function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1) {
      $Abscissa = $this->Data["Abscissa"];
 
      $SelectedSeries = "";
      $MaxVal         = 0;
-     foreach($this->Data["Axis"] as $AxisID => $Axis)
-      {
+     foreach($this->Data["Axis"] as $AxisID => $Axis) {
        if ( $UnitChange != NULL ) { $this->Data["Axis"][$AxisID]["Unit"] = $UnitChange; }
 
-       foreach($this->Data["Series"] as $SerieName => $Serie)
-        {
-         if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa)
-          {
+       foreach($this->Data["Series"] as $SerieName => $Serie) {
+         if ($Serie["Axis"] == $AxisID && $Serie["isDrawable"] == TRUE && $SerieName != $Abscissa) {
            $SelectedSeries[$SerieName] = $SerieName;
 
            if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
@@ -627,22 +564,18 @@ 
         }
       }
 
-     for($i=0;$i<=$MaxVal-1;$i++)
-      {
+     for($i=0;$i<=$MaxVal-1;$i++) {
        $Factor = 0;
-       foreach ($SelectedSeries as $Key => $SerieName )
-        {
+       foreach ($SelectedSeries as $Key => $SerieName ) {
          $Value = $this->Data["Series"][$SerieName]["Data"][$i];
          if ( $Value != VOID )
           $Factor = $Factor + abs($Value);
         }
 
-       if ( $Factor != 0 )
-        {
+       if ( $Factor != 0 ) {
          $Factor = $NormalizationFactor / $Factor;
 
-         foreach ($SelectedSeries as $Key => $SerieName )
-          {
+         foreach ($SelectedSeries as $Key => $SerieName ) {
            $Value = $this->Data["Series"][$SerieName]["Data"][$i];
 
            if ( $Value != VOID && $Factor != $NormalizationFactor )
@@ -655,41 +588,33 @@ 
         }
       }
 
-     foreach ($SelectedSeries as $Key => $SerieName )
-      {
+     foreach ($SelectedSeries as $Key => $SerieName ) {
        $this->Data["Series"][$SerieName]["Max"] = max($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
        $this->Data["Series"][$SerieName]["Min"] = min($this->stripVOID($this->Data["Series"][$SerieName]["Data"]));
       }
     }
 
    /* Load data from a CSV (or similar) data source */
-   function importFromCSV($FileName,$Options="")
-    {
+   function importFromCSV($FileName,$Options="") {
      $Delimiter		= isset($Options["Delimiter"]) ? $Options["Delimiter"] : ",";
      $GotHeader		= isset($Options["GotHeader"]) ? $Options["GotHeader"] : FALSE;
      $SkipColumns	= isset($Options["SkipColumns"]) ? $Options["SkipColumns"] : array(-1);
      $DefaultSerieName	= isset($Options["DefaultSerieName"]) ? $Options["DefaultSerieName"] : "Serie";
 
      $Handle = @fopen($FileName,"r");
-     if ($Handle)
-      {
+     if ($Handle) {
        $HeaderParsed = FALSE; $SerieNames = "";
-       while (!feof($Handle))
-        {
+       while (!feof($Handle)) {
          $Buffer = fgets($Handle, 4096);
          $Buffer = str_replace(chr(10),"",$Buffer);
          $Buffer = str_replace(chr(13),"",$Buffer);
          $Values = preg_split("/".$Delimiter."/",$Buffer);
 
-         if ( $Buffer != "" )
-          {
-           if ( $GotHeader && !$HeaderParsed )
-            {
+         if ( $Buffer != "" ) {
+           if ( $GotHeader && !$HeaderParsed ) {
              foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
              $HeaderParsed = TRUE;
-            }
-           else
-            {
+            } else {
              if ($SerieNames == "" ) { foreach($Values as $Key => $Name) {  if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $DefaultSerieName.$Key; } } }
              foreach($Values as $Key => $Value) {  if ( !in_array($Key,$SkipColumns) ) { $this->addPoints($Value,$SerieNames[$Key]); } }
             }
@@ -700,8 +625,7 @@ 
     }
 
    /* Create a dataset based on a formula */
-   function createFunctionSerie($SerieName,$Formula="",$Options="")
-    {
+   function createFunctionSerie($SerieName,$Formula="",$Options="") {
      $MinX		= isset($Options["MinX"]) ? $Options["MinX"] : -10;
      $MaxX		= isset($Options["MaxX"]) ? $Options["MaxX"] : 10;
      $XStep		= isset($Options["XStep"]) ? $Options["XStep"] : 1;
@@ -712,8 +636,7 @@ 
      if ( $Formula == "" ) { return(0); }
 
      $Result = ""; $Abscissa = "";
-     for($i=$MinX; $i<=$MaxX; $i=$i+$XStep)
-      {
+     for($i=$MinX; $i<=$MaxX; $i=$i+$XStep) {
        $Expression = "\$return = '!'.(".str_replace("z",$i,$Formula).");";
        if ( @eval($Expression) === FALSE ) { $return = VOID; }
        if ( $return == "!" ) { $return = VOID; } else { $return = $this->right($return,strlen($return)-1); }
@@ -730,13 +653,10 @@ 
      if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
     }
 
-   function negateValues($Series)
-    {
+   function negateValues($Series) {
      if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
-     foreach($Series as $Key => $SerieName)
-      {
-       if (isset($this->Data["Series"][$SerieName]))
-        {
+     foreach($Series as $Key => $SerieName) {
+       if (isset($this->Data["Series"][$SerieName])) {
          $Data = "";
          foreach($this->Data["Series"][$SerieName]["Data"] as $Key => $Value)
           { if ( $Value == VOID ) { $Data[] = VOID; } else { $Data[] = -$Value; } }

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pScatter.class.php

Braces +112 added lines, -236 removed lines

@@ -17,21 +17,18 @@ 
  define("SCATTER_MISSING_Y_SERIE"	, 190002);
 
  /* pScatter class definition */
- class pScatter
-  {
+ class pScatter {
    var $pChartObject;
    var $pDataObject;
 
    /* Class creator */
-   function pScatter($pChartObject,$pDataObject)
-    {
+   function pScatter($pChartObject,$pDataObject) {
      $this->pChartObject = $pChartObject;
      $this->pDataObject  = $pDataObject;
     }
 
    /* Prepare the scale */
-   function drawScatterScale($Format="")
-    {
+   function drawScatterScale($Format="") {
      $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
      $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
      $XLabelsRotation	= isset($Format["XLabelsRotation"]) ? $Format["XLabelsRotation"] : 90;
@@ -80,8 +77,7 @@ 
 
      /* Check if we have at least both one X and Y axis */
      $GotXAxis = FALSE; $GotYAxis = FALSE;
-     foreach($this->pDataObject->Data["Axis"] as $AxisID => $AxisSettings)
-      {
+     foreach($this->pDataObject->Data["Axis"] as $AxisID => $AxisSettings) {
        if ( $AxisSettings["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
        if ( $AxisSettings["Identity"] == AXIS_Y ) { $GotYAxis = TRUE; }
       }
@@ -93,20 +89,15 @@ 
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["Axis"] as $AxisID => $AxisSettings)
-      {
+     foreach($Data["Axis"] as $AxisID => $AxisSettings) {
        if ( $AxisSettings["Identity"] == AXIS_X)
-        { $Width = $this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2; }
-       else
+        { $Width = $this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1 - $XMargin*2; } else
         { $Width = $this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1 - $YMargin*2; }
 
        $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
-       if ( $Mode == SCALE_MODE_FLOATING )
-        {
-         foreach($Data["Series"] as $SerieID => $SerieParameter)
-          {
-           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] )
-            {
+       if ( $Mode == SCALE_MODE_FLOATING ) {
+         foreach($Data["Series"] as $SerieID => $SerieParameter) {
+           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] ) {
              $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
              $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
             }
@@ -114,23 +105,18 @@ 
          $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
 
          $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
-        }
-       elseif ( $Mode == SCALE_MODE_MANUAL )
-        {
-         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) )
-          {
+        } elseif ( $Mode == SCALE_MODE_MANUAL ) {
+         if ( isset($ManualScale[$AxisID]["Min"]) && isset($ManualScale[$AxisID]["Max"]) ) {
            $Data["Axis"][$AxisID]["Min"] = $ManualScale[$AxisID]["Min"];
            $Data["Axis"][$AxisID]["Max"] = $ManualScale[$AxisID]["Max"];
-          }
-         else
+          } else
           { echo "Manual scale boundaries not set."; exit(); }
         }
 
        /* Full manual scale */
        if ( isset($ManualScale[$AxisID]["Rows"]) && isset($ManualScale[$AxisID]["RowHeight"]) )
         $Scale = array("Rows"=>$ManualScale[$AxisID]["Rows"],"RowHeight"=>$ManualScale[$AxisID]["RowHeight"],"XMin"=>$ManualScale[$AxisID]["Min"],"XMax"=>$ManualScale[$AxisID]["Max"]);
-       else
-        {
+       else {
          $MaxDivs = floor($Width/$MinDivHeight);
          $Scale   = $this->pChartObject->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
         }
@@ -154,34 +140,27 @@ 
      /* Set the original boundaries */
      $AxisPos["L"] = $this->pChartObject->GraphAreaX1; $AxisPos["R"] = $this->pChartObject->GraphAreaX2; $AxisPos["T"] = $this->pChartObject->GraphAreaY1; $AxisPos["B"] = $this->pChartObject->GraphAreaY2;
 
-     foreach($Data["Axis"] as $AxisID => $AxisSettings)
-      {
-       if ( isset($AxisSettings["Color"]) )
-        {
+     foreach($Data["Axis"] as $AxisID => $AxisSettings) {
+       if ( isset($AxisSettings["Color"]) ) {
          $AxisR = $AxisSettings["Color"]["R"]; $AxisG = $AxisSettings["Color"]["G"]; $AxisB = $AxisSettings["Color"]["B"];
          $TickR = $AxisSettings["Color"]["R"]; $TickG = $AxisSettings["Color"]["G"]; $TickB = $AxisSettings["Color"]["B"];
          $this->pChartObject->setFontProperties(array("R"=>$AxisSettings["Color"]["R"],"G"=>$AxisSettings["Color"]["G"],"B"=>$AxisSettings["Color"]["B"]));
-        }
-       else
-        {
+        } else {
          $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
          $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
          $this->pChartObject->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
         }
 
        $LastValue = "w00t"; $ID = 1;
-       if ( $AxisSettings["Identity"] == AXIS_X )
-        {
-         if ( $AxisSettings["Position"] == AXIS_POSITION_BOTTOM )
-          {
+       if ( $AxisSettings["Identity"] == AXIS_X ) {
+         if ( $AxisSettings["Position"] == AXIS_POSITION_BOTTOM ) {
            if ( $XLabelsRotation == 0 )				   { $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $LabelOffset = 2; }
            if ( $XLabelsRotation > 0 && $XLabelsRotation < 190 )   { $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
            if ( $XLabelsRotation == 180 )			   { $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 5; }
            if ( $XLabelsRotation > 180 && $XLabelsRotation < 360 ) { $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
 
            if ( $Floating )
-            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1,$AxisPos["B"],$this->pChartObject->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["B"],$this->pChartObject->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -189,8 +168,7 @@ 
            $Width = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $AxisSettings["Margin"]*2;
            $Step   = $Width / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
            $LastX  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
-            {
+           for($i=0;$i<=$AxisSettings["Rows"];$i++) {
              $XPos  = $this->pChartObject->GraphAreaX1 + $AxisSettings["Margin"] + $Step*$i;
              $YPos  = $AxisPos["B"];
              $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
@@ -210,8 +188,7 @@ 
              $LastX = $XPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
-            {
+           if ( isset($AxisSettings["Name"]) ) {
              $YPos   = $MaxBottom+2;
              $XPos   = $this->pChartObject->GraphAreaX1+($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1)/2;
              $Bounds = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
@@ -221,17 +198,14 @@ 
             }
 
            $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
-          }
-         elseif ( $AxisSettings["Position"] == AXIS_POSITION_TOP )
-          {
+          } elseif ( $AxisSettings["Position"] == AXIS_POSITION_TOP ) {
            if ( $XLabelsRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $LabelOffset = 2; }
            if ( $XLabelsRotation > 0 && $XLabelsRotation < 190 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $LabelOffset = 2; }
            if ( $XLabelsRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $LabelOffset = 5; }
            if ( $XLabelsRotation > 180 && $SLabelxRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $LabelOffset = 5; }
 
            if ( $Floating )
-            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $YMargin; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1+$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($this->pChartObject->GraphAreaX1,$AxisPos["T"],$this->pChartObject->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($this->pChartObject->GraphAreaX2-$AxisSettings["Margin"],$AxisPos["T"],$this->pChartObject->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -239,8 +213,7 @@ 
            $Width = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $AxisSettings["Margin"]*2;
            $Step   = $Width / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
            $LastX  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
-            {
+           for($i=0;$i<=$AxisSettings["Rows"];$i++) {
              $XPos  = $this->pChartObject->GraphAreaX1 + $AxisSettings["Margin"] + $Step*$i;
              $YPos  = $AxisPos["T"];
              $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
@@ -261,8 +234,7 @@ 
              $LastX = $XPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
-            {
+           if ( isset($AxisSettings["Name"]) ) {
              $YPos   = $MinTop-2;
              $XPos   = $this->pChartObject->GraphAreaX1+($this->pChartObject->GraphAreaX2-$this->pChartObject->GraphAreaX1)/2;
              $Bounds = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
@@ -273,15 +245,11 @@ 
 
            $AxisPos["T"] = $MinTop - $ScaleSpacing;
           }
-        }
-       elseif ( $AxisSettings["Identity"] == AXIS_Y )
-        {
-         if ( $AxisSettings["Position"] == AXIS_POSITION_LEFT )
-          {
+        } elseif ( $AxisSettings["Identity"] == AXIS_Y ) {
+         if ( $AxisSettings["Position"] == AXIS_POSITION_LEFT ) {
 
            if ( $Floating )
-            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["L"],$this->pChartObject->GraphAreaY1,$AxisPos["L"],$this->pChartObject->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($AxisPos["L"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["L"],$this->pChartObject->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -289,8 +257,7 @@ 
            $Height = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $AxisSettings["Margin"]*2;
            $Step   = $Height / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
            $LastY  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
-            {
+           for($i=0;$i<=$AxisSettings["Rows"];$i++) {
              $YPos  = $this->pChartObject->GraphAreaY2 - $AxisSettings["Margin"] - $Step*$i;
              $XPos  = $AxisPos["L"];
              $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
@@ -311,8 +278,7 @@ 
              $LastY = $YPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
-            {
+           if ( isset($AxisSettings["Name"]) ) {
              $XPos    = $MinLeft-2;
              $YPos    = $this->pChartObject->GraphAreaY1+($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1)/2;
              $Bounds  = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
@@ -322,13 +288,10 @@ 
             }
 
            $AxisPos["L"] = $MinLeft - $ScaleSpacing;
-          }
-         elseif ( $AxisSettings["Position"] == AXIS_POSITION_RIGHT )
-          {
+          } elseif ( $AxisSettings["Position"] == AXIS_POSITION_RIGHT ) {
 
            if ( $Floating )
-            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
-           else
+            { $FloatingOffset = $XMargin; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY2-$AxisSettings["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); } else
             { $FloatingOffset = 0; $this->pChartObject->drawLine($AxisPos["R"],$this->pChartObject->GraphAreaY1,$AxisPos["R"],$this->pChartObject->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
 
            if ( $DrawArrows ) { $this->pChartObject->drawArrow($AxisPos["R"],$this->pChartObject->GraphAreaY1+$AxisSettings["Margin"],$AxisPos["R"],$this->pChartObject->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
@@ -336,8 +299,7 @@ 
            $Height = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $AxisSettings["Margin"]*2;
            $Step   = $Height / $AxisSettings["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
            $LastY  = NULL;
-           for($i=0;$i<=$AxisSettings["Rows"];$i++)
-            {
+           for($i=0;$i<=$AxisSettings["Rows"];$i++) {
              $YPos  = $this->pChartObject->GraphAreaY2 - $AxisSettings["Margin"] - $Step*$i;
              $XPos  = $AxisPos["R"];
              $Value = $this->pChartObject->scaleFormat($AxisSettings["ScaleMin"] + $AxisSettings["RowHeight"]*$i,$AxisSettings["Display"],$AxisSettings["Format"],$AxisSettings["Unit"]);
@@ -358,8 +320,7 @@ 
              $LastY = $YPos;
             }
 
-           if ( isset($AxisSettings["Name"]) )
-            {
+           if ( isset($AxisSettings["Name"]) ) {
              $XPos    = $MaxLeft+6;
              $YPos    = $this->pChartObject->GraphAreaY1+($this->pChartObject->GraphAreaY2-$this->pChartObject->GraphAreaY1)/2;
              $Bounds  = $this->pChartObject->drawText($XPos,$YPos,$AxisSettings["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
@@ -377,8 +338,7 @@ 
     }
 
    /* Draw a scatter plot chart */
-   function drawScatterPlotChart($Format=NULL)
-    {
+   function drawScatterPlotChart($Format=NULL) {
      $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : 3;
      $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
      $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 250;
@@ -396,18 +356,15 @@ 
 
      $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
 
          if ( $ImageMapTitle == NULL ) { $Description = $Data["Series"][$Series["X"]]["Description"]." / ".$Data["Series"][$Series["Y"]]["Description"]; } else { $Description = $ImageMapTitle; }
          
          if ( isset($Series["Picture"]) && $Series["Picture"] != "" )
-          { $Picture = $Series["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->pChartObject->getPicInfo($Picture); }
-         else
+          { $Picture = $Series["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->pChartObject->getPicInfo($Picture); } else
           { $Picture = NULL; }
 
          $PosArrayX = $this->getPosArray($SerieValuesX,$SerieXAxis);
@@ -417,23 +374,18 @@ 
 
          $Color = array("R"=>$Series["Color"]["R"],"G"=>$Series["Color"]["G"],"B"=>$Series["Color"]["B"],"Alpha"=>$Series["Color"]["Alpha"]);
 
-         foreach($PosArrayX as $Key => $Value)
-          {
+         foreach($PosArrayX as $Key => $Value) {
            $X = $Value; $Y = $PosArrayY[$Key];
 
-           if ( $X != VOID && $Y != VOID )
-            {
+           if ( $X != VOID && $Y != VOID ) {
              $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".floor($PlotSize+$BorderSize),$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
 
              if( isset($Series["Shape"]) )
-              { $this->pChartObject->drawShape($X,$Y,$Series["Shape"],$PlotSize,$PlotBorder,$BorderSize,$Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"],$Series["Color"]["Alpha"],$BorderR,$BorderG,$BorderB,$BorderAlpha); }
-             elseif ( $Picture == NULL )
-              {
+              { $this->pChartObject->drawShape($X,$Y,$Series["Shape"],$PlotSize,$PlotBorder,$BorderSize,$Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"],$Series["Color"]["Alpha"],$BorderR,$BorderG,$BorderB,$BorderAlpha); } elseif ( $Picture == NULL ) {
                if ( $PlotBorder ) { $this->pChartObject->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,$BorderColor); }
                $this->pChartObject->drawFilledCircle($X,$Y,$PlotSize,$Color);
-              }
-             else
+              } else
               { $this->pChartObject->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
             }
           }
@@ -442,8 +394,7 @@ 
     }
 
    /* Draw a scatter line chart */
-   function drawScatterLineChart($Format=NULL)
-    {
+   function drawScatterLineChart($Format=NULL) {
      $Data		= $this->pDataObject->getData();
      $Palette		= $this->pDataObject->getPalette();
      $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
@@ -452,10 +403,8 @@ 
      $ImageMapPrecision = isset($Format["ImageMapPrecision"]) ? $Format["ImageMapPrecision"] : 2;
 
      /* Parse all the series to draw */
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
          $Ticks  = $Series["Ticks"];
@@ -473,12 +422,10 @@ 
          if ( $Weight != 0 ) { $Color["Weight"] = $Weight; }
 
          $LastX = VOID; $LastY = VOID;
-         foreach($PosArrayX as $Key => $Value)
-          {
+         foreach($PosArrayX as $Key => $Value) {
            $X = $Value; $Y = $PosArrayY[$Key];
 
-           if ( $X != VOID && $Y != VOID )
-            {
+           if ( $X != VOID && $Y != VOID ) {
              $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
             }
@@ -493,8 +440,7 @@ 
     }
 
    /* Draw a scatter spline chart */
-   function drawScatterSplineChart($Format=NULL)
-    {
+   function drawScatterSplineChart($Format=NULL) {
      $Data		= $this->pDataObject->getData();
      $Palette		= $this->pDataObject->getPalette();
      $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
@@ -502,10 +448,8 @@ 
      $ImageMapPlotSize	= isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 10;
      $ImageMapPrecision = isset($Format["ImageMapPrecision"]) ? $Format["ImageMapPrecision"] : 2;
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
          $Ticks  = $Series["Ticks"];
@@ -523,13 +467,11 @@ 
          if ( $Weight != 0 ) { $SplineSettings["Weight"] = $Weight; }
 
          $LastX = VOID; $LastY = VOID; $WayPoints = ""; $Forces = "";
-         foreach($PosArrayX as $Key => $Value)
-          {
+         foreach($PosArrayX as $Key => $Value) {
            $X = $Value; $Y = $PosArrayY[$Key];
            $Force = $this->pChartObject->getLength($LastX,$LastY,$X,$Y)/5;
 
-           if ( $X != VOID && $Y != VOID )
-            {
+           if ( $X != VOID && $Y != VOID ) {
              $RealValue = round($Data["Series"][$Series["X"]]["Data"][$Key],2)." / ".round($Data["Series"][$Series["Y"]]["Data"][$Key],2);
              if ( $RecordImageMap ) { $this->pChartObject->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->pChartObject->toHTMLColor($Series["Color"]["R"],$Series["Color"]["G"],$Series["Color"]["B"]),$Description,$RealValue); }
             }
@@ -549,21 +491,18 @@ 
     }
 
    /* Return the scaled plot position */
-   function getPosArray($Values,$AxisID)
-    {
+   function getPosArray($Values,$AxisID) {
      $Data = $this->pDataObject->getData();
 
      if ( !is_array($Values) ) { $Values = array($Values); }
 
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
-      {
+     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X ) {
        $Height      = ($this->pChartObject->GraphAreaX2 - $this->pChartObject->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
        $Step        = $Height / $ScaleHeight;
 
        $Result = "";
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          if ( $Value == VOID ) 
           $Result[] = VOID;
          else
@@ -571,16 +510,13 @@ 
         }
 
        if ( count($Result) == 1 ) { return($Result[0]); } else { return($Result); }
-      }
-     else
-      {
+      } else {
        $Height      = ($this->pChartObject->GraphAreaY2 - $this->pChartObject->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
        $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
        $Step        = $Height / $ScaleHeight;
 
        $Result = "";
-       foreach($Values as $Key => $Value)
-        {
+       foreach($Values as $Key => $Value) {
          if ( $Value == VOID ) 
           $Result[] = VOID;
          else
@@ -592,8 +528,7 @@ 
     }
 
    /* Draw the legend of the active series */
-   function drawScatterLegend($X,$Y,$Format="")
-    {
+   function drawScatterLegend($X,$Y,$Format="") {
      $Family		= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
      $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
      $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
@@ -621,10 +556,8 @@ 
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"]))
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"])) {
          list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Series["Picture"]);
          if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
          if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
@@ -636,12 +569,9 @@ 
      $XStep = $XSpacing;
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Series["Description"]);
 
            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -650,13 +580,10 @@ 
 
            $Lines = preg_split("/\n/",$Series["Description"]);
            $vY = $vY + max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
              if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -681,57 +608,44 @@ 
       $this->pChartObject->drawFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
 
      $RestoreShadow = $this->pChartObject->Shadow; $this->Shadow = FALSE;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $R = $Series["Color"]["R"]; $G = $Series["Color"]["G"]; $B = $Series["Color"]["B"];
          $Ticks = $Series["Ticks"]; $Weight = $Series["Weight"];
 
-         if ( isset($Series["Picture"]) )
-          {
+         if ( isset($Series["Picture"]) ) {
            $Picture = $Series["Picture"];
            list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Picture);
            $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
 
            $this->pChartObject->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
-          }
-         else
-          {
-           if ( $Family == LEGEND_FAMILY_BOX )
-            {
+          } else {
+           if ( $Family == LEGEND_FAMILY_BOX ) {
              if ( $BoxWidth != $IconAreaWidth ) { $XOffset = floor(($IconAreaWidth-$BoxWidth)/2); } else { $XOffset = 0; }
              if ( $BoxHeight != $IconAreaHeight ) { $YOffset = floor(($IconAreaHeight-$BoxHeight)/2); } else { $YOffset = 0; }
 
              $this->pChartObject->drawFilledRectangle($X+1+$XOffset,$Y+1+$YOffset,$X+$BoxWidth+$XOffset+1,$Y+$BoxHeight+1+$YOffset,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->pChartObject->drawFilledRectangle($X+$XOffset,$Y+$YOffset,$X+$BoxWidth+$XOffset,$Y+$BoxHeight+$YOffset,array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_CIRCLE )
-            {
+            } elseif ( $Family == LEGEND_FAMILY_CIRCLE ) {
              $this->pChartObject->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
              $this->pChartObject->drawFilledCircle($X+$IconAreaWidth/2,$Y+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>$R,"G"=>$G,"B"=>$B,"Surrounding"=>20));
-            }
-           elseif ( $Family == LEGEND_FAMILY_LINE )
-            {
+            } elseif ( $Family == LEGEND_FAMILY_LINE ) {
              $this->pChartObject->drawLine($X+1,$Y+1+$IconAreaHeight/2,$X+1+$IconAreaWidth,$Y+1+$IconAreaHeight/2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20,"Ticks"=>$Ticks,"Weight"=>$Weight));
              $this->pChartObject->drawLine($X,$Y+$IconAreaHeight/2,$X+$IconAreaWidth,$Y+$IconAreaHeight/2,array("R"=>$R,"G"=>$G,"B"=>$B,"Ticks"=>$Ticks,"Weight"=>$Weight));
             }
           }
 
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $Lines = preg_split("/\n/",$Series["Description"]);
-           foreach($Lines as $Key => $Value)
-            $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
+           foreach($Lines as $Key => $Value) {
+                       $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
+           }
 
            $Y=$Y+max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->pChartObject->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT));
              $Width[] = $BoxArray[1]["X"];
             }
@@ -744,8 +658,7 @@ 
     }
 
    /* Get the legend box size */
-   function getScatterLegendSize($Format="")
-    {
+   function getScatterLegendSize($Format="") {
      $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->pChartObject->FontName;
      $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->pChartObject->FontSize;
      $BoxSize	= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
@@ -760,10 +673,8 @@ 
 
      $Data = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"]))
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE && isset($Series["Picture"])) {
          list($PicWidth,$PicHeight) = $this->pChartObject->getPicInfo($Series["Picture"]);
          if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
          if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
@@ -775,12 +686,9 @@ 
      $XStep = $XSpacing;
 
      $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
-         if ( $Mode == LEGEND_VERTICAL )
-          {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
+         if ( $Mode == LEGEND_VERTICAL ) {
            $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Series["Description"]);
 
            if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -789,13 +697,10 @@ 
 
            $Lines = preg_split("/\n/",$Series["Description"]);
            $vY = $vY + max($this->pChartObject->FontSize*count($Lines),$IconAreaHeight) + 5;
-          }
-         elseif ( $Mode == LEGEND_HORIZONTAL )
-          {
+          } elseif ( $Mode == LEGEND_HORIZONTAL ) {
            $Lines = preg_split("/\n/",$Series["Description"]);
            $Width = "";
-           foreach($Lines as $Key => $Value)
-            {
+           foreach($Lines as $Key => $Value) {
              $BoxArray = $this->pChartObject->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->pChartObject->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
 
              if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
@@ -821,16 +726,13 @@ 
     }
 
    /* Draw the line of best fit */
-   function drawScatterBestFit($Format="")
-    {
+   function drawScatterBestFit($Format="") {
      $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : 0;
 
      $Data    = $this->pDataObject->getData();
 
-     foreach($Data["ScatterSeries"] as $Key => $Series)
-      {
-       if ( $Series["isDrawable"] == TRUE )
-        {
+     foreach($Data["ScatterSeries"] as $Key => $Series) {
+       if ( $Series["isDrawable"] == TRUE ) {
          $SerieX = $Series["X"]; $SerieValuesX = $Data["Series"][$SerieX]["Data"]; $SerieXAxis = $Data["Series"][$SerieX]["Axis"];
          $SerieY = $Series["Y"]; $SerieValuesY = $Data["Series"][$SerieY]["Data"]; $SerieYAxis = $Data["Series"][$SerieY]["Axis"];
 
@@ -841,8 +743,7 @@ 
          $PosArrayY = $Data["Series"][$Series["Y"]]["Data"];
 
          $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
-         foreach($PosArrayX as $Key => $Value)
-          {
+         foreach($PosArrayX as $Key => $Value) {
            $X = $Value; $Y = $PosArrayY[$Key];
 
            $Sxy = $Sxy + $X*$Y;
@@ -853,15 +754,12 @@ 
 
          $n = count($PosArrayX);
 
-         if ((($n*$Sxx) == ($Sx*$Sx)))
-          {
+         if ((($n*$Sxx) == ($Sx*$Sx))) {
            $X1 = $this->getPosArray($Data["Axis"][$SerieXAxis]["ScaleMin"],$SerieXAxis);
            $X2 = $X1;
            $Y1 = $this->pChartObject->GraphAreaY1;
            $Y2 = $this->pChartObject->GraphAreaY2;
-          }
-         else
-          {
+          } else {
            $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
            $B = (($Sy)-($M*$Sx))/($n);
 
@@ -883,8 +781,7 @@ 
       }
     }
 
-   function writeScatterLabel($ScatterSerieID,$Points,$Format="")
-    {
+   function writeScatterLabel($ScatterSerieID,$Points,$Format="") {
      $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
      $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
      $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : NULL;
@@ -906,10 +803,8 @@ 
      $PosArrayY = $this->getPosArray($SerieValuesY,$SerieYAxis);
      if ( !is_array($PosArrayY) ) { $Value = $PosArrayY; $PosArrayY = ""; $PosArrayY[0] = $Value; }
 
-     foreach($Points as $Key => $Point)
-      {
-       if ( isset($PosArrayX[$Point]) && isset($PosArrayY[$Point]) )
-        {
+     foreach($Points as $Key => $Point) {
+       if ( isset($PosArrayX[$Point]) && isset($PosArrayY[$Point]) ) {
          $X = floor($PosArrayX[$Point]);
          $Y = floor($PosArrayY[$Point]);
 
@@ -952,8 +847,7 @@ 
     }
 
    /* Draw a Scatter threshold */
-   function drawScatterThreshold($Value,$Format="")
-    {
+   function drawScatterThreshold($Value,$Format="") {
      $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $R			= isset($Format["R"]) ? $Format["R"] : 255;
      $G			= isset($Format["G"]) ? $Format["G"] : 0;
@@ -997,51 +891,42 @@ 
 
      if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
  
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y )
-      {
+     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y ) {
        $X1 = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"];
        $X2 = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"];
        $Y  = $this->getPosArray($Value,$AxisID);
 
        $this->pChartObject->drawLine($X1,$Y,$X2,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-       if ( $Wide )
-        {
+       if ( $Wide ) {
          $this->pChartObject->drawLine($X1,$Y-1,$X2,$Y-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
          $this->pChartObject->drawLine($X1,$Y+1,$X2,$Y+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
         }
 
-       if ( $WriteCaption )
-        {
+       if ( $WriteCaption ) {
          if ( $CaptionAlign == CAPTION_LEFT_TOP )
-          { $X = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
-         else 
+          { $X = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; } else 
           { $X = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"] - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
 
          $this->pChartObject->drawText($X,$Y,$Caption,$CaptionSettings);
         }
 
        return(array("Y"=>$Y));
-      }
-     elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
-      {
+      } elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X ) {
        $X  = $this->getPosArray($Value,$AxisID);
        $Y1 = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"];
        $Y2 = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"];
 
        $this->pChartObject->drawLine($X,$Y1,$X,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
 
-       if ( $Wide )
-        {
+       if ( $Wide ) {
          $this->pChartObject->drawLine($X-1,$Y1,$X-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
          $this->pChartObject->drawLine($X+1,$Y1,$X+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
         }
 
-       if ( $WriteCaption )
-        {
+       if ( $WriteCaption ) {
          if ( $CaptionAlign == CAPTION_LEFT_TOP )
-          { $Y = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
-         else 
+          { $Y = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"] + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; } else 
           { $Y = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
 
          $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
@@ -1053,8 +938,7 @@ 
     }
 
    /* Draw a Scatter threshold area */
-   function drawScatterThresholdArea($Value1,$Value2,$Format="")
-    {
+   function drawScatterThresholdArea($Value1,$Value2,$Format="") {
      $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
      $R		= isset($Format["R"]) ? $Format["R"] : 255;
      $G		= isset($Format["G"]) ? $Format["G"] : 0;
@@ -1085,8 +969,7 @@ 
 
      if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
  
-     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X )
-      {
+     if ( $Data["Axis"][$AxisID]["Identity"] == AXIS_X ) {
        $Y1 = $this->pChartObject->GraphAreaY1 + $Data["Axis"][$AxisID]["Margin"];
        $Y2 = $this->pChartObject->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"];
        $X1  = $this->getPosArray($Value1,$AxisID);
@@ -1097,19 +980,16 @@ 
 
        $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-       if ( $Border )
-        {
+       if ( $Border ) {
          $this->pChartObject->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
          $this->pChartObject->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
-        {
+       if ( $AreaName != NULL ) {
          $XPos = ($X2-$X1)/2 + $X1;
          $YPos = ($Y2-$Y1)/2 + $Y1;
 
-         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
-          {
+         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO ) {
            $TxtPos   = $this->pChartObject->getTextBox($XPos,$YPos,$this->pChartObject->FontName,$this->pChartObject->FontSize,0,$AreaName);
            $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
            if ( abs($X2 - $X1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
@@ -1121,9 +1001,7 @@ 
 
        $this->pChartObject->Shadow = $RestoreShadow;
        return(array("X1"=>$X1,"X2"=>$X2));
-      }
-     elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y )
-      {
+      } elseif ( $Data["Axis"][$AxisID]["Identity"] == AXIS_Y ) {
        $X1 = $this->pChartObject->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"];
        $X2 = $this->pChartObject->GraphAreaX2 - $Data["Axis"][$AxisID]["Margin"];
        $Y1 = $this->getPosArray($Value1,$AxisID);
@@ -1134,14 +1012,12 @@ 
 
        $this->pChartObject->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
 
-       if ( $Border )
-        {
+       if ( $Border ) {
          $this->pChartObject->drawLine($X1,$Y1,$X2,$Y1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
          $this->pChartObject->drawLine($X1,$Y2,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
         }
 
-       if ( $AreaName != NULL )
-        {
+       if ( $AreaName != NULL ) {
          $XPos = ($X2-$X1)/2 + $X1;
          $YPos = ($Y2-$Y1)/2 + $Y1;
 

drupal/sites/default/boinc/modules/boincstats/includes/pchart/class/pSplit.class.php

Braces +5 added lines, -10 removed lines

@@ -17,8 +17,7 @@ 
  define("TEXT_POS_RIGHT"	, 690002);
 
  /* pSplit class definition */
- class pSplit
-  {
+ class pSplit {
    var $pChartObject;
 
    /* Class creator */
@@ -26,8 +25,7 @@ 
     { }
 
    /* Create the encoded string */
-   function drawSplitPath($Object,$Values,$Format="")
-    {
+   function drawSplitPath($Object,$Values,$Format="") {
      $this->pChartObject = $Object;
 
      $Spacing		= isset($Format["Spacing"]) ? $Format["Spacing"] : 20;
@@ -63,11 +61,9 @@ 
      $LeftHeight = $DataSerieSum * $YScale;
 
      /* Re-compute graph width depending of the text mode choosen */
-     if ( $TextPos == TEXT_POS_RIGHT )
-      {
+     if ( $TextPos == TEXT_POS_RIGHT ) {
        $MaxWidth = 0;
-       foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label)
-        {
+       foreach($Data["Series"][$LabelSerie]["Data"] as $Key => $Label) {
          $Boundardies = $Object->getTextBox(0,0,$Object->FontName,$Object->FontSize,0,$Label);
          if ( $Boundardies[1]["X"] > $MaxWidth ) { $MaxWidth = $Boundardies[1]["X"] + $TextPadding*2; }
         }
@@ -79,8 +75,7 @@ 
      $RightY   = $Y1;
      $VectorX  = (($X2-$X1) / 2);
 
-     foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
-      {
+     foreach($Data["Series"][$DataSerie]["Data"] as $Key => $Value) {
        if ( isset($Data["Series"][$LabelSerie]["Data"][$Key]) )
         $Label = $Data["Series"][$LabelSerie]["Data"][$Key];
        else