* fixes #2706, #2828, #2704, refs #1721, #2637, #2711, #2318, #71 : horizontal static graph implemented

* fixes #2788, refs #2670, #1721, #2637, #2711 : default graph type logic moved to ImageGraph API, improved date/period logic, new parameter graphs_default_period_to_plot_when_period_range * fixes #2704, #2804, refs #1721 : pChart updated to 2.1.3, pChart code removed from Piwik code, OOP refactoring, support for unifont.ttf if present in ImageGraph/fonts, testAllSizes now uses report metadata ImageGraphUrl * refs #71 : space between report title and report table reduced to avoid page overflow * refs #2829 : TODO display percentages * r5544, r5547, r5549 merged git-svn-id: http://dev.piwik.org/svn/trunk@5582 59fd770c-687e-43c8-a1e3-f5a4ff64c105
author: JulienMoumne <julien@piwik.org> 2011-12-20 21:50:45 +0400
committer: JulienMoumne <julien@piwik.org> 2011-12-20 21:50:45 +0400
commit: 5e4cf7b3470a79be8f4ed1dd7d308d678af2a575 (patch)
tree: 08032e5eed87093c635816c84145b9ae63423dab
parent: 118b6b646b41be20b34760aa760b92321ba0a9e6 (diff)
33 files changed, 11494 insertions, 5314 deletions
diff --git a/LEGALNOTICE b/LEGALNOTICE
index e014d11ab4..188e29260f 100644
--- a/LEGALNOTICE
+++ b/LEGALNOTICE
@@ -196,9 +196,9 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link:  http://www.zendframework.com/
 	License:  New BSD
 	
-	Name: pChart 1.27d 
-	Link: http://pchart.sourceforge.net/
-	License: GPL
+	Name: pChart 2.1.3
+	Link: http://www.pchart.net
+	License: GPL v3
 
 THIRD-PARTY CONTENT
 
@@ -207,11 +207,17 @@ THIRD-PARTY CONTENT
 	License:  CC BY 3.0
 
 	Name:  Solar System icons - Dan Wiersema
-       	Link:  http://www.iconspedia.com/icon/neptune-4672.html
+	Link:  http://www.iconspedia.com/icon/neptune-4672.html
 	License:  Free for non-commercial use
 	Notes:
 	- used in Piwik's ExampleUI plugin
 
+	Name: Wine project - tahoma.ttf font
+	Link: http://source.winehq.org/git/wine.git/blob_plain/HEAD:/fonts/tahoma.ttf
+	License: LGPL v2.1
+	Notes:
+	- used in ImageGraph plugin
+
 Notes:
 - the "New BSD" license refers to either the "Modified BSD" and "Simplified BSD"
   licenses (2- or 3-clause), which are GPL compatible.
diff --git a/config/global.ini.php b/config/global.ini.php
index 0c5b068993..8bccd026e9 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -271,6 +271,12 @@ latest_version_url = http://piwik.org/latest.zip
 ; subscribeNewsletter.
 api_service_url = http://api.piwik.org
 
+; When the ImageGraph plugin is activated, report metadata have an additional entry : 'imageGraphUrl'.
+; This entry can be used to request a static graph for the requested report.
+; When requesting report metadata with $period=range, Piwik needs to translate it to multiple periods for evolution graphs.
+; eg. $period=range&date=previous10 becomes $period=day&date=previous10. Use this setting to override the $period value.
+graphs_default_period_to_plot_when_period_range = day
+
 [Tracker]
 ; Piwik uses first party cookies by default. If set to 1,
 ; the visit ID cookie will be set on the Piwik server domain as well
diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php
index 39fdf063d4..3506420211 100644
--- a/core/ReportRenderer/Pdf.php
+++ b/core/ReportRenderer/Pdf.php
@@ -229,7 +229,7 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer
 		$this->TCPDF->SetFont($this->reportFont, $this->reportFontStyle, $this->reportHeaderFontSize);
 		$this->TCPDF->SetTextColor($this->headerTextColor[0], $this->headerTextColor[1], $this->headerTextColor[2]);
 		$this->TCPDF->Bookmark($title);
-		$this->TCPDF->Cell(40, 20, $title);
+		$this->TCPDF->Cell(40, 15, $title);
 		$this->TCPDF->Ln();
 		$this->TCPDF->SetFont($this->reportFont, '', $this->reportSimpleFontSize);
 		$this->TCPDF->SetTextColor($this->reportTextColor[0], $this->reportTextColor[1], $this->reportTextColor[2]);
@@ -267,7 +267,7 @@ class Piwik_ReportRenderer_Pdf extends Piwik_ReportRenderer
 
 		if($this->displayGraph && $this->displayTable)
 		{
-			$this->TCPDF->Ln();
+			$this->TCPDF->Ln(5);
 		}
 
 		if($this->displayTable)
diff --git a/lang/en.php b/lang/en.php
index 8f6c30c3db..78ed543a81 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -255,6 +255,7 @@ $translations = array(
 	'General_ExceptionMethodNotFound' => 'The method \'%s\' does not exist or is not available in the module \'%s\'.',
 	'General_ExceptionInvalidRendererFormat' => 'Renderer format \'%s\' not valid. Try any of the following instead: %s.',
 	'General_ExceptionInvalidReportRendererFormat' => 'Report format \'%s\' not valid. Try any of the following instead: %s.',
+	'General_ExceptionInvalidStaticGraphType' => 'Static graph type \'%s\' not valid. Try any of the following instead: %s.',
 	'General_ExceptionInvalidAggregateReportsFormat' => 'Aggregate reports format \'%s\' not valid. Try any of the following instead: %s.',
 	'General_ExceptionInvalidPeriod' => 'The period \'%s\' is not supported. Try any of the following instead: %s',
 	'General_ExceptionInvalidDateRange' => 'The date \'%s\' is not a correct date range. It should have the following format: %s.',
diff --git a/libs/README_LIBS b/libs/README_LIBS
index d5bfd80ddf..ba08d418d0 100644
--- a/libs/README_LIBS
+++ b/libs/README_LIBS
@@ -11,6 +11,11 @@ upstream, we maintain a list of bug fixes and local mods made to third-party lib
  * HTML/Quickform2/
    - in r2626, php 5.1.6 incompatibility
    - in r3040, exception classes don't follow PEAR naming convention
+ * pChart2.1.3/
+   - the following files have been removed because they weren't needed or they had license conflicts :
+    class/pBarcode39.class.php, class/pBarcode128.class.php, class/pBubble.class.php, class/pCache.class.php,
+    class/pIndicator.class.php, class/pRadar.class.php, class/pScatter.class.php, class/pSplit.class.php,
+    class/pSpring.class.php, class/pStock.class.php, class/pSurface.class.php, data/, examples/, fonts/, palettes/
  * PclZip/
    - in r1960, ignore touch() - utime failed warning
  * PEAR/, PEAR.php
@@ -21,6 +26,8 @@ upstream, we maintain a list of bug fixes and local mods made to third-party lib
  * sparkline/
    - in r1296, remove require_once
    - empty sparklines with floats, off-by-one errors, and locale conflict
+ * tcpdf/
+   - in r5540, fix a temp file bug when embedding images in PDF
  * Zend/
    - strip require_once (to support autoloading)
    - in r3694, fix ZF-10888 and ZF-10835
diff --git a/libs/pChart.1.27d/Fonts/tahoma.ttf b/libs/pChart.1.27d/Fonts/tahoma.ttf
deleted file mode 100644
index 59b14a2d2d..0000000000
--- a/libs/pChart.1.27d/Fonts/tahoma.ttf
+++ /dev/null
diff --git a/libs/pChart.1.27d/pChart/pCache.php b/libs/pChart.1.27d/pChart/pCache.php
deleted file mode 100644
index 2bcd6b0442..0000000000
--- a/libs/pChart.1.27d/pChart/pCache.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
- /*
-     pCache - Faster renderding using data cache
-     Copyright (C) 2008 Jean-Damien POGOLOTTI
-     Version  1.1.2 last updated on 06/17/08
-
-     http://pchart.sourceforge.net
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 1,2,3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     Class initialisation :
-      pCache($CacheFolder="Cache/")
-     Cache management :
-      IsInCache($Data)
-      GetFromCache($ID,$Data)
-      WriteToCache($ID,$Data,$Picture)
-      DeleteFromCache($ID,$Data)
-      ClearCache()
-     Inner functions :
-      GetHash($ID,$Data)
- */
-
- /* pCache class definition */
- class pCache
-  {
-   var $HashKey     = "";
-   var $CacheFolder = "Cache/";
-
-   /* Create the pCache object */
-   function pCache($CacheFolder="Cache/")
-    {
-     $this->CacheFolder = $CacheFolder;
-    }
-
-   /* This function is clearing the cache folder */
-   function ClearCache()
-    {
-     if ($handle = opendir($this->CacheFolder))
-      {
-       while (false !== ($file = readdir($handle)))
-        {
-         if ( $file != "." && $file != ".." )
-          unlink($this->CacheFolder.$file);
-        }
-       closedir($handle);
-      }
-    }
-
-   /* This function is checking if we have an offline version of this chart */
-   function IsInCache($ID,$Data,$Hash="")
-    {
-     if ( $Hash == "" )
-      $Hash = $this->GetHash($ID,$Data);
-
-     if ( file_exists($this->CacheFolder.$Hash) )
-      return(TRUE);
-     else
-      return(FALSE);
-    }
-
-   /* This function is making a copy of drawn chart in the cache folder */
-   function WriteToCache($ID,$Data,$Picture)
-    {
-     $Hash     = $this->GetHash($ID,$Data);
-     $FileName = $this->CacheFolder.$Hash;
-
-     imagepng($Picture->Picture,$FileName);
-    }
-
-   /* This function is removing any cached copy of this chart */
-   function DeleteFromCache($ID,$Data)
-    {
-     $Hash     = $this->GetHash($ID,$Data);
-     $FileName = $this->CacheFolder.$Hash;
-
-     if ( file_exists($FileName ) )
-      unlink($FileName);
-    }
-
-   /* This function is retrieving the cached picture if applicable */
-   function GetFromCache($ID,$Data)
-    {
-     $Hash     = $this->GetHash($ID,$Data);
-     if ( $this->IsInCache("","",$Hash ) )
-      {
-       $FileName = $this->CacheFolder.$Hash;
-
-       header('Content-type: image/png');
-       @readfile($FileName);
-       exit();
-      }
-    }
-
-   /* This function is building the graph unique hash key */
-   function GetHash($ID,$Data)
-    {
-     $mKey = "$ID";
-     foreach($Data as $key => $Values)
-      {
-       $tKey = "";
-       foreach($Values as $Serie => $Value)
-        $tKey = $tKey.$Serie.$Value;
-       $mKey = $mKey.md5($tKey);
-      }
-     return(md5($mKey));
-    }
-  }
-?>
-\ No newline at end of file
diff --git a/libs/pChart.1.27d/pChart/pChart.php b/libs/pChart.1.27d/pChart/pChart.php
deleted file mode 100644
index c407b7e2c5..0000000000
--- a/libs/pChart.1.27d/pChart/pChart.php
+++ /dev/null
@@ -1,3489 +0,0 @@
-<?php
- /*
-     pChart - a PHP class to build charts!
-     Copyright (C) 2008 Jean-Damien POGOLOTTI
-     Version  1.27d last updated on 09/30/08
-
-     http://pchart.sourceforge.net
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 1,2,3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     Class initialisation :
-      pChart($XSize,$YSize)
-     Draw methods :
-      drawBackground($R,$G,$B)
-      drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B)
-      drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100)
-      drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
-      drawFilledRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
-      drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
-      drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
-      drawEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
-      drawFilledEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
-      drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE)
-      drawDottedLine($X1,$Y1,$X2,$Y2,$DotSize,$R,$G,$B)
-      drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
-      drawFromPNG($FileName,$X,$Y,$Alpha=100)
-      drawFromGIF($FileName,$X,$Y,$Alpha=100)
-      drawFromJPG($FileName,$X,$Y,$Alpha=100)
-     Graph setup methods :
-      addBorder($Width=3,$R=0,$G=0,$B=0)
-      clearScale()
-      clearShadow()
-      createColorGradientPalette($R1,$G1,$B1,$R2,$G2,$B2,$Shades)
-      drawGraphArea($R,$G,$B,$Stripe=FALSE)
-      drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
-      drawRightScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1)
-      drawXYScale($Data,$DataDescription,$YSerieName,$XSerieName,$R,$G,$B,$WithMargin=0,$Angle=0,$Decimals=1)
-      drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
-      drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=FALSE)
-      drawPieLegend($XPos,$YPos,$Data,$DataDescription,$R,$G,$B)
-      drawTitle($XPos,$YPos,$Value,$R,$G,$B,$XPos2=-1,$YPos2=-1,$Shadow=FALSE)
-      drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnRight=FALSE,$TickWidth=4,$FreeText=NULL)
-      drawArea($Data,$Serie1,$Serie2,$R,$G,$B,$Alpha = 50)
-      drawRadarAxis($Data,$DataDescription,$Mosaic=TRUE,$BorderOffset=10,$A_R=60,$A_G=60,$A_B=60,$S_R=200,$S_G=200,$S_B=200,$MaxValue=-1)
-      drawGraphAreaGradient($R,$G,$B,$Decay,$Target=TARGET_GRAPHAREA)
-      drawTextBox($X1,$Y1,$X2,$Y2,$Text,$Angle=0,$R=255,$G=255,$B=255,$Align=ALIGN_LEFT,$Shadow=TRUE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=100)
-      getLegendBoxSize($DataDescription)
-      loadColorPalette($FileName,$Delimiter=",")
-      reportWarnings($Interface="CLI")
-      setGraphArea($X1,$Y1,$X2,$Y2)
-      setLabel($Data,$DataDescription,$SerieName,$ValueName,$Caption,$R=210,$G=210,$B=210)
-      setColorPalette($ID,$R,$G,$B)
-      setCurrency($Currency)
-      setDateFormat($Format)
-      setFontProperties($FontName,$FontSize)
-      setLineStyle($Width=1,$DotSize=0)
-      setFixedScale($VMin,$VMax,$Divisions=5,$VXMin=0,$VXMin=0,$XDivisions=5)
-      setShadowProperties($XDistance=1,$YDistance=1,$R=60,$G=60,$B=60,$Alpha)
-      writeValues($Data,$DataDescription,$Series)
-    Graphs methods :
-      drawPlotGraph($Data,$DataDescription,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=FALSE)
-      drawXYPlotGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1)
-      drawLineGraph($Data,$DataDescription,$SerieName="")
-      drawXYGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0)
-      drawFilledLineGraph($Data,$DataDescription,$Alpha=100,$AroundZero=FALSE)
-      drawCubicCurve($Data,$DataDescription,$Accuracy=.1,$SerieName="")
-      drawFilledCubicCurve($Data,$DataDescription,$Accuracy=.1,$Alpha=100,$AroundZero=FALSE)
-      drawOverlayBarGraph($Data,$DataDescription,$Alpha=50)
-      drawBarGraph($Data,$DataDescription,$Shadow=FALSE)
-      drawStackedBarGraph($Data,$DataDescription,$Alpha=50,$Contiguous=FALSE)
-      drawLimitsGraph($Data,$DataDescription,$R=0,$G=0,$B=0)
-      drawRadar($Data,$DataDescription,$BorderOffset=10,$MaxValue=-1)
-      drawFilledRadar($Data,$DataDescription,$Alpha=50,$BorderOffset=10,$MaxValue=-1)
-      drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0)
-      drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals = 0)
-      drawFlatPieGraphWithShadow($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals = 0)
-      drawPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$EnhanceColors=TRUE,$Skew=60,$SpliceHeight=20,$SpliceDistance=0,$Decimals=0)
-     Other methods :
-      setImageMap($Mode=TRUE,$GraphID="MyGraph")
-      getImageMap($MapName,$Flush=TRUE)
-      Render($FileName)
-      Stroke()
- */
- 
- /* Declare some script wide constants */
- define("SCALE_NORMAL",1);
- define("SCALE_ADDALL",2);
- define("SCALE_START0",3);
- define("SCALE_ADDALLSTART0",4);
- define("PIE_PERCENTAGE", 1);
- define("PIE_LABELS",2);
- define("PIE_NOLABEL",3);
- define("PIE_PERCENTAGE_LABEL", 4);
- define("TARGET_GRAPHAREA",1);
- define("TARGET_BACKGROUND",2);
- define("ALIGN_TOP_LEFT",1);
- define("ALIGN_TOP_CENTER",2);
- define("ALIGN_TOP_RIGHT",3);
- define("ALIGN_LEFT",4);
- define("ALIGN_CENTER",5);
- define("ALIGN_RIGHT",6);
- define("ALIGN_BOTTOM_LEFT",7);
- define("ALIGN_BOTTOM_CENTER",8);
- define("ALIGN_BOTTOM_RIGHT",9);
-
- /* pChart class definition */
- class pChart
-  {
-   /* Palettes definition */
-   var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46),
-                        "1"=>array("R"=>224,"G"=>100,"B"=>46),
-                        "2"=>array("R"=>224,"G"=>214,"B"=>46),
-                        "3"=>array("R"=>46,"G"=>151,"B"=>224),
-                        "4"=>array("R"=>176,"G"=>46,"B"=>224),
-                        "5"=>array("R"=>224,"G"=>46,"B"=>117),
-                        "6"=>array("R"=>92,"G"=>224,"B"=>46),
-                        "7"=>array("R"=>224,"G"=>176,"B"=>46));
-
-   /* Some static vars used in the class */
-   var $XSize          = NULL;
-   var $YSize          = NULL;
-   var $Picture        = NULL;
-   var $ImageMap       = NULL;
-
-   /* Error management */
-   var $ErrorReporting = FALSE;
-   var $ErrorInterface = "CLI";
-   var $Errors         = NULL;
-   var $ErrorFontName  = "Fonts/pf_arma_five.ttf";
-   var $ErrorFontSize  = 6;
-
-   /* vars related to the graphing area */
-   var $GArea_X1        = NULL;
-   var $GArea_Y1        = NULL;
-   var $GArea_X2        = NULL;
-   var $GArea_Y2        = NULL;
-   var $GAreaXOffset    = NULL;
-   var $VMax            = NULL;
-   var $VMin            = NULL;
-   var $VXMax           = NULL;
-   var $VXMin           = NULL;
-   var $Divisions       = NULL;
-   var $XDivisions      = NULL;
-   var $DivisionHeight  = NULL;
-   var $XDivisionHeight = NULL;
-   var $DivisionCount   = NULL;
-   var $XDivisionCount  = NULL;
-   var $DivisionRatio   = NULL;
-   var $XDivisionRatio  = NULL;
-   var $DivisionWidth   = NULL;
-   var $DataCount       = NULL;
-   var $Currency        = "\$";
-
-   /* Text format related vars */
-   var $FontName       = NULL;
-   var $FontSize       = NULL;
-   var $DateFormat     = "d/m/Y";
-
-   /* Lines format related vars */
-   var $LineWidth      = 1;
-   var $LineDotSize    = 0;
-
-   /* Layer related vars */
-   var $Layers         = NULL;
-
-   /* Set antialias quality : 0 is maximum, 100 minimum*/
-   var $AntialiasQuality = 0;
-
-   /* Shadow settings */
-   var $ShadowActive    = FALSE;
-   var $ShadowXDistance = 1;
-   var $ShadowYDistance = 1;
-   var $ShadowRColor    = 60;
-   var $ShadowGColor    = 60;
-   var $ShadowBColor    = 60;
-   var $ShadowAlpha     = 50;
-   var $ShadowBlur      = 0;
-
-   /* Image Map settings */
-   var $BuildMap         = FALSE;
-   var $MapFunction      = NULL;
-   var $tmpFolder        = "tmp/";
-   var $MapID            = NULL;
-
-   /* This function create the background picture */
-   function pChart($XSize,$YSize)
-    {
-     $this->XSize   = $XSize;
-     $this->YSize   = $YSize;
-     $this->Picture = imagecreatetruecolor($XSize,$YSize);
-
-     $C_White =$this->AllocateColor($this->Picture,255,255,255);
-     imagefilledrectangle($this->Picture,0,0,$XSize,$YSize,$C_White);
-     imagecolortransparent($this->Picture,$C_White);
-
-     $this->setFontProperties("tahoma.ttf",8);
-    }
-
-  /* Set if warnings should be reported */
-  function reportWarnings($Interface="CLI")
-   {
-    $this->ErrorReporting = TRUE;
-    $this->ErrorInterface = $Interface;
-    }
-
-   /* Set the font properties */
-   function setFontProperties($FontName,$FontSize)
-    {
-     $this->FontName = $FontName;
-     $this->FontSize = $FontSize;
-    }
-
-   /* Set the shadow properties */
-   function setShadowProperties($XDistance=1,$YDistance=1,$R=60,$G=60,$B=60,$Alpha=50,$Blur=0)
-    {
-     $this->ShadowActive    = TRUE;
-     $this->ShadowXDistance = $XDistance;
-     $this->ShadowYDistance = $YDistance;
-     $this->ShadowRColor    = $R;
-     $this->ShadowGColor    = $G;
-     $this->ShadowBColor    = $B;
-     $this->ShadowAlpha     = $Alpha;
-     $this->ShadowBlur      = $Blur;
-    }
-
-   /* Remove shadow option */
-   function clearShadow()
-    {
-     $this->ShadowActive = FALSE;
-    }
- 
-   /* Set Palette color */
-   function setColorPalette($ID,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $this->Palette[$ID]["R"] = $R;
-     $this->Palette[$ID]["G"] = $G;
-     $this->Palette[$ID]["B"] = $B;
-    }
-
-   /* Create a color palette shading from one color to another */
-   function createColorGradientPalette($R1,$G1,$B1,$R2,$G2,$B2,$Shades)
-    {
-     $RFactor = ($R2-$R1)/$Shades;
-     $GFactor = ($G2-$G1)/$Shades;
-     $BFactor = ($B2-$B1)/$Shades;
-
-     for($i=0;$i<=$Shades-1;$i++)
-      {
-       $this->Palette[$i]["R"] = $R1+$RFactor*$i;
-       $this->Palette[$i]["G"] = $G1+$GFactor*$i;
-       $this->Palette[$i]["B"] = $B1+$BFactor*$i;
-      }
-    }
-
-   /* Load Color Palette from file */
-   function loadColorPalette($FileName,$Delimiter=",")
-    {
-     $handle  = @fopen($FileName,"r");
-     $ColorID = 0;
-     if ($handle)
-      {
-       while (!feof($handle))
-        {
-         $buffer = fgets($handle, 4096);
-         $buffer = str_replace(chr(10),"",$buffer);
-         $buffer = str_replace(chr(13),"",$buffer);
-         $Values = split($Delimiter,$buffer);
-         if ( count($Values) == 3 )
-          {
-           $this->Palette[$ColorID]["R"] = $Values[0];
-           $this->Palette[$ColorID]["G"] = $Values[1];
-           $this->Palette[$ColorID]["B"] = $Values[2];
-           $ColorID++;
-          }
-        }
-      }
-    }
-
-   /* Set line style */
-  function setLineStyle($Width=1,$DotSize=0)
-   {
-    $this->LineWidth   = $Width;
-    $this->LineDotSize = $DotSize;
-   }
-
-   /* Set currency symbol */
-   function setCurrency($Currency)
-    {
-     $this->Currency = $Currency;
-    }
-
-   /* Set the graph area location */
-   function setGraphArea($X1,$Y1,$X2,$Y2)
-    {
-     $this->GArea_X1 = $X1;
-     $this->GArea_Y1 = $Y1;
-     $this->GArea_X2 = $X2;
-     $this->GArea_Y2 = $Y2;
-    }
-
-   /* Prepare the graph area */
-   function drawGraphArea($R,$G,$B,$Stripe=FALSE)
-    {
-     $this->drawFilledRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B,FALSE);
-     $this->drawRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R-40,$G-40,$B-40);
-
-     if ( $Stripe )
-      {
-       $R2 = $R-15; if ( $R2 < 0 ) { $R2 = 0; }
-       $G2 = $R-15; if ( $G2 < 0 ) { $G2 = 0; }
-       $B2 = $R-15; if ( $B2 < 0 ) { $B2 = 0; }
-
-       $LineColor =$this->AllocateColor($this->Picture,$R2,$G2,$B2);
-       $SkewWidth = $this->GArea_Y2-$this->GArea_Y1-1;
-
-       for($i=$this->GArea_X1-$SkewWidth;$i<=$this->GArea_X2;$i=$i+4)
-        {
-         $X1 = $i;            $Y1 = $this->GArea_Y2;
-         $X2 = $i+$SkewWidth; $Y2 = $this->GArea_Y1;
-
-
-         if ( $X1 < $this->GArea_X1 )
-          { $X1 = $this->GArea_X1; $Y1 = $this->GArea_Y1 + $X2 - $this->GArea_X1 + 1; }
-
-         if ( $X2 >= $this->GArea_X2 )
-          { $Y2 = $this->GArea_Y1 + $X2 - $this->GArea_X2 +1; $X2 = $this->GArea_X2 - 1; }
-// * Fixed in 1.27 *         { $X2 = $this->GArea_X2 - 1; $Y2 = $this->GArea_Y2 - ($this->GArea_X2 - $X1); }
-
-         imageline($this->Picture,$X1,$Y1,$X2,$Y2+1,$LineColor);
-        }
-      }
-    }
-
-   /* Allow you to clear the scale : used if drawing multiple charts */
-   function clearScale()
-    {
-     $this->VMin       = NULL;
-     $this->VMax       = NULL;
-     $this->VXMin      = NULL;
-     $this->VXMax      = NULL;
-     $this->Divisions  = NULL;
-     $this->XDivisions = NULL;    }
-
-   /* Allow you to fix the scale, use this to bypass the automatic scaling */
-   function setFixedScale($VMin,$VMax,$Divisions=5,$VXMin=0,$VXMax=0,$XDivisions=5)
-    {
-     $this->VMin      = $VMin;
-     $this->VMax      = $VMax;
-     $this->Divisions = $Divisions;
-
-     if ( !$VXMin == 0 )
-      {
-       $this->VXMin      = $VXMin;
-       $this->VXMax      = $VXMax;
-       $this->XDivisions = $XDivisions;
-      }
-    }
-
-   /* Wrapper to the drawScale() function allowing a second scale to be drawn */
-   function drawRightScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1)
-    {
-     $this->drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks,$Angle,$Decimals,$WithMargin,$SkipLabels,TRUE);
-    }
-
-   /* Compute and draw the scale */
-   function drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateData("drawScale",$Data);
-
-     $C_TextColor         =$this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
-     $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
-
-     if ( $this->VMin == NULL && $this->VMax == NULL)
-      {
-       if (isset($DataDescription["Values"][0]))
-        {
-         $this->VMin = $Data[0][$DataDescription["Values"][0]];
-         $this->VMax = $Data[0][$DataDescription["Values"][0]];
-        }
-       else { $this->VMin = 2147483647; $this->VMax = -2147483647; }
-
-       /* Compute Min and Max values */
-       if ( $ScaleMode == SCALE_NORMAL || $ScaleMode == SCALE_START0 )
-        {
-         if ( $ScaleMode == SCALE_START0 ) { $this->VMin = 0; }
-
-         foreach ( $Data as $Key => $Values )
-          {
-           foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-            {
-             if (isset($Data[$Key][$ColName]))
-              {
-               $Value = $Data[$Key][$ColName];
-
-               if ( is_numeric($Value) )
-                {
-                 if ( $this->VMax < $Value) { $this->VMax = $Value; }
-                 if ( $this->VMin > $Value) { $this->VMin = $Value; }
-                }
-              }
-            }
-          }
-        }
-       elseif ( $ScaleMode == SCALE_ADDALL || $ScaleMode == SCALE_ADDALLSTART0 ) /* Experimental */
-        {
-         if ( $ScaleMode == SCALE_ADDALLSTART0 ) { $this->VMin = 0; }
-
-         foreach ( $Data as $Key => $Values )
-          {
-           $Sum = 0;
-           foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-            {
-             if (isset($Data[$Key][$ColName]))
-              {
-               $Value = $Data[$Key][$ColName];
-               if ( is_numeric($Value) )
-                $Sum  += $Value;
-              }
-            }
-           if ( $this->VMax < $Sum) { $this->VMax = $Sum; }
-           if ( $this->VMin > $Sum) { $this->VMin = $Sum; }
-          }
-        }
-
-       if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) )
-        $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
-
-       /* If all values are the same */
-       if ( $this->VMax == $this->VMin )
-        {
-         if ( $this->VMax >= 0 ) { $this->VMax++; }
-         else { $this->VMin--; }
-        }
-
-       $DataRange = $this->VMax - $this->VMin;
-       if ( $DataRange == 0 ) { $DataRange = .1; }
-
-       /* Compute automatic scaling */
-       $ScaleOk = FALSE; $Factor = 1;
-       $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight;
-
-       if ( $this->VMin == 0 && $this->VMax == 0 )
-        { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
-       elseif ($MaxDivs > 1)
-        {
-         while(!$ScaleOk)
-          {
-           $Scale1 = ( $this->VMax - $this->VMin ) / $Factor;
-           $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2;
-           $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4;
-
-           if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;}
-           if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;}
-           if (!$ScaleOk)
-            {
-             if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
-             if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
-            }
-          }
-
-         if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor)
-          {
-           $GridID     = floor ( $this->VMax / $Scale / $Factor) + 1;
-           $this->VMax = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-
-         if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor)
-          {
-           $GridID     = floor( $this->VMin / $Scale / $Factor);
-           $this->VMin = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-        }
-       else /* Can occurs for small graphs */
-        $Scale = 1;
-
-       if ( !isset($Divisions) )
-        $Divisions = 2;
-
-       if ($Scale == 1 && $Divisions%2 == 1)
-        $Divisions--;
-      }
-     else
-      $Divisions = $this->Divisions;
-
-     $this->DivisionCount = $Divisions;
-
-     $DataRange = $this->VMax - $this->VMin;
-     if ( $DataRange == 0 ) { $DataRange = .1; }
-
-     $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions;
-     $this->DivisionRatio  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange;
-
-     $this->GAreaXOffset  = 0;
-     if ( count($Data) > 1 )
-      {
-       if ( $WithMargin == FALSE )
-        $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data)-1);
-       else
-        {
-         $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data));
-         $this->GAreaXOffset  = $this->DivisionWidth / 2;
-        }
-      }
-     else
-      {
-       $this->DivisionWidth = $this->GArea_X2 - $this->GArea_X1;
-       $this->GAreaXOffset  = $this->DivisionWidth / 2;
-      }
-
-     $this->DataCount = count($Data);
-
-     if ( $DrawTicks == FALSE )
-      return(0);
-
-     $YPos = $this->GArea_Y2; $XMin = NULL;
-     for($i=1;$i<=$Divisions+1;$i++)
-      {
-       if ( $RightScale )
-        $this->drawLine($this->GArea_X2,$YPos,$this->GArea_X2+5,$YPos,$R,$G,$B);
-       else
-        $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B);
-
-       $Value     = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
-       $Value     = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
-       if ( $DataDescription["Format"]["Y"] == "number" )
-        $Value = $Value.$DataDescription["Unit"]["Y"];
-       if ( $DataDescription["Format"]["Y"] == "time" )
-        $Value = $this->ToTime($Value);        
-       if ( $DataDescription["Format"]["Y"] == "date" )
-        $Value = $this->ToDate($Value);        
-       if ( $DataDescription["Format"]["Y"] == "metric" )
-        $Value = $this->ToMetric($Value);        
-       if ( $DataDescription["Format"]["Y"] == "currency" )
-        $Value = $this->ToCurrency($Value);        
-
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth = $Position[2]-$Position[0];
-
-       if ( $RightScale )
-        {
-         imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+10,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
-         if ( $XMin < $this->GArea_X2+15+$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X2+15+$TextWidth; }
-        }
-       else
-        {
-         imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-10-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
-         if ( $XMin > $this->GArea_X1-10-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-10-$TextWidth; }
-        }
-
-       $YPos = $YPos - $this->DivisionHeight;
-      }
-
-     /* Write the Y Axis caption if set */ 
-     if ( isset($DataDescription["Axis"]["Y"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
-       $TextHeight = abs($Position[1])+abs($Position[3]);
-       $TextTop    = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2);
-
-       if ( $RightScale )
-        imagettftext($this->Picture,$this->FontSize,90,$XMin+$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-       else
-        imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-      }
-
-     /* Horizontal Axis */
-     $XPos = $this->GArea_X1 + $this->GAreaXOffset;
-     $ID = 1; $YMax = NULL;
-     foreach ( $Data as $Key => $Values )
-      {
-       if ( $ID % $SkipLabels == 0 )
-        {
-         $this->drawLine(floor($XPos),$this->GArea_Y2,floor($XPos),$this->GArea_Y2+5,$R,$G,$B);
-         $Value      = $Data[$Key][$DataDescription["Position"]];
-         if ( $DataDescription["Format"]["X"] == "number" )
-          $Value = $Value.$DataDescription["Unit"]["X"];
-         if ( $DataDescription["Format"]["X"] == "time" )
-          $Value = $this->ToTime($Value);        
-         if ( $DataDescription["Format"]["X"] == "date" )
-          $Value = $this->ToDate($Value);        
-         if ( $DataDescription["Format"]["X"] == "metric" )
-          $Value = $this->ToMetric($Value);        
-         if ( $DataDescription["Format"]["X"] == "currency" )
-          $Value = $this->ToCurrency($Value);        
-
-         $Position   = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
-         $TextWidth  = abs($Position[2])+abs($Position[0]);
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         if ( $Angle == 0 )
-          {
-           $YPos = $this->GArea_Y2+18;
-           imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
-          }
-         else
-          {
-           $YPos = $this->GArea_Y2+10+$TextHeight;
-           if ( $Angle <= 90 )
-            imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
-           else
-            imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
-          }
-         if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; }
-        }
-
-       $XPos = $XPos + $this->DivisionWidth;
-       $ID++;
-      }
-
-    /* Write the X Axis caption if set */ 
-    if ( isset($DataDescription["Axis"]["X"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["X"]);
-       $TextWidth  = abs($Position[2])+abs($Position[0]);
-       $TextLeft   = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextWidth/2);
-       imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$YMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["X"]);
-      }
-    }
-
-   /* Compute and draw the scale for X/Y charts */
-   function drawXYScale($Data,$DataDescription,$YSerieName,$XSerieName,$R,$G,$B,$WithMargin=0,$Angle=0,$Decimals=1)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateData("drawScale",$Data);
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
-     $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
-
-     /* Process Y scale */
-     if ( $this->VMin == NULL && $this->VMax == NULL)
-      {
-       $this->VMin = $Data[0][$YSerieName];
-       $this->VMax = $Data[0][$YSerieName];
-
-       foreach ( $Data as $Key => $Values )
-        {
-         if (isset($Data[$Key][$YSerieName]))
-          {
-           $Value = $Data[$Key][$YSerieName];
-           if ( $this->VMax < $Value) { $this->VMax = $Value; }
-           if ( $this->VMin > $Value) { $this->VMin = $Value; }
-          }
-        }
-
-       if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) )
-        $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
-
-       $DataRange = $this->VMax - $this->VMin;
-       if ( $DataRange == 0 ) { $DataRange = .1; }
-
-       /* Compute automatic scaling */
-       $ScaleOk = FALSE; $Factor = 1;
-       $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight;
-
-       if ( $this->VMin == 0 && $this->VMax == 0 )
-        { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
-       elseif ($MaxDivs > 1)
-        {
-         while(!$ScaleOk)
-          {
-           $Scale1 = ( $this->VMax - $this->VMin ) / $Factor;
-           $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2;
-           $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4;
-
-           if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;}
-           if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;}
-           if (!$ScaleOk)
-            {
-             if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
-             if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
-            }
-          }
-
-         if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor)
-          {
-           $GridID     = floor ( $this->VMax / $Scale / $Factor) + 1;
-           $this->VMax = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-
-         if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor)
-          {
-           $GridID     = floor( $this->VMin / $Scale / $Factor);
-           $this->VMin = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-        }
-       else /* Can occurs for small graphs */
-        $Scale = 1;
-
-       if ( !isset($Divisions) )
-        $Divisions = 2;
-
-       if ( $this->isRealInt(($this->VMax-$this->VMin)/($Divisions-1)))
-        $Divisions--;
-       elseif ( $this->isRealInt(($this->VMax-$this->VMin)/($Divisions+1)))
-        $Divisions++;
-      }
-     else
-      $Divisions = $this->Divisions;
-
-     $this->DivisionCount = $Divisions;
-
-     $DataRange = $this->VMax - $this->VMin;
-     if ( $DataRange == 0 ) { $DataRange = .1; }
-
-     $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions;
-     $this->DivisionRatio  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange;
-
-     $YPos = $this->GArea_Y2; $XMin = NULL;
-     for($i=1;$i<=$Divisions+1;$i++)
-      {
-       $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B);
-       $Value     = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
-       $Value     = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
-       if ( $DataDescription["Format"]["Y"] == "number" )
-        $Value = $Value.$DataDescription["Unit"]["Y"];
-       if ( $DataDescription["Format"]["Y"] == "time" )
-        $Value = $this->ToTime($Value);        
-       if ( $DataDescription["Format"]["Y"] == "date" )
-        $Value = $this->ToDate($Value);        
-       if ( $DataDescription["Format"]["Y"] == "metric" )
-        $Value = $this->ToMetric($Value);        
-       if ( $DataDescription["Format"]["Y"] == "currency" )
-        $Value = $this->ToCurrency($Value);        
-
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth = $Position[2]-$Position[0];
-       imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-10-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
-
-       if ( $XMin > $this->GArea_X1-10-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-10-$TextWidth; }
-
-       $YPos = $YPos - $this->DivisionHeight;
-      }
-
-     /* Process X scale */
-     if ( $this->VXMin == NULL && $this->VXMax == NULL)
-      {
-       $this->VXMin = $Data[0][$XSerieName];
-       $this->VXMax = $Data[0][$XSerieName];
-
-       foreach ( $Data as $Key => $Values )
-        {
-         if (isset($Data[$Key][$XSerieName]))
-          {
-           $Value = $Data[$Key][$XSerieName];
-           if ( $this->VXMax < $Value) { $this->VXMax = $Value; }
-           if ( $this->VXMin > $Value) { $this->VXMin = $Value; }
-          }
-        }
-
-       if ( $this->VXMax > preg_replace('/\.[0-9]+/','',$this->VXMax) )
-        $this->VXMax = preg_replace('/\.[0-9]+/','',$this->VXMax)+1;
-
-       $DataRange = $this->VMax - $this->VMin;
-       if ( $DataRange == 0 ) { $DataRange = .1; }
-
-       /* Compute automatic scaling */
-       $ScaleOk = FALSE; $Factor = 1;
-       $MinDivWidth = 25; $MaxDivs = ($this->GArea_X2 - $this->GArea_X1) / $MinDivWidth;
-
-       if ( $this->VXMin == 0 && $this->VXMax == 0 )
-        { $this->VXMin = 0; $this->VXMax = 2; $Scale = 1; $XDivisions = 2;}
-       elseif ($MaxDivs > 1)
-        {
-         while(!$ScaleOk)
-          {
-           $Scale1 = ( $this->VXMax - $this->VXMin ) / $Factor;
-           $Scale2 = ( $this->VXMax - $this->VXMin ) / $Factor / 2;
-           $Scale4 = ( $this->VXMax - $this->VXMin ) / $Factor / 4;
-
-           if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $XDivisions = floor($Scale1); $Scale = 1;}
-           if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $XDivisions = floor($Scale2); $Scale = 2;}
-           if (!$ScaleOk)
-            {
-             if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
-             if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
-            }
-          }
-
-         if ( floor($this->VXMax / $Scale / $Factor) != $this->VXMax / $Scale / $Factor)
-          {
-           $GridID     = floor ( $this->VXMax / $Scale / $Factor) + 1;
-           $this->VXMax = $GridID * $Scale * $Factor;
-           $XDivisions++;
-          }
-
-         if ( floor($this->VXMin / $Scale / $Factor) != $this->VXMin / $Scale / $Factor)
-          {
-           $GridID     = floor( $this->VXMin / $Scale / $Factor);
-           $this->VXMin = $GridID * $Scale * $Factor;
-           $XDivisions++;
-          }
-        }
-       else /* Can occurs for small graphs */
-        $Scale = 1;
-
-       if ( !isset($XDivisions) )
-        $XDivisions = 2;
-
-       if ( $this->isRealInt(($this->VXMax-$this->VXMin)/($XDivisions-1)))
-        $XDivisions--;
-       elseif ( $this->isRealInt(($this->VXMax-$this->VXMin)/($XDivisions+1)))
-        $XDivisions++;
-      }
-     else
-      $XDivisions = $this->XDivisions;
-
-     $this->XDivisionCount = $Divisions;
-     $this->DataCount      = $Divisions + 2;
-
-     $XDataRange = $this->VXMax - $this->VXMin;
-     if ( $XDataRange == 0 ) { $XDataRange = .1; }
-
-     $this->DivisionWidth   = ( $this->GArea_X2 - $this->GArea_X1 ) / $XDivisions;
-     $this->XDivisionRatio  = ( $this->GArea_X2 - $this->GArea_X1 ) / $XDataRange;
-
-     $XPos = $this->GArea_X1; $YMax = NULL;
-     for($i=1;$i<=$XDivisions+1;$i++)
-      {
-       $this->drawLine($XPos,$this->GArea_Y2,$XPos,$this->GArea_Y2+5,$R,$G,$B);
-
-       $Value     = $this->VXMin + ($i-1) * (( $this->VXMax - $this->VXMin ) / $XDivisions);
-       $Value     = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
-       if ( $DataDescription["Format"]["Y"] == "number" )
-        $Value = $Value.$DataDescription["Unit"]["Y"];
-       if ( $DataDescription["Format"]["Y"] == "time" )
-        $Value = $this->ToTime($Value);        
-       if ( $DataDescription["Format"]["Y"] == "date" )
-        $Value = $this->ToDate($Value);        
-       if ( $DataDescription["Format"]["Y"] == "metric" )
-        $Value = $this->ToMetric($Value);        
-       if ( $DataDescription["Format"]["Y"] == "currency" )
-        $Value = $this->ToCurrency($Value);        
-
-       $Position   = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
-       $TextWidth  = abs($Position[2])+abs($Position[0]);
-       $TextHeight = abs($Position[1])+abs($Position[3]);
-
-       if ( $Angle == 0 )
-        {
-         $YPos = $this->GArea_Y2+18;
-         imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
-        }
-       else
-        {
-         $YPos = $this->GArea_Y2+10+$TextHeight;
-         if ( $Angle <= 90 )
-          imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
-         else
-          imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
-         }
-
-       if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; }
-
-       $XPos = $XPos + $this->DivisionWidth;
-      }
-
-     /* Write the Y Axis caption if set */ 
-     if ( isset($DataDescription["Axis"]["Y"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
-       $TextHeight = abs($Position[1])+abs($Position[3]);
-       $TextTop    = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2);
-       imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-      }
-
-     /* Write the X Axis caption if set */ 
-     if ( isset($DataDescription["Axis"]["X"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["X"]);
-       $TextWidth  = abs($Position[2])+abs($Position[0]);
-       $TextLeft   = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextWidth/2);
-       imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$YMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["X"]);
-      }
-    }
-
-   /* Compute and draw the scale */
-   function drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
-    {
-     /* Draw mosaic */
-     if ( $Mosaic )
-      {
-       $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-       $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         =$this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $C_Rectangle =$this->AllocateColor($this->Layers[0],250,250,250);
-
-       $YPos  = $LayerHeight; //$this->GArea_Y2-1;
-       $LastY = $YPos;
-       for($i=0;$i<=$this->DivisionCount;$i++)
-        {
-         $LastY = $YPos;
-         $YPos  = $YPos - $this->DivisionHeight;
-
-         if ( $YPos <= 0 ) { $YPos = 1; }
-
-         if ( $i % 2 == 0 )
-          {
-           imagefilledrectangle($this->Layers[0],1,$YPos,$LayerWidth-1,$LastY,$C_Rectangle);
-          }
-        }
-       imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-      }
-
-     /* Horizontal lines */
-     $YPos = $this->GArea_Y2 - $this->DivisionHeight;
-     for($i=1;$i<=$this->DivisionCount;$i++)
-      {
-       if ( $YPos > $this->GArea_Y1 && $YPos < $this->GArea_Y2 )
-        $this->drawDottedLine($this->GArea_X1,$YPos,$this->GArea_X2,$YPos,$LineWidth,$R,$G,$B);
-        
-       $YPos = $YPos - $this->DivisionHeight;
-      }
-
-     /* Vertical lines */
-     if ( $this->GAreaXOffset == 0 )
-      { $XPos = $this->GArea_X1 + $this->DivisionWidth + $this->GAreaXOffset; $ColCount = $this->DataCount-2; }
-     else
-      { $XPos = $this->GArea_X1 + $this->GAreaXOffset; $ColCount = floor( ($this->GArea_X2 - $this->GArea_X1) / $this->DivisionWidth ); }
-
-     for($i=1;$i<=$ColCount;$i++)
-      {
-       if ( $XPos > $this->GArea_X1 && $XPos < $this->GArea_X2 )
-        $this->drawDottedLine(floor($XPos),$this->GArea_Y1,floor($XPos),$this->GArea_Y2,$LineWidth,$R,$G,$B);
-       $XPos = $XPos + $this->DivisionWidth;
-      }
-    }
-
-   /* retrieve the legends size */
-   function getLegendBoxSize($DataDescription)
-    {
-     if ( !isset($DataDescription["Description"]) )
-      return(-1);
-
-     /* <-10->[8]<-4->Text<-10-> */
-     $MaxWidth = 0; $MaxHeight = 8;
-     foreach($DataDescription["Description"] as $Key => $Value)
-      {
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth  = $Position[2]-$Position[0];
-       $TextHeight = $Position[1]-$Position[7];
-       if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
-       $MaxHeight = $MaxHeight + $TextHeight + 4;
-      }
-     $MaxHeight = $MaxHeight - 3;
-     $MaxWidth  = $MaxWidth + 32;
-
-     return(array($MaxWidth,$MaxHeight));
-    }
-
-   /* Draw the data legends */
-   function drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=TRUE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawLegend",$DataDescription);
-
-     if ( !isset($DataDescription["Description"]) )
-      return(-1);
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$Rt,$Gt,$Bt);
-
-     /* <-10->[8]<-4->Text<-10-> */
-     $MaxWidth = 0; $MaxHeight = 8;
-     foreach($DataDescription["Description"] as $Key => $Value)
-      {
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth  = $Position[2]-$Position[0];
-       $TextHeight = $Position[1]-$Position[7];
-       if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
-       $MaxHeight = $MaxHeight + $TextHeight + 4;
-      }
-     $MaxHeight = $MaxHeight - 5;
-     $MaxWidth  = $MaxWidth + 32;
-
-     if ( $Rs == -1 || $Gs == -1 || $Bs == -1 )
-      { $Rs = $R-30; $Gs = $G-30; $Bs = $B-30; }
-
-     if ( $Border )
-      {
-       $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$Rs,$Gs,$Bs);
-       $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B);
-      }
-
-     $YOffset = 4 + $this->FontSize; $ID = 0;
-     foreach($DataDescription["Description"] as $Key => $Value)
-      {
-       $this->drawFilledRoundedRectangle($XPos+10,$YPos+$YOffset-4,$XPos+14,$YPos+$YOffset-4,2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
-       imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value);
-
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextHeight = $Position[1]-$Position[7];
-
-       $YOffset = $YOffset + $TextHeight + 4;
-       $ID++;
-      }
-    }
-
-   /* Draw the data legends */
-   function drawPieLegend($XPos,$YPos,$Data,$DataDescription,$R,$G,$B)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawPieLegend",$DataDescription,FALSE);
-     $this->validateData("drawPieLegend",$Data);
-
-     if ( !isset($DataDescription["Position"]) )
-      return(-1);
-
-     $C_TextColor =$this->AllocateColor($this->Picture,0,0,0);
-
-     /* <-10->[8]<-4->Text<-10-> */
-     $MaxWidth = 0; $MaxHeight = 8;
-     foreach($Data as $Key => $Value)
-      {
-       $Value2 = $Value[$DataDescription["Position"]];
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value2);
-       $TextWidth = $Position[2]-$Position[0];
-       $TextHeight = $Position[1]-$Position[7];
-       if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
-
-       $MaxHeight = $MaxHeight + $TextHeight + 4;
-      }
-     $MaxHeight = $MaxHeight - 3;
-     $MaxWidth  = $MaxWidth + 32;
-
-     $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$R-30,$G-30,$B-30);
-     $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B);
-
-     $YOffset = 4 + $this->FontSize; $ID = 0;
-     foreach($Data as $Key => $Value)
-      {
-       $Value2     = $Value[$DataDescription["Position"]];
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value2);
-       $TextHeight = $Position[1]-$Position[7];
-       $this->drawFilledRectangle($XPos+10,$YPos+$YOffset-6,$XPos+14,$YPos+$YOffset-2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
-
-       imagettftext($this->Picture,$this->FontSize,0,$XPos+22,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value2);
-       $YOffset = $YOffset + $TextHeight + 4;
-       $ID++;
-      }
-    }
-
-   /* Draw the graph title */
-   function drawTitle($XPos,$YPos,$Value,$R,$G,$B,$XPos2=-1,$YPos2=-1,$Shadow=FALSE)
-    {
-     $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B);
-
-     if ( $XPos2 != -1 )
-      {
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth = $Position[2]-$Position[0];
-       $XPos      = floor(( $XPos2 - $XPos - $TextWidth ) / 2 ) + $XPos;
-      }
-
-     if ( $YPos2 != -1 )
-      {
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextHeight = $Position[5]-$Position[3];
-       $YPos       = floor(( $YPos2 - $YPos - $TextHeight ) / 2 ) + $YPos;
-      }
-
-     if ( $Shadow )
-      {
-       $C_ShadowColor = $this->AllocateColor($this->Picture,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor);
-       imagettftext($this->Picture,$this->FontSize,0,$XPos+$this->ShadowXDistance,$YPos+$this->ShadowYDistance,$C_ShadowColor,$this->FontName,$Value);     
-      }
-
-     imagettftext($this->Picture,$this->FontSize,0,$XPos,$YPos,$C_TextColor,$this->FontName,$Value);     
-    }
-
-   /* Draw a text box with text align & alpha properties */
-   function drawTextBox($X1,$Y1,$X2,$Y2,$Text,$Angle=0,$R=255,$G=255,$B=255,$Align=ALIGN_LEFT,$Shadow=TRUE,$BgR=-1,$BgG=-1,$BgB=-1,$Alpha=100)
-    {
-     $Position   = imageftbbox($this->FontSize,$Angle,$this->FontName,$Text);
-     $TextWidth  = $Position[2]-$Position[0];
-     $TextHeight = $Position[5]-$Position[3];
-     $AreaWidth  = $X2 - $X1;
-     $AreaHeight = $Y2 - $Y1;
-
-     if ( $BgR != -1 && $BgG != -1 && $BgB != -1 )
-      $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$BgR,$BgG,$BgB,FALSE,$Alpha);
-
-     if ( $Align == ALIGN_TOP_LEFT )      { $X = $X1+1; $Y = $Y1+$this->FontSize+1; }
-     if ( $Align == ALIGN_TOP_CENTER )    { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y1+$this->FontSize+1; }
-     if ( $Align == ALIGN_TOP_RIGHT )     { $X = $X2-$TextWidth-1; $Y = $Y1+$this->FontSize+1; }
-     if ( $Align == ALIGN_LEFT )          { $X = $X1+1; $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
-     if ( $Align == ALIGN_CENTER )        { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
-     if ( $Align == ALIGN_RIGHT )         { $X = $X2-$TextWidth-1; $Y = $Y1+($AreaHeight/2)-($TextHeight/2); }
-     if ( $Align == ALIGN_BOTTOM_LEFT )   { $X = $X1+1; $Y = $Y2-1; }
-     if ( $Align == ALIGN_BOTTOM_CENTER ) { $X = $X1+($AreaWidth/2)-($TextWidth/2); $Y = $Y2-1; }
-     if ( $Align == ALIGN_BOTTOM_RIGHT )  { $X = $X2-$TextWidth-1; $Y = $Y2-1; }
-
-     $C_TextColor   =$this->AllocateColor($this->Picture,$R,$G,$B);
-     $C_ShadowColor =$this->AllocateColor($this->Picture,0,0,0);
-     if ( $Shadow )
-      imagettftext($this->Picture,$this->FontSize,$Angle,$X+1,$Y+1,$C_ShadowColor,$this->FontName,$Text);     
-
-     imagettftext($this->Picture,$this->FontSize,$Angle,$X,$Y,$C_TextColor,$this->FontName,$Text);     
-    }
-
-   /* Compute and draw the scale */
-   function drawTreshold($Value,$R,$G,$B,$ShowLabel=FALSE,$ShowOnRight=FALSE,$TickWidth=4,$FreeText=NULL)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$R,$G,$B);
-     $Y = $this->GArea_Y2 - ($Value - $this->VMin) * $this->DivisionRatio;
-
-     if ( $Y <= $this->GArea_Y1 || $Y >= $this->GArea_Y2 )
-      return(-1);
-
-     if ( $TickWidth == 0 )
-      $this->drawLine($this->GArea_X1,$Y,$this->GArea_X2,$Y,$R,$G,$B);
-     else
-      $this->drawDottedLine($this->GArea_X1,$Y,$this->GArea_X2,$Y,$TickWidth,$R,$G,$B);
-
-     if ( $ShowLabel )
-      {
-       if ( $FreeText == NULL )
-        { $Label = $Value; } else { $Label = $FreeText; }
-
-       if ( $ShowOnRight )
-        imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+2,$Y+($this->FontSize/2),$C_TextColor,$this->FontName,$Label);
-       else
-        imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1+2,$Y-($this->FontSize/2),$C_TextColor,$this->FontName,$Label);
-      }
-    }
-
-   /* This function put a label on a specific point */
-   function setLabel($Data,$DataDescription,$SerieName,$ValueName,$Caption,$R=210,$G=210,$B=210)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("setLabel",$DataDescription);
-     $this->validateData("setLabel",$Data);
-     $ShadowFactor = 100;
-     $C_Label      =$this->AllocateColor($this->Picture,$R,$G,$B);
-     $C_Shadow     =$this->AllocateColor($this->Picture,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
-     $C_TextColor  =$this->AllocateColor($this->Picture,0,0,0);
-
-     $Cp = 0; $Found = FALSE;
-     foreach ( $Data as $Key => $Value )
-      {
-       if ( $Data[$Key][$DataDescription["Position"]] == $ValueName )
-        { $NumericalValue = $Data[$Key][$SerieName]; $Found = TRUE; }
-       if ( !$Found )
-        $Cp++;
-      }
-
-     $XPos = $this->GArea_X1 + $this->GAreaXOffset + ( $this->DivisionWidth * $Cp ) + 2;
-     $YPos = $this->GArea_Y2 - ($NumericalValue - $this->VMin) * $this->DivisionRatio;
-
-     $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-     $TextHeight = $Position[3] - $Position[5];
-     $TextWidth  = $Position[2]-$Position[0] + 2;
-     $TextOffset = floor($TextHeight/2);
-
-     // Shadow
-     $Poly = array($XPos+1,$YPos+1,$XPos + 9,$YPos - $TextOffset,$XPos + 8,$YPos + $TextOffset + 2);
-     imagefilledpolygon($this->Picture,$Poly,3,$C_Shadow);
-     $this->drawLine($XPos,$YPos+1,$XPos + 9,$YPos - $TextOffset - .2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
-     $this->drawLine($XPos,$YPos+1,$XPos + 9,$YPos + $TextOffset + 2.2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
-     $this->drawFilledRectangle($XPos + 9,$YPos - $TextOffset-.2,$XPos + 13 + $TextWidth,$YPos + $TextOffset + 2.2,$R-$ShadowFactor,$G-$ShadowFactor,$B-$ShadowFactor);
-
-     // Label background
-     $Poly = array($XPos,$YPos,$XPos + 8,$YPos - $TextOffset - 1,$XPos + 8,$YPos + $TextOffset + 1);
-     imagefilledpolygon($this->Picture,$Poly,3,$C_Label);
-     $this->drawLine($XPos-1,$YPos,$XPos + 8,$YPos - $TextOffset - 1.2,$R,$G,$B);
-     $this->drawLine($XPos-1,$YPos,$XPos + 8,$YPos + $TextOffset + 1.2,$R,$G,$B);
-     $this->drawFilledRectangle($XPos + 8,$YPos - $TextOffset - 1.2,$XPos + 12 + $TextWidth,$YPos + $TextOffset + 1.2,$R,$G,$B);
-
-     imagettftext($this->Picture,$this->FontSize,0,$XPos + 10,$YPos + $TextOffset,$C_TextColor,$this->FontName,$Caption);
-    }
-
-   /* This function draw a plot graph */
-   function drawPlotGraph($Data,$DataDescription,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawPlotGraph",$DataDescription);
-     $this->validateData("drawPlotGraph",$Data);
-
-     $GraphID = 0;
-     $Ro = $R2; $Go = $G2; $Bo = $B2;
-
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $R = $this->Palette[$ColorID]["R"];
-       $G = $this->Palette[$ColorID]["G"];
-       $B = $this->Palette[$ColorID]["B"];
-       $R2 = $Ro; $G2 = $Go; $B2 = $Bo;
-
-       if ( isset($DataDescription["Symbol"][$ColName]) )
-        {
-         $Is_Alpha = ((ord ( file_get_contents ($DataDescription["Symbol"][$ColName], false, null, 25, 1)) & 6) & 4) == 4;
-
-         $Infos       = getimagesize($DataDescription["Symbol"][$ColName]);
-         $ImageWidth  = $Infos[0];
-         $ImageHeight = $Infos[1];
-         $Symbol      = imagecreatefromgif($DataDescription["Symbol"][$ColName]);
-        }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-       $Hsize = round($BigRadius/2);
-       $R3 = -1; $G3 = -1; $B3 = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         $Value = $Data[$Key][$ColName];
-         $YPos  = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-         /* Save point into the image map if option activated */
-         if ( $this->BuildMap )
-          $this->addToImageMap($XPos-$Hsize,$YPos-$Hsize,$XPos+1+$Hsize,$YPos+$Hsize+1,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Plot");
-
-         if ( is_numeric($Value) )
-          {
-           if ( !isset($DataDescription["Symbol"][$ColName]) )
-            {
-
-             if ( $Shadow )
-              {
-               if ( $R3 !=-1 && $G3 !=-1 && $B3 !=-1 )
-                $this->drawFilledCircle($XPos+2,$YPos+2,$BigRadius,$R3,$G3,$B3);
-               else
-                {
-                 $R3 = $this->Palette[$ColorID]["R"]-20; if ( $R3 < 0 ) { $R3 = 0; }
-                 $G3 = $this->Palette[$ColorID]["G"]-20; if ( $G3 < 0 ) { $G3 = 0; }
-                 $B3 = $this->Palette[$ColorID]["B"]-20; if ( $B3 < 0 ) { $B3 = 0; }
-                 $this->drawFilledCircle($XPos+2,$YPos+2,$BigRadius,$R3,$G3,$B3);
-                }
-              }
-
-             $this->drawFilledCircle($XPos+1,$YPos+1,$BigRadius,$R,$G,$B);
-
-             if ( $SmallRadius != 0 )
-              {
-               if ( $R2 !=-1 && $G2 !=-1 && $B2 !=-1 )
-                $this->drawFilledCircle($XPos+1,$YPos+1,$SmallRadius,$R2,$G2,$B2);
-               else
-                {
-                 $R2 = $this->Palette[$ColorID]["R"]-15; if ( $R2 < 0 ) { $R2 = 0; }
-                 $G2 = $this->Palette[$ColorID]["G"]-15; if ( $G2 < 0 ) { $G2 = 0; }
-                 $B2 = $this->Palette[$ColorID]["B"]-15; if ( $B2 < 0 ) { $B2 = 0; }
-
-                 $this->drawFilledCircle($XPos+1,$YPos+1,$SmallRadius,$R2,$G2,$B2);
-                }
-              }
-            }
-           else
-            {
-             imagecopymerge($this->Picture,$Symbol,$XPos+1-$ImageWidth/2,$YPos+1-$ImageHeight/2,0,0,$ImageWidth,$ImageHeight,100);
-            }
-          }
-
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-       $GraphID++;
-      }
-    }
-
-   /* This function draw a plot graph in an X/Y space */
-   function drawXYPlotGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0,$BigRadius=5,$SmallRadius=2,$R2=-1,$G2=-1,$B2=-1,$Shadow=TRUE)
-    {
-     $R = $this->Palette[$PaletteID]["R"];
-     $G = $this->Palette[$PaletteID]["G"];
-     $B = $this->Palette[$PaletteID]["B"];
-     $R3 = -1; $G3 = -1; $B3 = -1;
-
-     $YLast = -1; $XLast = -1;
-     foreach ( $Data as $Key => $Values )
-      {
-       if ( isset($Data[$Key][$YSerieName]) && isset($Data[$Key][$XSerieName]) )
-        {
-         $X = $Data[$Key][$XSerieName];
-         $Y = $Data[$Key][$YSerieName];
-
-         $Y = $this->GArea_Y2 - (($Y-$this->VMin) * $this->DivisionRatio);
-         $X = $this->GArea_X1 + (($X-$this->VXMin) * $this->XDivisionRatio);
-
-
-         if ( $Shadow )
-          {
-           if ( $R3 !=-1 && $G3 !=-1 && $B3 !=-1 )
-            $this->drawFilledCircle($X+2,$Y+2,$BigRadius,$R3,$G3,$B3);
-           else
-            {
-             $R3 = $this->Palette[$PaletteID]["R"]-20; if ( $R < 0 ) { $R = 0; }
-             $G3 = $this->Palette[$PaletteID]["G"]-20; if ( $G < 0 ) { $G = 0; }
-             $B3 = $this->Palette[$PaletteID]["B"]-20; if ( $B < 0 ) { $B = 0; }
-             $this->drawFilledCircle($X+2,$Y+2,$BigRadius,$R3,$G3,$B3);
-            }
-          }
-
-         $this->drawFilledCircle($X+1,$Y+1,$BigRadius,$R,$G,$B);
-
-         if ( $R2 !=-1 && $G2 !=-1 && $B2 !=-1 )
-          $this->drawFilledCircle($X+1,$Y+1,$SmallRadius,$R2,$G2,$B2);
-         else
-          {
-           $R2 = $this->Palette[$PaletteID]["R"]+20; if ( $R > 255 ) { $R = 255; }
-           $G2 = $this->Palette[$PaletteID]["G"]+20; if ( $G > 255 ) { $G = 255; }
-           $B2 = $this->Palette[$PaletteID]["B"]+20; if ( $B > 255 ) { $B = 255; }
-           $this->drawFilledCircle($X+1,$Y+1,$SmallRadius,$R2,$G2,$B2);
-          }
-        }
-      }
-
-    }
-
-   /* This function draw an area between two series */
-   function drawArea($Data,$Serie1,$Serie2,$R,$G,$B,$Alpha = 50)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateData("drawArea",$Data);
-
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-     $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-     $C_White         =$this->AllocateColor($this->Layers[0],255,255,255);
-     imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-     imagecolortransparent($this->Layers[0],$C_White);
-
-     $C_Graph =$this->AllocateColor($this->Layers[0],$R,$G,$B);
-
-     $XPos     = $this->GAreaXOffset;
-     $LastXPos = -1;
-     foreach ( $Data as $Key => $Values )
-      {
-       $Value1 = $Data[$Key][$Serie1];
-       $Value2 = $Data[$Key][$Serie2];
-       $YPos1  = $LayerHeight - (($Value1-$this->VMin) * $this->DivisionRatio);
-       $YPos2  = $LayerHeight - (($Value2-$this->VMin) * $this->DivisionRatio);
-
-       if ( $LastXPos != -1 )
-        {
-         $Points   = "";
-         $Points[] = $LastXPos; $Points[] = $LastYPos1;
-         $Points[] = $LastXPos; $Points[] = $LastYPos2;
-         $Points[] = $XPos; $Points[] = $YPos2;
-         $Points[] = $XPos; $Points[] = $YPos1;
-
-         imagefilledpolygon($this->Layers[0],$Points,4,$C_Graph);
-        }
-
-       $LastYPos1 = $YPos1;
-       $LastYPos2 = $YPos2;
-       $LastXPos  = $XPos;
-
-       $XPos = $XPos + $this->DivisionWidth;
-      }
-
-     imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-     imagedestroy($this->Layers[0]);
-    }
-
-
-   /* This function write the values of the specified series */
-   function writeValues($Data,$DataDescription,$Series)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("writeValues",$DataDescription);
-     $this->validateData("writeValues",$Data);
-
-     if ( !is_array($Series) ) { $Series = array($Series); }     
-
-     foreach($Series as $Key => $Serie)
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $Serie ) { $ColorID = $ID; }; $ID++; }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$Serie]) && is_numeric($Data[$Key][$Serie]))
-          {
-           $Value = $Data[$Key][$Serie];
-           $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-           $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$Value);
-           $Width  = $Positions[2] - $Positions[6]; $XOffset = $XPos - ($Width/2); 
-           $Height = $Positions[3] - $Positions[7]; $YOffset = $YPos - 4;
-
-           $C_TextColor =$this->AllocateColor($this->Picture,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-           imagettftext($this->Picture,$this->FontSize,0,$XOffset,$YOffset,$C_TextColor,$this->FontName,$Value);
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-
-      }
-    }
-
-   /* This function draw a line graph */
-   function drawLineGraph($Data,$DataDescription,$SerieName="")
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawLineGraph",$DataDescription);
-     $this->validateData("drawLineGraph",$Data);
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       if ( $SerieName == "" || $SerieName == $ColName )
-        {
-         $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-         $XLast = -1;
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            {
-             $Value = $Data[$Key][$ColName];
-             $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Line");
-
-             if (!is_numeric($Value)) { $XLast = -1; }
-             if ( $XLast != -1 )
-              $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-
-             $XLast = $XPos;
-             $YLast = $YPos;
-             if (!is_numeric($Value)) { $XLast = -1; }
-            }
-           $XPos = $XPos + $this->DivisionWidth;
-          }
-         $GraphID++;
-        }
-      }
-    }
-
-   /* This function draw a line graph */
-   function drawXYGraph($Data,$DataDescription,$YSerieName,$XSerieName,$PaletteID=0)
-    {
-     $YLast = -1; $XLast = -1;
-     foreach ( $Data as $Key => $Values )
-      {
-       if ( isset($Data[$Key][$YSerieName]) && isset($Data[$Key][$XSerieName]) )
-        {
-         $X = $Data[$Key][$XSerieName];
-         $Y = $Data[$Key][$YSerieName];
-
-         $Y = $this->GArea_Y2 - (($Y-$this->VMin) * $this->DivisionRatio);
-         $X = $this->GArea_X1 + (($X-$this->VXMin) * $this->XDivisionRatio);
-
-         if ($XLast != -1 && $YLast != -1)
-          {
-           $this->drawLine($XLast,$YLast,$X,$Y,$this->Palette[$PaletteID]["R"],$this->Palette[$PaletteID]["G"],$this->Palette[$PaletteID]["B"],TRUE);
-          }
-
-         $XLast = $X;
-         $YLast = $Y;
-        }
-      }
-    }
-
-   /* This function draw a cubic curve */
-   function drawCubicCurve($Data,$DataDescription,$Accuracy=.1,$SerieName="")
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawCubicCurve",$DataDescription);
-     $this->validateData("drawCubicCurve",$Data);
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $SerieName == "" || $SerieName == $ColName )
-        {
-         $XIn = ""; $Yin = ""; $Yt = ""; $U = "";
-         $XIn[0] = 0; $YIn[0] = 0;
-
-         $ID = 0;
-         foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-          { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-         $Index = 1;
-         $XLast = -1; $Missing = "";
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-             $XIn[$Index] = $Index;
-             $YIn[$Index] = $Value;
-             if ( !is_numeric($Value) ) { $Missing[$Index] = TRUE; }
-             $Index++;
-            }
-          }
-         $Index--;
-
-         $Yt[0] = 0;
-         $Yt[1] = 0;
-         $U[1]  = 0;
-         for($i=2;$i<=$Index-1;$i++)
-          {
-           $Sig    = ($XIn[$i] - $XIn[$i-1]) / ($XIn[$i+1] - $XIn[$i-1]);
-           $p      = $Sig * $Yt[$i-1] + 2;
-           $Yt[$i] = ($Sig - 1) / $p;
-           $U[$i]  = ($YIn[$i+1] - $YIn[$i]) / ($XIn[$i+1] - $XIn[$i]) - ($YIn[$i] - $YIn[$i-1]) / ($XIn[$i] - $XIn[$i-1]);
-           $U[$i]  = (6 * $U[$i] / ($XIn[$i+1] - $XIn[$i-1]) - $Sig * $U[$i-1]) / $p;
-          }
-
-         $qn = 0;
-         $un = 0;
-         $Yt[$Index] = ($un - $qn * $U[$Index-1]) / ($qn * $Yt[$Index-1] + 1);
-
-         for($k=$Index-1;$k>=1;$k--)
-          $Yt[$k] = $Yt[$k] * $Yt[$k+1] + $U[$k];
-
-         $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-         for($X=1;$X<=$Index;$X=$X+$Accuracy)
-          {
-           $klo = 1;
-           $khi = $Index;
-           $k   = $khi - $klo;
-           while($k > 1)
-            {
-             $k = $khi - $klo;
-             If ( $XIn[$k] >= $X )
-              $khi = $k;
-             else
-              $klo = $k;
-            }
-           $klo = $khi - 1;
-
-           $h     = $XIn[$khi] - $XIn[$klo];
-           $a     = ($XIn[$khi] - $X) / $h;
-           $b     = ($X - $XIn[$klo]) / $h;
-           $Value = $a * $YIn[$klo] + $b * $YIn[$khi] + (($a*$a*$a - $a) * $Yt[$klo] + ($b*$b*$b - $b) * $Yt[$khi]) * ($h*$h) / 6;
-
-           $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-           if ( $XLast != -1 && !isset($Missing[floor($X)]) && !isset($Missing[floor($X+1)]) )
-            $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-
-           $XLast = $XPos;
-           $YLast = $YPos;
-           $XPos  = $XPos + $this->DivisionWidth * $Accuracy;
-          }
-
-         // Add potentialy missing values
-         $XPos  = $XPos - $this->DivisionWidth * $Accuracy;
-         if ( $XPos < ($this->GArea_X2 - $this->GAreaXOffset) )
-          {
-           $YPos = $this->GArea_Y2 - (($YIn[$Index]-$this->VMin) * $this->DivisionRatio);
-           $this->drawLine($XLast,$YLast,$this->GArea_X2-$this->GAreaXOffset,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-          }
-
-         $GraphID++;
-        }
-      }
-    }
-
-   /* This function draw a filled cubic curve */
-   function drawFilledCubicCurve($Data,$DataDescription,$Accuracy=.1,$Alpha=100,$AroundZero=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawFilledCubicCurve",$DataDescription);
-     $this->validateData("drawFilledCubicCurve",$Data);
-
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-     $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $YZero > $LayerHeight ) { $YZero = $LayerHeight; }
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $XIn = ""; $Yin = ""; $Yt = ""; $U = "";
-       $XIn[0] = 0; $YIn[0] = 0;
-
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $Index = 1;
-       $XLast = -1; $Missing = "";
-       foreach ( $Data as $Key => $Values )
-        {
-         $Value = $Data[$Key][$ColName];
-         $XIn[$Index] = $Index;
-         $YIn[$Index] = $Value;
-         if ( !is_numeric($Value) ) { $Missing[$Index] = TRUE; }
-         $Index++;
-        }
-       $Index--;
- 
-       $Yt[0] = 0;
-       $Yt[1] = 0;
-       $U[1]  = 0;
-       for($i=2;$i<=$Index-1;$i++)
-        {
-         $Sig    = ($XIn[$i] - $XIn[$i-1]) / ($XIn[$i+1] - $XIn[$i-1]);
-         $p      = $Sig * $Yt[$i-1] + 2;
-         $Yt[$i] = ($Sig - 1) / $p;
-         $U[$i]  = ($YIn[$i+1] - $YIn[$i]) / ($XIn[$i+1] - $XIn[$i]) - ($YIn[$i] - $YIn[$i-1]) / ($XIn[$i] - $XIn[$i-1]);
-         $U[$i]  = (6 * $U[$i] / ($XIn[$i+1] - $XIn[$i-1]) - $Sig * $U[$i-1]) / $p;
-        }
-
-       $qn = 0;
-       $un = 0;
-       $Yt[$Index] = ($un - $qn * $U[$Index-1]) / ($qn * $Yt[$Index-1] + 1);
-
-       for($k=$Index-1;$k>=1;$k--)
-        $Yt[$k] = $Yt[$k] * $Yt[$k+1] + $U[$k];
-
-       $Points   = "";
-       $Points[] = $this->GAreaXOffset;
-       $Points[] = $LayerHeight;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         =$this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $YLast = NULL;
-       $XPos  = $this->GAreaXOffset; $PointsCount = 2;
-       for($X=1;$X<=$Index;$X=$X+$Accuracy)
-        {
-         $klo = 1;
-         $khi = $Index;
-         $k   = $khi - $klo;
-         while($k > 1)
-          {
-           $k = $khi - $klo;
-           If ( $XIn[$k] >= $X )
-            $khi = $k;
-           else
-            $klo = $k;
-          }
-         $klo = $khi - 1;
-
-         $h     = $XIn[$khi] - $XIn[$klo];
-         $a     = ($XIn[$khi] - $X) / $h;
-         $b     = ($X - $XIn[$klo]) / $h;
-         $Value = $a * $YIn[$klo] + $b * $YIn[$khi] + (($a*$a*$a - $a) * $Yt[$klo] + ($b*$b*$b - $b) * $Yt[$khi]) * ($h*$h) / 6;
-
-         $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
-
-         if ( $YLast != NULL && $AroundZero && !isset($Missing[floor($X)]) && !isset($Missing[floor($X+1)]))
-          {
-           $aPoints   = "";
-           $aPoints[] = $XLast;
-           $aPoints[] = $YLast;
-           $aPoints[] = $XPos;
-           $aPoints[] = $YPos;
-           $aPoints[] = $XPos;
-           $aPoints[] = $YZero;
-           $aPoints[] = $XLast;
-           $aPoints[] = $YZero;
-
-           $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-           imagefilledpolygon($this->Layers[0],$aPoints,4,$C_Graph);
-          }
-
-         if ( !isset($Missing[floor($X)]) || $YLast == NULL )
-          {
-           $PointsCount++;
-           $Points[] = $XPos;
-           $Points[] = $YPos;
-          }
-         else
-          {
-           $PointsCount++; $Points[] = $XLast; $Points[] = $LayerHeight;
-          }
-
-         $YLast = $YPos; $XLast = $XPos; 
-         $XPos  = $XPos + $this->DivisionWidth * $Accuracy;
-        }
-
-       // Add potentialy missing values
-       $XPos  = $XPos - $this->DivisionWidth * $Accuracy;
-       if ( $XPos < ($LayerWidth-$this->GAreaXOffset) )
-        {
-         $YPos = $LayerHeight - (($YIn[$Index]-$this->VMin) * $this->DivisionRatio);
-
-         if ( $YLast != NULL && $AroundZero )
-          {
-           $aPoints   = "";
-           $aPoints[] = $XLast;
-           $aPoints[] = $YLast;
-           $aPoints[] = $LayerWidth-$this->GAreaXOffset;
-           $aPoints[] = $YPos;
-           $aPoints[] = $LayerWidth-$this->GAreaXOffset;
-           $aPoints[] = $YZero;
-           $aPoints[] = $XLast;
-           $aPoints[] = $YZero;
-
-           $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-           imagefilledpolygon($this->Layers[0],$aPoints,4,$C_Graph);
-          }
-
-         if ( $YIn[$klo] != "" && $YIn[$khi] != "" || $YLast == NULL )
-          {
-           $PointsCount++;
-           $Points[] = $LayerWidth-$this->GAreaXOffset;
-           $Points[] = $YPos;
-          }
-        }
-
-       $Points[] = $LayerWidth-$this->GAreaXOffset;
-       $Points[] = $LayerHeight;
-
-       if ( !$AroundZero )
-        {
-         $C_Graph =$this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-         imagefilledpolygon($this->Layers[0],$Points,$PointsCount,$C_Graph);
-        }
-
-       imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-
-       $this->drawCubicCurve($Data,$DataDescription,$Accuracy,$ColName);
-
-       $GraphID++;
-      }
-    }
-
-   /* This function draw a filled line graph */
-   function drawFilledLineGraph($Data,$DataDescription,$Alpha=100,$AroundZero=FALSE)
-    {
-     $Empty = -2147483647;
-
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawFilledLineGraph",$DataDescription);
-     $this->validateData("drawFilledLineGraph",$Data);
-
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $aPoints   = "";
-       $aPoints[] = $this->GAreaXOffset;
-       $aPoints[] = $LayerHeight;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         = $this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $XPos  = $this->GAreaXOffset;
-       $XLast = -1; $PointsCount = 2;
-       $YZero = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
-       if ( $YZero > $LayerHeight ) { $YZero = $LayerHeight; }
-
-       $YLast = $Empty;
-       foreach ( $Data as $Key => $Values )
-        {
-         $Value = $Data[$Key][$ColName];
-         $YPos = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
-
-         /* Save point into the image map if option activated */
-         if ( $this->BuildMap )
-          $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"FLine");
-
-         if ( !is_numeric($Value) )
-          {
-           $PointsCount++;
-           $aPoints[] = $XLast;
-           $aPoints[] = $LayerHeight;
-
-           $YLast = $Empty;
-          }
-         else
-          {
-           $PointsCount++;
-           if ( $YLast <> $Empty )
-            { $aPoints[] = $XPos; $aPoints[] = $YPos; }
-           else
-            { $PointsCount++; $aPoints[] = $XPos; $aPoints[] = $LayerHeight; $aPoints[] = $XPos; $aPoints[] = $YPos; }
-
-           if ($YLast <> $Empty && $AroundZero)
-            {
-             $Points   = "";
-             $Points[] = $XLast; $Points[] = $YLast;
-             $Points[] = $XPos;
-             $Points[] = $YPos;
-             $Points[] = $XPos;
-             $Points[] = $YZero;
-             $Points[] = $XLast;
-             $Points[] = $YZero;
-
-             $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-             imagefilledpolygon($this->Layers[0],$Points,4,$C_Graph);
-            }
-           $YLast = $YPos;
-          }
-
-         $XLast = $XPos;
-         $XPos  = $XPos + $this->DivisionWidth;
-        }
-       $aPoints[] = $LayerWidth - $this->GAreaXOffset;
-       $aPoints[] = $LayerHeight;
-
-       if ( $AroundZero == FALSE )
-        {
-         $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-         imagefilledpolygon($this->Layers[0],$aPoints,$PointsCount,$C_Graph);
-        }
-
-       imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-       $GraphID++;
-       $this->drawLineGraph($Data,$DataDescription,$ColName);
-      }
-    }
-
-   /* This function draw a bar graph */
-   function drawOverlayBarGraph($Data,$DataDescription,$Alpha=50)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawOverlayBarGraph",$DataDescription);
-     $this->validateData("drawOverlayBarGraph",$Data);
-
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $this->Layers[$GraphID] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White                = $this->AllocateColor($this->Layers[$GraphID],255,255,255);
-       $C_Graph                = $this->AllocateColor($this->Layers[$GraphID],$this->Palette[$GraphID]["R"],$this->Palette[$GraphID]["G"],$this->Palette[$GraphID]["B"]);
-       imagefilledrectangle($this->Layers[$GraphID],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[$GraphID],$C_White);
-
-       $XWidth = $this->DivisionWidth / 4;
-       $XPos   = $this->GAreaXOffset;
-       $YZero  = $LayerHeight - ((0-$this->VMin) * $this->DivisionRatio);
-       $XLast  = -1; $PointsCount = 2;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]) )
-          {
-           $Value = $Data[$Key][$ColName];
-           if ( is_numeric($Value) )
-            {
-             $YPos  = $LayerHeight - (($Value-$this->VMin) * $this->DivisionRatio);
-
-             imagefilledrectangle($this->Layers[$GraphID],$XPos-$XWidth,$YPos,$XPos+$XWidth,$YZero,$C_Graph);
-
-             $X1 = floor($XPos - $XWidth + $this->GArea_X1); $Y1 = floor($YPos+$this->GArea_Y1) + .2;
-             $X2 = floor($XPos + $XWidth + $this->GArea_X1); $Y2 = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
-             if ( $X1 <= $this->GArea_X1 ) { $X1 = $this->GArea_X1 + 1; }
-             if ( $X2 >= $this->GArea_X2 ) { $X2 = $this->GArea_X2 - 1; }
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              $this->addToImageMap($X1,min($Y1,$Y2),$X2,max($Y1,$Y2),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"oBar");
-
-             $this->drawLine($X1,$Y1,$X2,$Y1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-            }
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-
-       $GraphID++;
-      }
-
-     for($i=0;$i<=($GraphID-1);$i++)
-      {
-       imagecopymerge($this->Picture,$this->Layers[$i],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[$i]);
-      }
-    }
-
-   /* This function draw a bar graph */
-   function drawBarGraph($Data,$DataDescription,$Shadow=FALSE,$Alpha=100)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawBarGraph",$DataDescription);
-     $this->validateData("drawBarGraph",$Data);
-
-     $GraphID      = 0;
-     $Series       = count($DataDescription["Values"]);
-     $SeriesWidth  = $this->DivisionWidth / ($Series+1);
-     $SerieXOffset = $this->DivisionWidth / 2 - $SeriesWidth / 2;
-
-     $YZero  = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; }
-
-     $SerieID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset - $SerieXOffset + $SeriesWidth * $SerieID;
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           if ( is_numeric($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-             $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              {
-               $this->addToImageMap($XPos+1,min($YZero,$YPos),$XPos+$SeriesWidth-1,max($YZero,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
-              }
-           
-             if ( $Shadow && $Alpha == 100 )
-              $this->drawRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,25,25,25,TRUE,$Alpha);
-
-             $this->drawFilledRectangle($XPos+1,$YZero,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-            }
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-       $SerieID++;
-      }
-    }
-
-   /* This function draw a stacked bar graph */
-   function drawStackedBarGraph($Data,$DataDescription,$Alpha=50,$Contiguous=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawBarGraph",$DataDescription);
-     $this->validateData("drawBarGraph",$Data);
-
-     $GraphID      = 0;
-     $Series       = count($DataDescription["Values"]);
-     if ( $Contiguous )
-      $SeriesWidth  = $this->DivisionWidth;
-     else
-      $SeriesWidth  = $this->DivisionWidth * .8;
-
-     $YZero  = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; }
-
-     $SerieID = 0; $LastValue = "";
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset - $SeriesWidth / 2;
-       $XLast = -1; 
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           if ( is_numeric($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-
-             if ( isset($LastValue[$Key]) )
-              {
-               $YPos    = $this->GArea_Y2 - ((($Value+$LastValue[$Key])-$this->VMin) * $this->DivisionRatio);
-               $YBottom = $this->GArea_Y2 - (($LastValue[$Key]-$this->VMin) * $this->DivisionRatio);
-               $LastValue[$Key] += $Value;
-              }
-             else
-              {
-               $YPos    = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-               $YBottom = $YZero;
-               $LastValue[$Key] = $Value;
-              }
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              $this->addToImageMap($XPos+1,min($YBottom,$YPos),$XPos+$SeriesWidth-1,max($YBottom,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"sBar");
-
-             $this->drawFilledRectangle($XPos+1,$YBottom,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-            }
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-       $SerieID++;
-      }
-    }
-
-   /* This function draw a limits bar graphs */
-   function drawLimitsGraph($Data,$DataDescription,$R=0,$G=0,$B=0)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawLimitsGraph",$DataDescription);
-     $this->validateData("drawLimitsGraph",$Data);
-
-     $XWidth = $this->DivisionWidth / 4;
-     $XPos   = $this->GArea_X1 + $this->GAreaXOffset;
-
-     foreach ( $Data as $Key => $Values )
-      {
-       $Min     = $Data[$Key][$DataDescription["Values"][0]];
-       $Max     = $Data[$Key][$DataDescription["Values"][0]];
-       $GraphID = 0; $MaxID = 0; $MinID = 0;
-       foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-        {
-         if ( isset($Data[$Key][$ColName]) )
-          {
-           if ( $Data[$Key][$ColName] > $Max && is_numeric($Data[$Key][$ColName]))
-            { $Max = $Data[$Key][$ColName]; $MaxID = $GraphID; }
-          }
-         if ( isset($Data[$Key][$ColName]) && is_numeric($Data[$Key][$ColName]))
-          {
-           if ( $Data[$Key][$ColName] < $Min )
-            { $Min = $Data[$Key][$ColName]; $MinID = $GraphID; }
-           $GraphID++;
-          }
-        }
-
-       $YPos = $this->GArea_Y2 - (($Max-$this->VMin) * $this->DivisionRatio);
-       $X1 = floor($XPos - $XWidth); $Y1 = floor($YPos) - .2;
-       $X2 = floor($XPos + $XWidth);
-       if ( $X1 <= $this->GArea_X1 ) { $X1 = $this->GArea_X1 + 1; }
-       if ( $X2 >= $this->GArea_X2 ) { $X2 = $this->GArea_X2 - 1; }
-
-       $YPos = $this->GArea_Y2 - (($Min-$this->VMin) * $this->DivisionRatio);
-       $Y2 = floor($YPos) + .2;
-
-       $this->drawLine(floor($XPos)-.2,$Y1+1,floor($XPos)-.2,$Y2-1,$R,$G,$B,TRUE);
-       $this->drawLine(floor($XPos)+.2,$Y1+1,floor($XPos)+.2,$Y2-1,$R,$G,$B,TRUE);
-       $this->drawLine($X1,$Y1,$X2,$Y1,$this->Palette[$MaxID]["R"],$this->Palette[$MaxID]["G"],$this->Palette[$MaxID]["B"],FALSE);
-       $this->drawLine($X1,$Y2,$X2,$Y2,$this->Palette[$MinID]["R"],$this->Palette[$MinID]["G"],$this->Palette[$MinID]["B"],FALSE);
-
-       $XPos = $XPos + $this->DivisionWidth;
-      }
-    }
-
-   /* This function draw radar axis centered on the graph area */
-   function drawRadarAxis($Data,$DataDescription,$Mosaic=TRUE,$BorderOffset=10,$A_R=60,$A_G=60,$A_B=60,$S_R=200,$S_G=200,$S_B=200,$MaxValue=-1)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawRadarAxis",$DataDescription);
-     $this->validateData("drawRadarAxis",$Data);
-
-     $C_TextColor = $this->AllocateColor($this->Picture,$A_R,$A_G,$A_B);
-
-     /* Draw radar axis */
-     $Points  = count($Data);
-     $Radius  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
-     $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2 + $this->GArea_X1;
-     $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 + $this->GArea_Y1;
-
-     /* Search for the max value */
-     if ( $MaxValue == -1 )
-      {
-       foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-        {
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            if ( $Data[$Key][$ColName] > $MaxValue ) { $MaxValue = $Data[$Key][$ColName]; }
-          }
-        }
-      }
-
-     /* Draw the mosaic */
-     if ( $Mosaic )
-      {
-       $RadiusScale = $Radius / $MaxValue;
-       for ( $t=1; $t<=$MaxValue-1; $t++)
-        {
-         $TRadius  = $RadiusScale * $t;
-         $LastX1   = -1;
-
-         for ( $i=0; $i<=$Points; $i++)
-          {
-           $Angle = -90 + $i * 360/$Points;
-           $X1 = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
-           $Y1 = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
-           $X2 = cos($Angle * 3.1418 / 180 ) * ($TRadius+$RadiusScale) + $XCenter;
-           $Y2 = sin($Angle * 3.1418 / 180 ) * ($TRadius+$RadiusScale) + $YCenter;
-
-           if ( $t % 2 == 1 && $LastX1 != -1)
-            {
-             $Plots   = "";
-             $Plots[] = $X1; $Plots[] = $Y1;
-             $Plots[] = $X2; $Plots[] = $Y2;
-             $Plots[] = $LastX2; $Plots[] = $LastY2;
-             $Plots[] = $LastX1; $Plots[] = $LastY1;
-
-             $C_Graph = $this->AllocateColor($this->Picture,250,250,250);
-             imagefilledpolygon($this->Picture,$Plots,(count($Plots)+1)/2,$C_Graph);
-            }
-
-           $LastX1 = $X1; $LastY1= $Y1;
-           $LastX2 = $X2; $LastY2= $Y2;
-          }
-        }
-      }
-
-
-     /* Draw the spider web */
-     for ( $t=1; $t<=$MaxValue; $t++)
-      {
-       $TRadius = ( $Radius / $MaxValue ) * $t;
-       $LastX   = -1;
-
-       for ( $i=0; $i<=$Points; $i++)
-        {
-         $Angle = -90 + $i * 360/$Points;
-         $X = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
-         $Y = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
-
-         if ( $LastX != -1 )
-          $this->drawDottedLine($LastX,$LastY,$X,$Y,4,$S_R,$S_G,$S_B);
-
-         $LastX = $X; $LastY= $Y;
-        }
-      }
-
-     /* Draw the axis */
-     for ( $i=0; $i<=$Points; $i++)
-      {
-       $Angle = -90 + $i * 360/$Points;
-       $X = cos($Angle * 3.1418 / 180 ) * $Radius + $XCenter;
-       $Y = sin($Angle * 3.1418 / 180 ) * $Radius + $YCenter;
-
-       $this->drawLine($XCenter,$YCenter,$X,$Y,$A_R,$A_G,$A_B);
-
-       $XOffset = 0; $YOffset = 0;
-       if (isset($Data[$i][$DataDescription["Position"]]))
-        {
-         $Label = $Data[$i][$DataDescription["Position"]];
-
-         $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$Label);
-         $Width  = $Positions[2] - $Positions[6];
-         $Height = $Positions[3] - $Positions[7];
-
-         if ( $Angle >= 0 && $Angle <= 90 )
-          $YOffset = $Height;
-
-         if ( $Angle > 90 && $Angle <= 180 )
-          { $YOffset = $Height; $XOffset = -$Width; }
-
-         if ( $Angle > 180 && $Angle <= 270 )
-          { $XOffset = -$Width; }
-
-         imagettftext($this->Picture,$this->FontSize,0,$X+$XOffset,$Y+$YOffset,$C_TextColor,$this->FontName,$Label);
-        }
-      }
-
-     /* Write the values */
-     for ( $t=1; $t<=$MaxValue; $t++)
-      {
-       $TRadius = ( $Radius / $MaxValue ) * $t;
-
-       $Angle = -90 + 360 / $Points;
-       $X1 = $XCenter;
-       $Y1 = $YCenter - $TRadius;
-       $X2 = cos($Angle * 3.1418 / 180 ) * $TRadius + $XCenter;
-       $Y2 = sin($Angle * 3.1418 / 180 ) * $TRadius + $YCenter;
-
-       $XPos = floor(($X2-$X1)/2) + $X1;
-       $YPos = floor(($Y2-$Y1)/2) + $Y1;
-
-       $Positions = imagettfbbox($this->FontSize,0,$this->FontName,$t);
-       $X = $XPos - ( $X+$Positions[2] - $X+$Positions[6] ) / 2;
-       $Y = $YPos + $this->FontSize;
-
-       $this->drawFilledRoundedRectangle($X+$Positions[6]-2,$Y+$Positions[7]-1,$X+$Positions[2]+4,$Y+$Positions[3]+1,2,240,240,240);
-       $this->drawRoundedRectangle($X+$Positions[6]-2,$Y+$Positions[7]-1,$X+$Positions[2]+4,$Y+$Positions[3]+1,2,220,220,220);
-       imagettftext($this->Picture,$this->FontSize,0,$X,$Y,$C_TextColor,$this->FontName,$t);
-      }
-    }
-
-   /* This function draw a radar graph centered on the graph area */
-   function drawRadar($Data,$DataDescription,$BorderOffset=10,$MaxValue=-1)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawRadar",$DataDescription);
-     $this->validateData("drawRadar",$Data);
-
-     $Points  = count($Data);
-     $Radius  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
-     $XCenter = ( $this->GArea_X2 - $this->GArea_X1 ) / 2 + $this->GArea_X1;
-     $YCenter = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 + $this->GArea_Y1;
-
-     /* Search for the max value */
-     if ( $MaxValue == -1 )
-      {
-       foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-        {
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            if ( $Data[$Key][$ColName] > $MaxValue ) { $MaxValue = $Data[$Key][$ColName]; }
-          }
-        }
-      }
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $Angle = -90;
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           $Value    = $Data[$Key][$ColName];
-           $Strength = ( $Radius / $MaxValue ) * $Value;
-
-           $XPos = cos($Angle * 3.1418 / 180 ) * $Strength + $XCenter;
-           $YPos = sin($Angle * 3.1418 / 180 ) * $Strength + $YCenter;
-
-           if ( $XLast != -1 )
-            $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-
-           if ( $XLast == -1 )
-            { $FirstX = $XPos; $FirstY = $YPos; }
-
-           $Angle = $Angle + (360/$Points);
-           $XLast = $XPos;
-           $YLast = $YPos;
-          }
-        }
-       $this->drawLine($XPos,$YPos,$FirstX,$FirstY,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-       $GraphID++;
-      }
-    }
-
-   /* This function draw a radar graph centered on the graph area */
-   function drawFilledRadar($Data,$DataDescription,$Alpha=50,$BorderOffset=10,$MaxValue=-1)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawFilledRadar",$DataDescription);
-     $this->validateData("drawFilledRadar",$Data);
-
-     $Points      = count($Data);
-     $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-     $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-     $Radius      = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2 - $BorderOffset;
-     $XCenter     = ( $this->GArea_X2 - $this->GArea_X1 ) / 2;
-     $YCenter     = ( $this->GArea_Y2 - $this->GArea_Y1 ) / 2;
-
-     /* Search for the max value */
-     if ( $MaxValue == -1 )
-      {
-       foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-        {
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            if ( $Data[$Key][$ColName] > $MaxValue && is_numeric($Data[$Key][$ColName])) { $MaxValue = $Data[$Key][$ColName]; }
-          }
-        }
-      }
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $Angle = -90;
-       $XLast = -1;
-       $Plots = "";
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           $Value    = $Data[$Key][$ColName];
-           if ( !is_numeric($Value) ) { $Value = 0; }
-           $Strength = ( $Radius / $MaxValue ) * $Value;
-
-           $XPos = cos($Angle * 3.1418 / 180 ) * $Strength + $XCenter;
-           $YPos = sin($Angle * 3.1418 / 180 ) * $Strength + $YCenter;
-
-           $Plots[] = $XPos;
-           $Plots[] = $YPos;
-
-           $Angle = $Angle + (360/$Points);
-           $XLast = $XPos;
-           $YLast = $YPos;
-          }
-        }
-
-       if (isset($Plots[0]))
-        {
-         $Plots[] = $Plots[0];
-         $Plots[] = $Plots[1];
-
-         $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-         $C_White         = $this->AllocateColor($this->Layers[0],255,255,255);
-         imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-         imagecolortransparent($this->Layers[0],$C_White);
-
-         $C_Graph = $this->AllocateColor($this->Layers[0],$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-         imagefilledpolygon($this->Layers[0],$Plots,(count($Plots)+1)/2,$C_Graph);
-
-         imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-         imagedestroy($this->Layers[0]);
-
-         for($i=0;$i<=count($Plots)-4;$i=$i+2)
-          $this->drawLine($Plots[$i]+$this->GArea_X1,$Plots[$i+1]+$this->GArea_Y1,$Plots[$i+2]+$this->GArea_X1,$Plots[$i+3]+$this->GArea_Y1,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"]);
-        }
-
-       $GraphID++;
-      }
-    }
-
-   /* This function draw a flat pie chart */
-   function drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawBasicPieGraph",$DataDescription,FALSE);
-     $this->validateData("drawBasicPieGraph",$Data);
-
-     /* Determine pie sum */
-     $Series = 0; $PieSum = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $ColName != $DataDescription["Position"] )
-        {
-         $Series++;
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]];
-          }
-        }
-      }
-
-     /* Validate serie */
-     if ( $Series != 1 )
-      RaiseFatal("Pie chart can only accept one serie of data.");
-
-     $SpliceRatio         = 360 / $PieSum;
-     $SplicePercent       = 100 / $PieSum;
-
-     /* Calculate all polygons */
-     $Angle    = 0; $TopPlots = "";
-     foreach($iValues as $Key => $Value)
-      {
-       $TopPlots[$Key][] = $XPos;
-       $TopPlots[$Key][] = $YPos;
-
-       /* Process labels position & size */
-       $Caption = "";
-       if ( !($DrawLabels == PIE_NOLABEL) )
-        {
-         $TAngle   = $Angle+($Value*$SpliceRatio/2);
-         if ($DrawLabels == PIE_PERCENTAGE)
-          $Caption  = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_LABELS)
-          $Caption  = $iLabels[$Key];
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-
-         $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-         $TextWidth  = $Position[2]-$Position[0];
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $XPos;
-
-         if ( $TAngle > 0 && $TAngle < 180 )
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $YPos + 4;
-         else
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+4) + $YPos - ($TextHeight/2);
-
-         if ( $TAngle > 90 && $TAngle < 270 )
-          $TX = $TX - $TextWidth;
-
-         $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
-         imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
-        }
-
-       /* Process pie slices */
-       for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
-        {
-         $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos;
-         $TopY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos;
-
-         $TopPlots[$Key][] = $TopX; 
-         $TopPlots[$Key][] = $TopY;
-        }
-
-       $TopPlots[$Key][] = $XPos;
-       $TopPlots[$Key][] = $YPos;
-
-       $Angle = $iAngle;
-      }
-     $PolyPlots = $TopPlots;
-
-     /* Set array values type to float --- PHP Bug with imagefilledpolygon casting to integer */
-     foreach ($TopPlots as $Key => $Value)
-      { foreach ($TopPlots[$Key] as $Key2 => $Value2) { settype($TopPlots[$Key][$Key2],"float"); } }
-
-     /* Draw Top polygons */
-     foreach ($PolyPlots as $Key => $Value)
-      { 
-       $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
-       imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo);
-      }
-
-     $this->drawCircle($XPos-.5,$YPos-.5,$Radius,$R,$G,$B);
-     $this->drawCircle($XPos-.5,$YPos-.5,$Radius+.5,$R,$G,$B);
-
-     /* Draw Top polygons */
-     foreach ($TopPlots as $Key => $Value)
-      { 
-       for($j=0;$j<=count($TopPlots[$Key])-4;$j=$j+2)
-        $this->drawLine($TopPlots[$Key][$j],$TopPlots[$Key][$j+1],$TopPlots[$Key][$j+2],$TopPlots[$Key][$j+3],$R,$G,$B);
-      }
-    }
-
-   function drawFlatPieGraphWithShadow($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals=0)
-    {
-     $this->drawFlatPieGraph($Data,$DataDescription,$XPos+$this->ShadowXDistance,$YPos+$this->ShadowYDistance,$Radius,PIE_NOLABEL,$SpliceDistance,$Decimals,TRUE);
-     $this->drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius,$DrawLabels,$SpliceDistance,$Decimals,FALSE);
-    }
-
-   /* This function draw a flat pie chart */
-   function drawFlatPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$SpliceDistance=0,$Decimals=0,$AllBlack=FALSE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawFlatPieGraph",$DataDescription,FALSE);
-     $this->validateData("drawFlatPieGraph",$Data);
-
-     $ShadowStatus = $this->ShadowActive ; $this->ShadowActive = FALSE;
-
-     /* Determine pie sum */
-     $Series = 0; $PieSum = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $ColName != $DataDescription["Position"] )
-        {
-         $Series++;
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]];
-          }
-        }
-      }
-
-     /* Validate serie */
-     if ( $Series != 1 )
-      {
-       RaiseFatal("Pie chart can only accept one serie of data.");
-       return(0);
-      }
-
-     $SpliceRatio   = 360 / $PieSum;
-     $SplicePercent = 100 / $PieSum;
-
-     /* Calculate all polygons */
-     $Angle = 0; $TopPlots = "";
-     foreach($iValues as $Key => $Value)
-      {
-       $XOffset = cos(($Angle+($Value/2*$SpliceRatio)) * 3.1418 / 180 ) * $SpliceDistance;
-       $YOffset = sin(($Angle+($Value/2*$SpliceRatio)) * 3.1418 / 180 ) * $SpliceDistance;
-
-       $TopPlots[$Key][] = round($XPos + $XOffset);
-       $TopPlots[$Key][] = round($YPos + $YOffset);
-
-       if ( $AllBlack )
-        { $Rc = $this->ShadowRColor; $Gc = $this->ShadowGColor; $Bc = $this->ShadowBColor; }
-       else
-        { $Rc = $this->Palette[$Key]["R"]; $Gc = $this->Palette[$Key]["G"]; $Bc = $this->Palette[$Key]["B"]; }
-
-       $XLineLast = ""; $YLineLast = "";
-
-       /* Process labels position & size */
-       $Caption = "";
-       if ( !($DrawLabels == PIE_NOLABEL) )
-        {
-         $TAngle   = $Angle+($Value*$SpliceRatio/2);
-         if ($DrawLabels == PIE_PERCENTAGE)
-          $Caption  = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_LABELS)
-          $Caption  = $iLabels[$Key];
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-
-         $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-         $TextWidth  = $Position[2]-$Position[0];
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10+$SpliceDistance) + $XPos;
-
-         if ( $TAngle > 0 && $TAngle < 180 )
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10+$SpliceDistance) + $YPos + 4;
-         else
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+$SpliceDistance+4) + $YPos - ($TextHeight/2);
-
-         if ( $TAngle > 90 && $TAngle < 270 )
-          $TX = $TX - $TextWidth;
-
-         $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
-         imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
-        }
-
-       /* Process pie slices */
-       if ( !$AllBlack )
-        $LineColor = $this->AllocateColor($this->Picture,$Rc,$Gc,$Bc);
-       else
-        $LineColor = $this->AllocateColor($this->Picture,$Rc,$Gc,$Bc);
-
-       $XLineLast = ""; $YLineLast = "";
-       for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
-        {
-         $PosX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos + $XOffset;
-         $PosY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos + $YOffset;
-
-         $TopPlots[$Key][] = round($PosX); $TopPlots[$Key][] = round($PosY);
-
-         if ( $iAngle == $Angle || $iAngle == $Angle+$Value*$SpliceRatio || $iAngle +.5 > $Angle+$Value*$SpliceRatio)
-          $this->drawLine($XPos+$XOffset,$YPos+$YOffset,$PosX,$PosY,$Rc,$Gc,$Bc);
-
-         if ( $XLineLast != "" )
-          $this->drawLine($XLineLast,$YLineLast,$PosX,$PosY,$Rc,$Gc,$Bc);
-
-         $XLineLast = $PosX; $YLineLast = $PosY;
-        }
-
-       $TopPlots[$Key][] = round($XPos + $XOffset);  $TopPlots[$Key][] = round($YPos + $YOffset);
-
-       $Angle = $iAngle;
-      }
-     $PolyPlots = $TopPlots;
-
-     /* Draw Top polygons */
-     foreach ($PolyPlots as $Key => $Value)
-      { 
-       if ( !$AllBlack )
-        $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
-       else
-        $C_GraphLo = $this->AllocateColor($this->Picture,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor);
-
-       imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo);
-      }
-     $this->ShadowActive = $ShadowStatus;
-    }
-
-   /* This function draw a pseudo-3D pie chart */
-   function drawPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$EnhanceColors=TRUE,$Skew=60,$SpliceHeight=20,$SpliceDistance=0,$Decimals=0)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawPieGraph",$DataDescription,FALSE);
-     $this->validateData("drawPieGraph",$Data);
-
-     /* Determine pie sum */
-     $Series = 0; $PieSum = 0; $rPieSum = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $ColName != $DataDescription["Position"] )
-        {
-         $Series++;
-         foreach ( $Data as $Key => $Values )
-          if ( isset($Data[$Key][$ColName]))
-           {
-            if ( $Data[$Key][$ColName] == 0 )
-             { $iValues[] = 0; $rValues[] = 0; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; }
-              // Removed : $PieSum++; $rValues[] = 1;
-            else
-             { $PieSum += $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]]; $rValues[] = $Data[$Key][$ColName]; $rPieSum += $Data[$Key][$ColName];}
-           }
-        }
-      }
-
-     /* Validate serie */
-     if ( $Series != 1 )
-      RaiseFatal("Pie chart can only accept one serie of data.");
-
-     $SpliceDistanceRatio = $SpliceDistance;
-     $SkewHeight          = ($Radius * $Skew) / 100;
-     $SpliceRatio         = (360 - $SpliceDistanceRatio * count($iValues) ) / $PieSum;
-     $SplicePercent       = 100 / $PieSum;
-     $rSplicePercent      = 100 / $rPieSum;
-
-     /* Calculate all polygons */
-     $Angle    = 0; $CDev = 5;
-     $TopPlots = ""; $BotPlots = "";
-     $aTopPlots = ""; $aBotPlots = "";
-     foreach($iValues as $Key => $Value)
-      {
-       $XCenterPos = cos(($Angle-$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $XPos;
-       $YCenterPos = sin(($Angle-$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $YPos;
-       $XCenterPos2 = cos(($Angle+$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $XPos;
-       $YCenterPos2 = sin(($Angle+$CDev+($Value*$SpliceRatio+$SpliceDistanceRatio)/2) * 3.1418 / 180 ) * $SpliceDistance + $YPos;
-
-       $TopPlots[$Key][] = round($XCenterPos); $BotPlots[$Key][] = round($XCenterPos);
-       $TopPlots[$Key][] = round($YCenterPos); $BotPlots[$Key][] = round($YCenterPos + $SpliceHeight);
-       $aTopPlots[$Key][] = $XCenterPos; $aBotPlots[$Key][] = $XCenterPos;
-       $aTopPlots[$Key][] = $YCenterPos; $aBotPlots[$Key][] = $YCenterPos + $SpliceHeight;
-
-       /* Process labels position & size */
-       $Caption = "";
-       if ( !($DrawLabels == PIE_NOLABEL) )
-        {
-         $TAngle   = $Angle+($Value*$SpliceRatio/2);
-         if ($DrawLabels == PIE_PERCENTAGE)
-          $Caption  = (round($rValues[$Key] * pow(10,$Decimals) * $rSplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_LABELS)
-          $Caption  = $iLabels[$Key];
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-
-         $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-         $TextWidth  = $Position[2]-$Position[0];
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius + 10)+ $XPos;
-
-         if ( $TAngle > 0 && $TAngle < 180 )
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($SkewHeight + 10) + $YPos + $SpliceHeight + 4;
-         else
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($SkewHeight + 4) + $YPos - ($TextHeight/2);
-
-         if ( $TAngle > 90 && $TAngle < 270 )
-          $TX = $TX - $TextWidth;
-
-         $C_TextColor = $this->AllocateColor($this->Picture,70,70,70);
-         imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
-        }
-
-       /* Process pie slices */
-       for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
-        {
-         $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos;
-         $TopY = sin($iAngle * 3.1418 / 180 ) * $SkewHeight + $YPos;
-
-         $TopPlots[$Key][] = round($TopX); $BotPlots[$Key][] = round($TopX);
-         $TopPlots[$Key][] = round($TopY); $BotPlots[$Key][] = round($TopY + $SpliceHeight);
-         $aTopPlots[$Key][] = $TopX; $aBotPlots[$Key][] = $TopX;
-         $aTopPlots[$Key][] = $TopY; $aBotPlots[$Key][] = $TopY + $SpliceHeight;
-        }
-
-       $TopPlots[$Key][] = round($XCenterPos2); $BotPlots[$Key][] = round($XCenterPos2);
-       $TopPlots[$Key][] = round($YCenterPos2); $BotPlots[$Key][] = round($YCenterPos2 + $SpliceHeight);
-       $aTopPlots[$Key][] = $XCenterPos2; $aBotPlots[$Key][] = $XCenterPos2;
-       $aTopPlots[$Key][] = $YCenterPos2; $aBotPlots[$Key][] = $YCenterPos2 + $SpliceHeight;
-
-       $Angle = $iAngle + $SpliceDistanceRatio;
-      }
-
-     /* Draw Bottom polygons */
-     foreach($iValues as $Key => $Value)
-      {
-       $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"],-20);
-       imagefilledpolygon($this->Picture,$BotPlots[$Key],(count($BotPlots[$Key])+1)/2,$C_GraphLo);
-
-       if ( $EnhanceColors ) { $En = -10; } else { $En = 0; }
- 
-       for($j=0;$j<=count($aBotPlots[$Key])-4;$j=$j+2)
-        $this->drawLine($aBotPlots[$Key][$j],$aBotPlots[$Key][$j+1],$aBotPlots[$Key][$j+2],$aBotPlots[$Key][$j+3],$this->Palette[$Key]["R"]+$En,$this->Palette[$Key]["G"]+$En,$this->Palette[$Key]["B"]+$En);
-      }
-
-     /* Draw pie layers */
-     if ( $EnhanceColors ) { $ColorRatio = 30 / $SpliceHeight; } else { $ColorRatio = 25 / $SpliceHeight; }
-     for($i=$SpliceHeight-1;$i>=1;$i--)
-      {
-       foreach($iValues as $Key => $Value)
-        {
-         $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"],-10);
-         $Plots = ""; $Plot = 0;
-         foreach($TopPlots[$Key] as $Key2 => $Value2)
-          {
-           $Plot++;
-           if ( $Plot % 2 == 1 )
-            $Plots[] = $Value2;
-           else
-            $Plots[] = $Value2+$i;
-          }
-         imagefilledpolygon($this->Picture,$Plots,(count($Plots)+1)/2,$C_GraphLo);
-
-         $Index       = count($Plots);
-         if ($EnhanceColors ) {$ColorFactor = -20 + ($SpliceHeight - $i) * $ColorRatio; } else { $ColorFactor = 0; }
-
-         $this->drawAntialiasPixel($Plots[0],$Plots[1],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
-         $this->drawAntialiasPixel($Plots[2],$Plots[3],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
-         $this->drawAntialiasPixel($Plots[$Index-4],$Plots[$Index-3],$this->Palette[$Key]["R"]+$ColorFactor,$this->Palette[$Key]["G"]+$ColorFactor,$this->Palette[$Key]["B"]+$ColorFactor);
-        }
-      }
-
-     /* Draw Top polygons */
-     for($Key=count($iValues)-1;$Key>=0;$Key--)
-      { 
-       $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
-       imagefilledpolygon($this->Picture,$TopPlots[$Key],(count($TopPlots[$Key])+1)/2,$C_GraphLo);
-
-       if ( $EnhanceColors ) { $En = 10; } else { $En = 0; }
-       for($j=0;$j<=count($aTopPlots[$Key])-4;$j=$j+2)
-        $this->drawLine($aTopPlots[$Key][$j],$aTopPlots[$Key][$j+1],$aTopPlots[$Key][$j+2],$aTopPlots[$Key][$j+3],$this->Palette[$Key]["R"]+$En,$this->Palette[$Key]["G"]+$En,$this->Palette[$Key]["B"]+$En);
-      }
-    }
-
-   /* This function can be used to set the background color */
-   function drawBackground($R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
-     imagefilledrectangle($this->Picture,0,0,$this->XSize,$this->YSize,$C_Background);
-    }
-
-   /* This function can be used to set the background color */
-   function drawGraphAreaGradient($R,$G,$B,$Decay,$Target=TARGET_GRAPHAREA)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     if ( $Target == TARGET_GRAPHAREA )  { $X1 = $this->GArea_X1+1; $X2 = $this->GArea_X2-1; $Y1 = $this->GArea_Y1+1; $Y2 = $this->GArea_Y2; }
-     if ( $Target == TARGET_BACKGROUND ) { $X1 = 0; $X2 = $this->XSize; $Y1 = 0; $Y2 = $this->YSize; }
-
-     /* Positive gradient */
-     if ( $Decay > 0 )
-      {
-       $YStep = ($Y2 - $Y1 - 2) / $Decay;
-       for($i=0;$i<=$Decay;$i++)
-        {
-         $R-=1;$G-=1;$B-=1;
-         $Yi1 = $Y1 + ( $i * $YStep );
-         $Yi2 = ceil( $Yi1 + ( $i * $YStep ) + $YStep );
-         if ( $Yi2 >= $Yi2 ) { $Yi2 = $Y2-1; }
-
-         $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
-         imagefilledrectangle($this->Picture,$X1,$Yi1,$X2,$Yi2,$C_Background);
-        }
-      }
-
-     /* Negative gradient */
-     if ( $Decay < 0 )
-      {
-       $YStep = ($Y2 - $Y1 - 2) / -$Decay;
-       $Yi1   = $Y1; $Yi2   = $Y1+$YStep;
-       for($i=-$Decay;$i>=0;$i--)
-        {
-         $R+=1;$G+=1;$B+=1;
-         $C_Background = $this->AllocateColor($this->Picture,$R,$G,$B);
-         imagefilledrectangle($this->Picture,$X1,$Yi1,$X2,$Yi2,$C_Background);
-
-         $Yi1+= $YStep;
-         $Yi2+= $YStep;
-         if ( $Yi2 >= $Yi2 ) { $Yi2 = $Y2-1; }
-        }
-      }
-    }
-
-   /* This function create a rectangle with antialias */
-   function drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $X1=$X1-.2;$Y1=$Y1-.2;
-     $X2=$X2+.2;$Y2=$Y2+.2;
-     $this->drawLine($X1,$Y1,$X2,$Y1,$R,$G,$B);
-     $this->drawLine($X2,$Y1,$X2,$Y2,$R,$G,$B);
-     $this->drawLine($X2,$Y2,$X1,$Y2,$R,$G,$B);
-     $this->drawLine($X1,$Y2,$X1,$Y1,$R,$G,$B);
-    }
-
-   /* This function create a filled rectangle with antialias */
-   function drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100,$NoFallBack=FALSE)
-    {
-     if ( $X2 < $X1 ) { list($X1, $X2) = array($X2, $X1); }
-     if ( $Y2 < $Y1 ) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     if ( $Alpha == 100 )
-      {
-       /* Process shadows */
-       if ( $this->ShadowActive && !$NoFallBack )
-        {
-         $this->drawFilledRectangle($X1+$this->ShadowXDistance,$Y1+$this->ShadowYDistance,$X2+$this->ShadowXDistance,$Y2+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha,TRUE);
-         if ( $this->ShadowBlur != 0 )
-          {
-           $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur);
-
-           for($i=1; $i<=$this->ShadowBlur; $i++)
-            $this->drawFilledRectangle($X1+$this->ShadowXDistance-$i/2,$Y1+$this->ShadowYDistance-$i/2,$X2+$this->ShadowXDistance-$i/2,$Y2+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-           for($i=1; $i<=$this->ShadowBlur; $i++)
-            $this->drawFilledRectangle($X1+$this->ShadowXDistance+$i/2,$Y1+$this->ShadowYDistance+$i/2,$X2+$this->ShadowXDistance+$i/2,$Y2+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-          }
-        }
-
-       $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-       imagefilledrectangle($this->Picture,round($X1),round($Y1),round($X2),round($Y2),$C_Rectangle);
-      }
-     else
-      {
-       $LayerWidth  = abs($X2-$X1)+2;
-       $LayerHeight = abs($Y2-$Y1)+2;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         = $this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $C_Rectangle = $this->AllocateColor($this->Layers[0],$R,$G,$B);
-       imagefilledrectangle($this->Layers[0],round(1),round(1),round($LayerWidth-1),round($LayerHeight-1),$C_Rectangle);
-
-       imagecopymerge($this->Picture,$this->Layers[0],round(min($X1,$X2)-1),round(min($Y1,$Y2)-1),0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-      }
-
-     if ( $DrawBorder )
-      {
-       $ShadowSettings = $this->ShadowActive; $this->ShadowActive = FALSE;
-       $this->drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B);
-       $this->ShadowActive = $ShadowSettings;
-      }
-    }
-
-   /* This function create a rectangle with rounded corners and antialias */
-   function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $Step = 90 / ((3.1418 * $Radius)/2);
-
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $X = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius;
-       $Y = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-
-       $X = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius;
-       $Y = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-
-       $X = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius;
-       $Y = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-
-       $X = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius;
-       $Y = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-      }
-
-     $X1=$X1-.2;$Y1=$Y1-.2;
-     $X2=$X2+.2;$Y2=$Y2+.2;
-     $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$R,$G,$B);
-     $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$R,$G,$B);
-     $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$R,$G,$B);
-     $this->drawLine($X1,$Y2-$Radius,$X1,$Y1+$Radius,$R,$G,$B);
-    }
-
-   /* This function create a filled rectangle with rounded corners and antialias */
-   function drawFilledRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-
-     $Step = 90 / ((3.1418 * $Radius)/2);
-
-     for($i=0;$i<=90;$i=$i+$Step)
-      {
-       $Xi1 = cos(($i+180)*3.1418/180) * $Radius + $X1 + $Radius;
-       $Yi1 = sin(($i+180)*3.1418/180) * $Radius + $Y1 + $Radius;
-
-       $Xi2 = cos(($i-90)*3.1418/180) * $Radius + $X2 - $Radius;
-       $Yi2 = sin(($i-90)*3.1418/180) * $Radius + $Y1 + $Radius;
-
-       $Xi3 = cos(($i)*3.1418/180) * $Radius + $X2 - $Radius;
-       $Yi3 = sin(($i)*3.1418/180) * $Radius + $Y2 - $Radius;
-
-       $Xi4 = cos(($i+90)*3.1418/180) * $Radius + $X1 + $Radius;
-       $Yi4 = sin(($i+90)*3.1418/180) * $Radius + $Y2 - $Radius;
-
-       imageline($this->Picture,$Xi1,$Yi1,$X1+$Radius,$Yi1,$C_Rectangle);
-       imageline($this->Picture,$X2-$Radius,$Yi2,$Xi2,$Yi2,$C_Rectangle);
-       imageline($this->Picture,$X2-$Radius,$Yi3,$Xi3,$Yi3,$C_Rectangle);
-       imageline($this->Picture,$Xi4,$Yi4,$X1+$Radius,$Yi4,$C_Rectangle);
-
-       $this->drawAntialiasPixel($Xi1,$Yi1,$R,$G,$B);
-       $this->drawAntialiasPixel($Xi2,$Yi2,$R,$G,$B);
-       $this->drawAntialiasPixel($Xi3,$Yi3,$R,$G,$B);
-       $this->drawAntialiasPixel($Xi4,$Yi4,$R,$G,$B);
-      }
-
-     imagefilledrectangle($this->Picture,$X1,$Y1+$Radius,$X2,$Y2-$Radius,$C_Rectangle);
-     imagefilledrectangle($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y2,$C_Rectangle);
-
-     $X1=$X1-.2;$Y1=$Y1-.2;
-     $X2=$X2+.2;$Y2=$Y2+.2;
-     $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$R,$G,$B);
-     $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$R,$G,$B);
-     $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$R,$G,$B);
-     $this->drawLine($X1,$Y2-$Radius,$X1,$Y1+$Radius,$R,$G,$B);
-    }
-
-   /* This function create a circle with antialias */
-   function drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
-    {
-     if ( $Width == 0 ) { $Width = $Height; }
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Circle = $this->AllocateColor($this->Picture,$R,$G,$B);
-     $Step     = 360 / (2 * 3.1418 * max($Width,$Height));
-
-     for($i=0;$i<=360;$i=$i+$Step)
-      {
-       $X = cos($i*3.1418/180) * $Height + $Xc;
-       $Y = sin($i*3.1418/180) * $Width + $Yc;
-       $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-      }
-    }
-
-   /* This function create a filled circle/ellipse with antialias */
-   function drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width=0)
-    {
-     if ( $Width == 0 ) { $Width = $Height; }
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Circle = $this->AllocateColor($this->Picture,$R,$G,$B);
-     $Step     = 360 / (2 * 3.1418 * max($Width,$Height));
-
-     for($i=90;$i<=270;$i=$i+$Step)
-      {
-       $X1 = cos($i*3.1418/180) * $Height + $Xc;
-       $Y1 = sin($i*3.1418/180) * $Width + $Yc;
-       $X2 = cos((180-$i)*3.1418/180) * $Height + $Xc;
-       $Y2 = sin((180-$i)*3.1418/180) * $Width + $Yc;
-
-       $this->drawAntialiasPixel($X1-1,$Y1-1,$R,$G,$B);
-       $this->drawAntialiasPixel($X2-1,$Y2-1,$R,$G,$B);
-
-       if ( ($Y1-1) > $Yc - max($Width,$Height) )
-        imageline($this->Picture,$X1,$Y1-1,$X2-1,$Y2-1,$C_Circle);
-      }
-    }
-
-   /* This function will draw a filled ellipse */
-   function drawEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
-    { $this->drawCircle($Xc,$Yc,$Height,$R,$G,$B,$Width); }
-
-   /* This function will draw an ellipse */
-   function drawFilledEllipse($Xc,$Yc,$Height,$Width,$R,$G,$B)
-    { $this->drawFilledCircle($Xc,$Yc,$Height,$R,$G,$B,$Width); }
-
-   /* This function create a line with antialias */
-   function drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE)
-    {
-     if ( $this->LineDotSize > 1 ) { $this->drawDottedLine($X1,$Y1,$X2,$Y2,$this->LineDotSize,$R,$G,$B,$GraphFunction); return(0); }
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));  
-     if ( $Distance == 0 )
-      return(-1);
-     $XStep = ($X2-$X1) / $Distance;
-     $YStep = ($Y2-$Y1) / $Distance;
-
-     for($i=0;$i<=$Distance;$i++)
-      {
-       $X = $i * $XStep + $X1;
-       $Y = $i * $YStep + $Y1;
-
-       if ( ($X >= $this->GArea_X1 && $X <= $this->GArea_X2 && $Y >= $this->GArea_Y1 && $Y <= $this->GArea_Y2) || !$GraphFunction )
-        {
-         if ( $this->LineWidth == 1 )
-          $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-         else
-          {
-           $StartOffset = -($this->LineWidth/2); $EndOffset = ($this->LineWidth/2);
-           for($j=$StartOffset;$j<=$EndOffset;$j++)
-            $this->drawAntialiasPixel($X+$j,$Y+$j,$R,$G,$B);
-          }
-        }
-      }
-    }
-
-   /* This function create a line with antialias */
-   function drawDottedLine($X1,$Y1,$X2,$Y2,$DotSize,$R,$G,$B,$GraphFunction=FALSE)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));  
-
-     $XStep = ($X2-$X1) / $Distance;
-     $YStep = ($Y2-$Y1) / $Distance;
-
-     $DotIndex = 0;
-     for($i=0;$i<=$Distance;$i++)
-      {
-       $X = $i * $XStep + $X1;
-       $Y = $i * $YStep + $Y1;
-
-       if ( $DotIndex <= $DotSize)
-        {
-         if ( ($X >= $this->GArea_X1 && $X <= $this->GArea_X2 && $Y >= $this->GArea_Y1 && $Y <= $this->GArea_Y2) || !$GraphFunction )
-          {
-           if ( $this->LineWidth == 1 )
-            $this->drawAntialiasPixel($X,$Y,$R,$G,$B);
-           else
-            {
-             $StartOffset = -($this->LineWidth/2); $EndOffset = ($this->LineWidth/2);
-             for($j=$StartOffset;$j<=$EndOffset;$j++)
-              $this->drawAntialiasPixel($X+$j,$Y+$j,$R,$G,$B);
-            }
-          }
-        }
-
-       $DotIndex++;
-       if ( $DotIndex == $DotSize * 2 )
-        $DotIndex = 0;        
-      }
-    }
-
-   /* Load a PNG file and draw it over the chart */
-   function drawFromPNG($FileName,$X,$Y,$Alpha=100)
-    { $this->drawFromPicture(1,$FileName,$X,$Y,$Alpha); }
-
-   /* Load a GIF file and draw it over the chart */
-   function drawFromGIF($FileName,$X,$Y,$Alpha=100)
-    { $this->drawFromPicture(2,$FileName,$X,$Y,$Alpha); }
-
-   /* Load a JPEG file and draw it over the chart */
-   function drawFromJPG($FileName,$X,$Y,$Alpha=100)
-    { $this->drawFromPicture(3,$FileName,$X,$Y,$Alpha); }
-
-   /* Generic loader function for external pictures */
-   function drawFromPicture($PicType,$FileName,$X,$Y,$Alpha=100)
-    {
-     if ( file_exists($FileName))
-      {
-       $Infos  = getimagesize($FileName);
-       $Width  = $Infos[0];
-       $Height = $Infos[1];
-       if ( $PicType == 1 ) { $Raster = imagecreatefrompng($FileName); }
-       if ( $PicType == 2 ) { $Raster = imagecreatefromgif($FileName); }
-       if ( $PicType == 3 ) { $Raster = imagecreatefromjpeg($FileName); }
-
-       imagecopymerge($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height,$Alpha);
-       imagedestroy($Raster);
-      }
-    }
-
-   /* Draw an alpha pixel */
-   function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
-      return(-1);
-
-     $RGB2 = imagecolorat($this->Picture, $X, $Y);
-     $R2   = ($RGB2 >> 16) & 0xFF;
-     $G2   = ($RGB2 >> 8) & 0xFF;
-     $B2   = $RGB2 & 0xFF;
-
-     $iAlpha = (100 - $Alpha)/100;
-     $Alpha  = $Alpha / 100;
-
-     $Ra   = floor($R*$Alpha+$R2*$iAlpha);
-     $Ga   = floor($G*$Alpha+$G2*$iAlpha);
-     $Ba   = floor($B*$Alpha+$B2*$iAlpha);
-
-     $C_Aliased = $this->AllocateColor($this->Picture,$Ra,$Ga,$Ba);
-     imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
-    }
-
-   /* Color helper */
-   function AllocateColor($Picture,$R,$G,$B,$Factor=0)
-    {
-     $R = $R + $Factor;
-     $G = $G + $Factor;
-     $B = $B + $Factor;
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     return(imagecolorallocate($Picture,$R,$G,$B));
-    }
-
-   /* Add a border to the picture */
-   function addBorder($Size=3,$R=0,$G=0,$B=0)
-    {
-     $Width  = $this->XSize+2*$Size;
-     $Height = $this->YSize+2*$Size;
-
-     $Resampled    = imagecreatetruecolor($Width,$Height);
-     $C_Background = $this->AllocateColor($Resampled,$R,$G,$B);
-     imagefilledrectangle($Resampled,0,0,$Width,$Height,$C_Background);
-
-     imagecopy($Resampled,$this->Picture,$Size,$Size,0,0,$this->XSize,$this->YSize);
-     imagedestroy($this->Picture);
-
-     $this->XSize = $Width;
-     $this->YSize = $Height;
-
-     $this->Picture = imagecreatetruecolor($this->XSize,$this->YSize);
-     $C_White = $this->AllocateColor($this->Picture,255,255,255);
-     imagefilledrectangle($this->Picture,0,0,$this->XSize,$this->YSize,$C_White);
-     imagecolortransparent($this->Picture,$C_White);
-     imagecopy($this->Picture,$Resampled,0,0,0,0,$this->XSize,$this->YSize);
-    }
-
-   /* Render the current picture to a file */
-   function Render($FileName)
-    {
-     if ( $this->ErrorReporting )
-      $this->printErrors($this->ErrorInterface);
-
-     /* Save image map if requested */
-     if ( $this->BuildMap )
-      $this->SaveImageMap();
-
-     imagepng($this->Picture,$FileName);
-    }
-
-   /* Render the current picture to STDOUT */
-   function Stroke()
-    {
-     if ( $this->ErrorReporting )
-      $this->printErrors("GD");
-
-     /* Save image map if requested */
-     if ( $this->BuildMap )
-      $this->SaveImageMap();
-
-     header('Content-type: image/png');
-     imagepng($this->Picture);
-    }
-
-   /* Private functions for internal processing */
-   function drawAntialiasPixel($X,$Y,$R,$G,$B,$Alpha=100,$NoFallBack=FALSE)
-    {
-     /* Process shadows */
-     if ( $this->ShadowActive && !$NoFallBack )
-      {
-       $this->drawAntialiasPixel($X+$this->ShadowXDistance,$Y+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha,TRUE);
-       if ( $this->ShadowBlur != 0 )
-        {
-         $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur);
-
-         for($i=1; $i<=$this->ShadowBlur; $i++)
-          $this->drawAntialiasPixel($X+$this->ShadowXDistance-$i/2,$Y+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-         for($i=1; $i<=$this->ShadowBlur; $i++)
-          $this->drawAntialiasPixel($X+$this->ShadowXDistance+$i/2,$Y+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-        }
-      }
-
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $Plot = "";
-     $Xi   = floor($X);
-     $Yi   = floor($Y);
-
-     if ( $Xi == $X && $Yi == $Y)
-      {
-       if ( $Alpha == 100 )
-        {
-         $C_Aliased = $this->AllocateColor($this->Picture,$R,$G,$B);
-         imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
-        }
-       else
-        $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
-      }
-     else
-      {
-       $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
-       if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
-
-       $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
-       if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); }
-
-       $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
-       if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); }
-
-       $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
-       if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); }
-      }
-    }
-
-   /* Validate data contained in the description array */
-   function validateDataDescription($FunctionName,&$DataDescription,$DescriptionRequired=TRUE)
-    {
-     if (!isset($DataDescription["Position"]))
-      {
-       $this->Errors[] = "[Warning] ".$FunctionName." - Y Labels are not set.";
-       $DataDescription["Position"] = "Name";
-      }
-
-     if ( $DescriptionRequired )
-      {
-       if (!isset($DataDescription["Description"]))
-        {
-         $this->Errors[] = "[Warning] ".$FunctionName." - Series descriptions are not set.";
-         foreach($DataDescription["Values"] as $key => $Value)
-          {
-           $DataDescription["Description"][$Value] = $Value;
-          }
-        }
-
-       if (count($DataDescription["Description"]) < count($DataDescription["Values"]))
-        {
-         $this->Errors[] = "[Warning] ".$FunctionName." - Some series descriptions are not set.";
-         foreach($DataDescription["Values"] as $key => $Value)
-          {
-           if ( !isset($DataDescription["Description"][$Value]))
-            $DataDescription["Description"][$Value] = $Value;
-          }
-        }
-      }
-    }
-
-   /* Validate data contained in the data array */
-   function validateData($FunctionName,&$Data)
-    {
-     $DataSummary = array();
-
-     foreach($Data as $key => $Values)
-      {
-       foreach($Values as $key2 => $Value)
-        {
-         if (!isset($DataSummary[$key2]))
-          $DataSummary[$key2] = 1;
-         else
-          $DataSummary[$key2]++;
-        }
-      }
-
-     if ( max($DataSummary) == 0 )
-      $this->Errors[] = "[Warning] ".$FunctionName." - No data set.";
-
-     foreach($DataSummary as $key => $Value)
-      {
-       if ($Value < max($DataSummary))
-        {
-         $this->Errors[] = "[Warning] ".$FunctionName." - Missing data in serie ".$key.".";
-        }
-      }
-    }
-
-   /* Print all error messages on the CLI or graphically */
-   function printErrors($Mode="CLI")
-    {
-     if (count($this->Errors) == 0)
-      return(0);
-
-     if ( $Mode == "CLI" )
-      {
-       foreach($this->Errors as $key => $Value)
-        echo $Value."\r\n";
-      }
-     elseif ( $Mode == "GD" )
-      {
-       $this->setLineStyle($Width=1);
-       $MaxWidth = 0;
-       foreach($this->Errors as $key => $Value)
-        {
-         $Position  = imageftbbox($this->ErrorFontSize,0,$this->ErrorFontName,$Value);
-         $TextWidth = $Position[2]-$Position[0];
-         if ( $TextWidth > $MaxWidth ) { $MaxWidth = $TextWidth; }
-        }
-       $this->drawFilledRoundedRectangle($this->XSize-($MaxWidth+20),$this->YSize-(20+(($this->ErrorFontSize+4)*count($this->Errors))),$this->XSize-10,$this->YSize-10,6,233,185,185);
-       $this->drawRoundedRectangle($this->XSize-($MaxWidth+20),$this->YSize-(20+(($this->ErrorFontSize+4)*count($this->Errors))),$this->XSize-10,$this->YSize-10,6,193,145,145);
-
-       $C_TextColor = $this->AllocateColor($this->Picture,133,85,85);
-       $YPos        = $this->YSize - (18 + (count($this->Errors)-1) * ($this->ErrorFontSize + 4));
-       foreach($this->Errors as $key => $Value)
-        {
-         imagettftext($this->Picture,$this->ErrorFontSize,0,$this->XSize-($MaxWidth+15),$YPos,$C_TextColor,$this->ErrorFontName,$Value);
-         $YPos = $YPos + ($this->ErrorFontSize + 4);
-        }
-      }
-    }
-
-   /* Activate the image map creation process */
-   function setImageMap($Mode=TRUE,$GraphID="MyGraph")
-    {
-     $this->BuildMap = $Mode;
-     $this->MapID    = $GraphID;
-    }
-
-   /* Add a box into the image map */
-   function addToImageMap($X1,$Y1,$X2,$Y2,$SerieName,$Value,$CallerFunction)
-    {
-     if ( $this->MapFunction == NULL || $this->MapFunction == $CallerFunction )
-      {
-       $this->ImageMap[]  = round($X1).",".round($Y1).",".round($X2).",".round($Y2).",".$SerieName.",".$Value;
-       $this->MapFunction = $CallerFunction;
-      }
-    }
-
-   /* Load and cleanup the image map from disk */
-   function getImageMap($MapName,$Flush=TRUE)
-    {
-     /* Strip HTML query strings */
-     $Values   = $this->tmpFolder.$MapName;
-     $Value    = split("\?",$Values);
-     $FileName = $Value[0];
-
-     if ( file_exists($FileName) )
-      {
-       $Handle     = fopen($FileName, "r");
-       $MapContent = fread($Handle, filesize($FileName));
-       fclose($Handle);
-       echo $MapContent;
-
-       if ( $Flush )
-        unlink($FileName);
-
-       exit();
-      }
-     else
-      {
-       header("HTTP/1.0 404 Not Found");
-       exit();
-      }
-    }
-
-   /* Save the image map to the disk */
-   function SaveImageMap()
-    {
-     if ( !$this->BuildMap ) { return(-1); }
-
-     if ( $this->ImageMap == NULL )
-      {
-       $this->Errors[] = "[Warning] SaveImageMap - Image map is empty.";
-       return(-1);
-      }
-
-     $Handle = fopen($this->tmpFolder.$this->MapID, 'w');
-     if ( !$Handle )
-      {
-       $this->Errors[] = "[Warning] SaveImageMap - Cannot save the image map.";
-       return(-1);
-      }
-     else
-      {
-       foreach($this->ImageMap as $Key => $Value)
-        fwrite($Handle, htmlentities($Value)."\r");
-      }
-     fclose ($Handle);
-    }
-
-   /* Convert seconds to a time format string */
-   function ToTime($Value)
-    {
-     $Hour   = floor($Value/3600);
-     $Minute = floor(($Value - $Hour*3600)/60);
-     $Second = floor($Value - $Hour*3600 - $Minute*60);
-
-     if (strlen($Hour) == 1 )   { $Hour = "0".$Hour; }
-     if (strlen($Minute) == 1 ) { $Minute = "0".$Minute; }
-     if (strlen($Second) == 1 ) { $Second = "0".$Second; }
-
-     return($Hour.":".$Minute.":".$Second);
-    }
-
-   /* Convert to metric system */
-   function ToMetric($Value)
-    {
-     $Go = floor($Value/1000000000);
-     $Mo = floor(($Value - $Go*1000000000)/1000000);
-     $Ko = floor(($Value - $Go*1000000000 - $Mo*1000000)/1000);
-     $o  = floor($Value - $Go*1000000000 - $Mo*1000000 - $Ko*1000);
-
-     if ($Go != 0)   { return($Go.".".$Mo."g"); }
-     if ($Mo != 0)   { return($Mo.".".$ko."m"); }
-     if ($Ko != 0)   { return($Ko.".".$o)."k"; }
-     return($o);
-    }
-
-   /* Convert to curency */
-   function ToCurrency($Value)
-    {
-     $Go = floor($Value/1000000000);
-     $Mo = floor(($Value - $Go*1000000000)/1000000);
-     $Ko = floor(($Value - $Go*1000000000 - $Mo*1000000)/1000);
-     $o  = floor($Value - $Go*1000000000 - $Mo*1000000 - $Ko*1000);
-
-     if ( strlen($o) == 1 ) { $o = "00".$o; }
-     if ( strlen($o) == 2 ) { $o = "0".$o; }
-
-     $ResultString = $o;
-     if ( $Ko != 0 ) { $ResultString = $Ko.".".$ResultString; }
-     if ( $Mo != 0 ) { $ResultString = $Mo.".".$ResultString; }
-     if ( $Go != 0 ) { $ResultString = $Go.".".$ResultString; }
-
-     $ResultString = $this->Currency.$ResultString;
-     return($ResultString);
-    }
-
-   /* Set date format for axis labels */
-   function setDateFormat($Format)
-    {
-     $this->DateFormat = $Format;
-    }
-
-   /* Convert TS to a date format string */
-   function ToDate($Value)
-    {
-     return(date($this->DateFormat,$Value));
-    }
-
-   /* Check if a number is a full integer (for scaling) */
-   function isRealInt($Value)
-    {
-     if ($Value == floor($Value))
-      return(TRUE);
-     return(FALSE);
-    }
-  }
-
- function RaiseFatal($Message)
-  {
-   echo "[FATAL] ".$Message."\r\n";
-   exit();
-  }
-?>
-\ No newline at end of file
diff --git a/libs/pChart.1.27d/pChart/pData.php b/libs/pChart.1.27d/pChart/pData.php
deleted file mode 100644
index ff101db9f8..0000000000
--- a/libs/pChart.1.27d/pChart/pData.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
- /*
-     pData - Simplifying data population for pChart
-     Copyright (C) 2008 Jean-Damien POGOLOTTI
-     Version  1.13 last updated on 08/17/08
-
-     http://pchart.sourceforge.net
-
-     This program is free software: you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation, either version 1,2,3 of the License, or
-     (at your option) any later version.
-
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-
-     You should have received a copy of the GNU General Public License
-     along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-     Class initialisation :
-      pData()
-     Data populating methods :
-      ImportFromCSV($FileName,$Delimiter=",",$DataColumns=-1,$HasHeader=FALSE,$DataName=-1)
-      AddPoint($Value,$Serie="Serie1",$Description="")
-     Series manipulation methods :
-      AddSerie($SerieName="Serie1")
-      AddAllSeries()
-      RemoveSerie($SerieName="Serie1")
-      SetAbsciseLabelSerie($SerieName = "Name")
-      SetSerieName($Name,$SerieName="Serie1")
-  +   SetSerieSymbol($Name,$Symbol)
-      SetXAxisName($Name="X Axis")
-      SetYAxisName($Name="Y Axis")
-      SetXAxisFormat($Format="number")
-      SetYAxisFormat($Format="number")
-      SetXAxisUnit($Unit="")
-      SetYAxisUnit($Unit="")
-      removeSerieName($SerieName)
-      removeAllSeries()
-     Data retrieval methods :
-      GetData()
-      GetDataDescription()
- */
-
- /* pData class definition */
- class pData
-  {
-   var $Data;
-   var $DataDescription;
-
-   function pData()
-    {
-     $this->Data                           = "";
-     $this->DataDescription                = "";
-     $this->DataDescription["Position"]    = "Name";
-     $this->DataDescription["Format"]["X"] = "number";
-     $this->DataDescription["Format"]["Y"] = "number";
-     $this->DataDescription["Unit"]["X"]   = NULL;
-     $this->DataDescription["Unit"]["Y"]   = NULL;
-    }
-
-   function ImportFromCSV($FileName,$Delimiter=",",$DataColumns=-1,$HasHeader=FALSE,$DataName=-1)
-    {
-     $handle = @fopen($FileName,"r");
-     if ($handle)
-      {
-       $HeaderParsed = FALSE;
-       while (!feof($handle))
-        {
-         $buffer = fgets($handle, 4096);
-         $buffer = str_replace(chr(10),"",$buffer);
-         $buffer = str_replace(chr(13),"",$buffer);
-         $Values = split($Delimiter,$buffer);
-
-         if ( $buffer != "" )
-          {
-           if ( $HasHeader == TRUE && $HeaderParsed == FALSE )
-            {
-             if ( $DataColumns == -1 )
-              {
-               $ID = 1;
-               foreach($Values as $key => $Value)
-                { $this->SetSerieName($Value,"Serie".$ID); $ID++; }
-              }
-             else
-              {
-               $SerieName = "";
-
-               foreach($DataColumns as $key => $Value)
-                $this->SetSerieName($Values[$Value],"Serie".$Value);
-              }
-             $HeaderParsed = TRUE;
-            }
-           else
-            {
-             if ( $DataColumns == -1 )
-              {
-               $ID = 1;
-               foreach($Values as $key => $Value)
-                { $this->AddPoint(intval($Value),"Serie".$ID); $ID++; }
-              }
-             else
-              {
-               $SerieName = "";
-               if ( $DataName != -1 )
-                $SerieName = $Values[$DataName];
-
-               foreach($DataColumns as $key => $Value)
-                $this->AddPoint($Values[$Value],"Serie".$Value,$SerieName);
-              }
-            }
-          }
-        }
-       fclose($handle);
-      }
-    }
-
-   function AddPoint($Value,$Serie="Serie1",$Description="")
-    {
-     if (is_array($Value) && count($Value) == 1)
-      $Value = $Value[0];
-
-     $ID = 0;
-     for($i=0;$i<=count($this->Data);$i++)
-      { if(isset($this->data[$i][$Serie])) { $ID = $i+1; } }
-
-     if ( count($Value) == 1 )
-      {
-       $this->Data[$ID][$Serie] = $Value;
-       if ( $Description != "" )
-        $this->Data[$ID]["Name"] = $Description;
-       elseif (!isset($this->Data[$ID]["Name"]))
-        $this->Data[$ID]["Name"] = $ID;
-      }
-     else
-      {
-       foreach($Value as $key => $Val)
-        {
-         $this->Data[$ID][$Serie] = $Val;
-         if (!isset($this->Data[$ID]["Name"]))
-          $this->Data[$ID]["Name"] = $ID;
-         $ID++;
-        }
-      }
-    }
-
-   function AddSerie($SerieName="Serie1")
-    {
-     if ( !isset($this->DataDescription["Values"]) )
-      {
-       $this->DataDescription["Values"][] = $SerieName;
-      }
-     else
-      {
-       $Found = FALSE;
-       foreach($this->DataDescription["Values"] as $key => $Value )
-        if ( $Value == $SerieName ) { $Found = TRUE; }
-
-       if ( !$Found )
-        $this->DataDescription["Values"][] = $SerieName;
-      }
-    }
-
-   function AddAllSeries()
-    {
-     unset($this->DataDescription["Values"]);
-
-     if ( isset($this->Data[0]) )
-      {
-       foreach($this->Data[0] as $Key => $Value)
-        {
-         if ( $Key != "Name" )
-          $this->DataDescription["Values"][] = $Key;
-        }
-      }
-    }
-
-   function RemoveSerie($SerieName="Serie1")
-    {
-     if ( !isset($this->DataDescription["Values"]) )
-      return(0);
-
-     $Found = FALSE;
-     foreach($this->DataDescription["Values"] as $key => $Value )
-      {
-       if ( $Value == $SerieName )
-        unset($this->DataDescription["Values"][$key]);
-      }
-    }
-
-   function SetAbsciseLabelSerie($SerieName = "Name")
-    {
-     $this->DataDescription["Position"] = $SerieName;
-    }
-
-   function SetSerieName($Name,$SerieName="Serie1")
-    {
-     $this->DataDescription["Description"][$SerieName] = $Name;
-    }
-
-   function SetXAxisName($Name="X Axis")
-    {
-     $this->DataDescription["Axis"]["X"] = $Name;
-    }
-
-   function SetYAxisName($Name="Y Axis")
-    {
-     $this->DataDescription["Axis"]["Y"] = $Name;
-    }
-
-   function SetXAxisFormat($Format="number")
-    {
-     $this->DataDescription["Format"]["X"] = $Format;
-    }
-
-   function SetYAxisFormat($Format="number")
-    {
-     $this->DataDescription["Format"]["Y"] = $Format;
-    }
-
-   function SetXAxisUnit($Unit="")
-    {
-     $this->DataDescription["Unit"]["X"] = $Unit;
-    }
-
-   function SetYAxisUnit($Unit="")
-    {
-     $this->DataDescription["Unit"]["Y"] = $Unit;
-    }
-
-   function SetSerieSymbol($Name,$Symbol)
-    {
-     $this->DataDescription["Symbol"][$Name] = $Symbol;
-    }
-
-   function removeSerieName($SerieName)
-    {
-     if ( isset($this->DataDescription["Description"][$SerieName]) )
-      unset($this->DataDescription["Description"][$SerieName]);
-    }
-
-   function removeAllSeries()
-    {
-     foreach($this->DataDescription["Values"] as $Key => $Value)
-      unset($this->DataDescription["Values"][$Key]);
-    }
-
-   function GetData()
-    {
-     return($this->Data);
-    }
-
-   function GetDataDescription()
-    {
-     return($this->DataDescription);
-    }
-  }
-?>
-\ No newline at end of file
diff --git a/libs/pChart2.1.3/GPLv3.txt b/libs/pChart2.1.3/GPLv3.txt
new file mode 100644
index 0000000000..10926e87f1
--- /dev/null
+++ b/libs/pChart2.1.3/GPLv3.txt
@@ -0,0 +1,675 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+
diff --git a/libs/pChart2.1.3/change.log b/libs/pChart2.1.3/change.log
new file mode 100644
index 0000000000..4cf0f787db
--- /dev/null
+++ b/libs/pChart2.1.3/change.log
@@ -0,0 +1,282 @@
+
+ ???????????????????????????????????????????
+ ?                                         ?
+ ?   pChart - a PHP Charting library       ?
+ ?                                         ?
+ ?   Version     : 2.1.3                   ?
+ ?   Made by     : Jean-Damien POGOLOTTI   ?
+ ?   Last Update : 09/09/11                ?
+ ?                                         ?
+ ???????????????????????????????????????????
+
+ 2.1.3 ????????????????????????????????????????????????????????????????????????
+
+  o Updated drawPlotChart() to size the plot based on the serie weight.
+  o Added the drawXThreshold() function.
+  o Added the drawXThresholdArea() function.
+  o Added the AreaName param. to drawXThresholdArea() and drawThresholdArea().
+  o Various visual enhancements.
+  o Fixed a bug in the drawPlotChart() function.
+  o Added shadow support for the Area charts.
+  o Added the BorderWidth parameter to the drawBubbleChart() function.
+  o Added the Shape parameter to the drawBubbleChart() function.
+  o Added the AXIS_FORMAT_CUSTOM for user callback handling.
+  o Rewritten the drawStackedAreaChart() function.
+  o Added support for labels on stacked charts.
+  o Added the createFunctionSerie() function to the pData class.
+  o Added the drawScatterThreshold() function to the pScatter class.
+  o Added the drawScatterThresholdArea() function to the pScatter class.
+  o Added the setAbsicssaPosition() function to the pData class.
+  o Added the NegateValues() function to the pData class.
+  o Added the NoMargin parameter to the drawThresholdArea & drawThreshold fcts.
+  o Added the drawAreaMirror() function.
+  o Added the EURO_SYMBOL constant.
+  o Added the replaceImageMapValues() function.
+  o Added the replaceImageMapTitle() function.
+  o Thresholds functions can now accept an array of points.
+  o Added the FixedMax parameter to both the Radar and Polar charts.
+  o Added the Precision parameter to the pie and ring charts.
+  o Added the DisplayOrientation parameter to the bar & stacked bar charts.
+  o Fixed a bug while using the drawBestFit function with VOID datasets.
+  o Added the RemoveXAxis option to the drawScale() function.
+
+
+ 2.1.2 ????????????????????????????????????????????????????????????????????????
+
+  o Added zone threshold support for filled area charts.
+  o Added zone threshold support for filled spline charts.
+  o Added the setScatterSerieShape() function.
+  o Added the getSerieMedian() function.
+  o Added the drawZoneChart() function.
+  o Added the getStandardDeviation() function.
+  o Added the getCoefficientOfVariation() function.
+  o Added the getGeometricMean() function.
+  o Added the getHarmonicMean() function.
+  o Introduced support for imageMap.
+  o Added the initialiseImageMap() function.
+  o Added the addToImageMap() function.
+  o Added the dumpImageMap() function.
+  o Added value writting supports to the radars & polars charts.
+  o Added the option to add an inner border to the reg. and stacked bar charts.
+  o Added the SERIE_SHAPE_DIAMOND and SERIE_SHAPE_FILLEDDIAMOND series shapes.
+  o Fixed a visual bug in the drawAreaChart function. (thks to dmiller)
+  o Added the BrowserExpire param to the stroke() function (thks to marquonis)
+  o Fixed a visual bug in the drawBarChart function when the Interleave is 0.
+  o Corrected a bug in the drawScatterBestFit() function (thks to ares)
+  o Fixed some bugs with the pie chart functions.
+
+
+ 2.1.1 ????????????????????????????????????????????????????????????????????????
+
+  o Created the pIndicator class.
+  o Created the pSurface class.
+  o Added the drawLabel() function.
+  o Added the writeScatterLabel() function.
+  o Added the writeBubbleLabel() function.
+  o Added the ForceAlpha parameter to the buble chart.
+  o Added the LabelStacked parameter to the 2D and 3D pie charts.
+  o Added 2D ring chart support to the pPie class extension.
+  o Added 3D ring chart support to the pPie class extension.
+  o Added the autoOutput() method to the pCache class.
+  o Added some NULL value tests.
+  o Added the setSerieShape() function to the pData class.
+  o Added the setAbscissaName() function to the pData class.
+  o Fixed a bug in the getAverage() function.
+  o Changed the VOID constant from 0.12345 to 0.123456789.
+  o Fixed a bug with the number of decimals in the METRIC scale.
+  o Fixed a visual bug with reversed bar chart labelling.
+  o Added the ValuePosition & ValuePadding parameters to the pie charts.
+  o Added the WriteValue parameters to the 2D pie charts.
+  o Added the getSeriePalette() function to the pData class.
+  o pData methods can now accept array of serie parameters.
+  o Fixed a bug in the scatter spline chart VOID values handling.
+
+ 2.1.0 ????????????????????????????????????????????????????????????????????????
+
+  /!\ Renamed the .class files to .class.php.
+
+  o Create the pScatter class.
+  o Added the ScatterPlotChart() charting method.
+  o Added the ScatterLineChart() charting method.
+  o Added the ScatterSplineChart() charting method.
+  o Added the DrawScatterLegend() function.
+  o Added the getScatterLegendSize() function.
+  o Added the following function to the pData class :
+
+    - setScatterSerie()
+    - setScatterSerieDescription()
+    - setScatterSeriePicture()
+    - setScatterSerieDrawable()
+    - setScatterSerieTicks()
+    - setScatterSerieWeight()
+    - setScatterSerieColor()
+
+  o Added a Forces config. array to drawSpline() function to allow parametric
+    forces. (used by the scatter spline algorithm)
+  o Added Floating0Serie & Floating0Value options to the drawBarChart function.
+  o Added the Draw0Line option to the drawBarChart function.
+  o Added support for line and filled step charts.
+  o Fixed a visual artifact in the drawGradient() function.
+  o Fixed a visual artifact in the drawRoundedFilledRectangle() function.
+  o Fixed a visual artifact in the drawRadar() function.
+  o Rewritten the example index page.
+  o Added the Floating parameter to the scaling functions.
+  o Added the drawBestFit() and drawScatterBestFit() math functions.
+
+
+ 2.0.13 ???????????????????????????????????????????????????????????????????????
+
+  o Modified the drawScale() function to get the best visual factors.
+  o Added the BorderAlpha parameter to the drawFilledCircle() function.
+  o Shipped more examples.
+  o Fixed a bug in the normalize() function and 0 Values.
+  o Finally implemented the setSeriePicture() output.
+  o Added the bubble class extension.
+  o Added the possibility to have a transparent background to the generated
+    pictures keeping the alpha channels (thanks to georgi.m)
+  o Updated the sandbox to support transparent background.
+  o Added the drawDerivative() function to draw curve slope factor.
+  o Additional Minor fixes.
+
+
+ 2.0.12 ???????????????????????????????????????????????????????????????????????
+
+  o Added missing points (VOID) handling for line & spline charts.
+  o Added customisation options to the drawLegend() function.
+  o Various additions and enhancements in the sandbox.
+  o Added the weight series support to the drawSplineChart() function.
+  o Added the SCALE_MODE_MANUAL scaling method.
+
+
+ 2.0.11 ???????????????????????????????????????????????????????????????????????
+
+  o Added the AxisBoxRounded, AxisFontName, AxisFontSize parameters to the
+    radar and polar class.
+  o Fixed a bug with the axis labels of the radar charts using the STAR layout.
+  o Fixed a bug in the axis format computing.
+  o Added the axis format option in the sandbox system.
+  o Tuned the way the METRIC scales are displayed.
+  o Fixed a bug with the getWidth(), getHeight().(thanks to SandmanXC)
+
+
+ 2.0.10 ???????????????????????????????????????????????????????????????????????
+
+  /!\ First public release.
+
+  o Fixed a bug in the normalize() function for VOID values.
+  o Updated the example rendering frontend.
+  o Updated the sandbox.
+
+
+ 2.0.9 ????????????????????????????????????????????????????????????????????????
+
+  o Added the sandbox.
+  o Added the getLegendSize() function.
+  o Added the SCALE_MODE_ADDALL_START0 scaling method.
+  o Fixed a bug in the normalize() function.
+  o Fixed a bug in the computeScale() function.
+
+ 2.0.8 ????????????????????????????????????????????????????????????????????????
+
+  o Corrected a bug in the drawThreshold() function. (thanks to mice32alpha)
+  o Added rendering options to the writeBounds() function.
+  o Enhanced the rendering of the drawRoundedFilledRectangle() function.
+  o Added the setSerieWeight() function to the pData class.
+  o Fixed a bug in the loadPalette() function.
+  o Added the 9 palette files. (/palettes)
+  o Fixed visual artifact in the drawGradientArea() function.
+
+
+ 2.0.7 ????????????????????????????????????????????????????????????????????????
+
+  o Fixed a cosmetic issue in the stacked area chart function.
+  o Bar chart with 0 values now appears as a 0 line.
+  o Zero values are not rendered anymore in stacked bar charts.
+  o Added the possibility to rotate X axis labels. (LabelRotation)
+  o Added rendering parameters for skipped X axis values :
+
+     $SkippedAxisTicks
+     $SkippedAxisR
+     $SkippedAxisG
+     $SkippedAxisB
+     $SkippedAxisAlpha
+     $SkippedTickR
+     $SkippedTickG
+     $SkippedTickB
+     $SkippedTickAlpha
+     $SkippedInnerTickWidth
+     $SkippedOuterTickWidth
+
+  o Added the ability to draw a background box around text (flat, rounded)
+  o Added the importFromCSV() method to the pData class.
+  o Fixed a bug in the min/max computing of the data series with VOID values.
+
+
+ 2.0.6 ????????????????????????????????????????????????????????????????????????
+
+  o Added setSliceColor() function to the pPie class.
+  o Added support for stacked area charts.
+  o Fixed an issue with 3D pie chart labelling.
+  o Fixed artifacts issues with the 3D pie hidden faces.
+  o Fixed a bug in the drawPolygon() function.
+  o Fixed a bug with automatic abscissa labelling.
+  o Rewritten the delayedLoaded script. (advice of mathbr for compatibility)
+
+
+ 2.0.5 ????????????????????????????????????????????????????????????????????????
+
+  o Added support for 3D pie charts.
+  o Enhanced the example rendering. (web)
+  o Added functionalities on radar charts (proposed by dani Huber)
+
+    - SkipLabels to skip any number of labels.
+    - LabelMiddle to center the labels between the slices.
+
+  o Fixed a bug with the palette management.
+  o Fixed an issue while displaying multiple-line legends.
+  o Added the delayed loader script in the examples.
+
+
+ 2.0.4 ????????????????????????????????????????????????????????????????????????
+
+  o Fixed issue with really small data series. (one value)
+  o Enhanced the example rendering. (batch + web)
+  o Added the autoOutput() rendering method.
+  o Made various minor fixes.
+
+
+ 2.0.3 ????????????????????????????????????????????????????????????????????????
+
+  o Added the autoOutput() function that determine if the picture should be
+    rendered with the Render() or Stroke() function based on the way the script
+    is called. (CLI or HTTPD)
+  o Added the getSum() function to the pData class.
+  o Added support for 2D pie charts :
+
+   - draw2DPie()
+   - drawPieLegend()
+
+  o Fixed angle issue in the drawArrowLabel function.
+  o While turning AA off, dashed line were not rendered (thanks to mice32alpha)
+
+
+ 2.0.2 ????????????????????????????????????????????????????????????????????????
+
+  o Fixing some notifications messages with the PHP5.3.x deprecated functions :
+
+   - split has been replaced by preg_split.
+   - ereg has been replaced by preg_match.
+
+  o Removed deprecated test with the in_array() function.
+
+
+ 2.0.1 ????????????????????????????????????????????????????????????????????????
+
+  o First public early adopter release.
+
+
+ 2.0.0 ????????????????????????????????????????????????????????????????????????
+
+  o Initial release of the v2.0.0 trunk. All primitive functions and some of
+    the charting functions have been created.
+
diff --git a/libs/pChart2.1.3/class/pData.class.php b/libs/pChart2.1.3/class/pData.class.php
new file mode 100644
index 0000000000..a67b062a87
--- /dev/null
+++ b/libs/pChart2.1.3/class/pData.class.php
@@ -0,0 +1,787 @@
+<?php
+ /*
+     pDraw - class to manipulate data arrays
+
+     Version     : 2.1.3
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 09/09/11
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ /* Axis configuration */
+ define("AXIS_FORMAT_DEFAULT"		, 680001);
+ define("AXIS_FORMAT_TIME"		, 680002);
+ define("AXIS_FORMAT_DATE"		, 680003);
+ define("AXIS_FORMAT_METRIC"		, 680004);
+ define("AXIS_FORMAT_CURRENCY"		, 680005);
+ define("AXIS_FORMAT_CUSTOM"		, 680006);
+
+ /* Axis position */
+ define("AXIS_POSITION_LEFT"		, 681001);
+ define("AXIS_POSITION_RIGHT"		, 681002);
+ define("AXIS_POSITION_TOP"		, 681001);
+ define("AXIS_POSITION_BOTTOM"		, 681002);
+
+ /* Families of data points */
+ define("SERIE_SHAPE_FILLEDCIRCLE"	, 681011);
+ define("SERIE_SHAPE_FILLEDTRIANGLE"	, 681012);
+ define("SERIE_SHAPE_FILLEDSQUARE"	, 681013);
+ define("SERIE_SHAPE_FILLEDDIAMOND"	, 681017);
+ define("SERIE_SHAPE_CIRCLE"		, 681014);
+ define("SERIE_SHAPE_TRIANGLE"		, 681015);
+ define("SERIE_SHAPE_SQUARE"		, 681016);
+ define("SERIE_SHAPE_DIAMOND"		, 681018);
+
+ /* Axis position */
+ define("AXIS_X"			, 682001);
+ define("AXIS_Y"			, 682002);
+
+ /* Define value limits */
+ define("ABSOLUTE_MIN"          	, -10000000000000);
+ define("ABSOLUTE_MAX"          	, 10000000000000);
+
+ /* Replacement to the PHP NULL keyword */
+ define("VOID"                  	, 0.123456789);
+
+ /* Euro symbol for GD fonts */
+ define("EURO_SYMBOL"			, utf8_encode("&#8364;"));
+
+ /* pData class definition */
+ class pData
+  {
+   var $Data;
+
+   var $Palette = array("0"=>array("R"=>188,"G"=>224,"B"=>46,"Alpha"=>100),
+                        "1"=>array("R"=>224,"G"=>100,"B"=>46,"Alpha"=>100),
+                        "2"=>array("R"=>224,"G"=>214,"B"=>46,"Alpha"=>100),
+                        "3"=>array("R"=>46,"G"=>151,"B"=>224,"Alpha"=>100),
+                        "4"=>array("R"=>176,"G"=>46,"B"=>224,"Alpha"=>100),
+                        "5"=>array("R"=>224,"G"=>46,"B"=>117,"Alpha"=>100),
+                        "6"=>array("R"=>92,"G"=>224,"B"=>46,"Alpha"=>100),
+                        "7"=>array("R"=>224,"G"=>176,"B"=>46,"Alpha"=>100));
+
+   /* Class creator */
+   function pData()
+    {
+     $this->Data = "";
+     $this->Data["XAxisDisplay"]	= AXIS_FORMAT_DEFAULT;
+     $this->Data["XAxisFormat"]		= NULL;
+     $this->Data["XAxisName"]		= NULL;
+     $this->Data["XAxisUnit"]		= NULL;
+     $this->Data["Abscissa"]		= NULL;
+     $this->Data["AbsicssaPosition"]	= AXIS_POSITION_BOTTOM;
+
+     $this->Data["Axis"][0]["Display"]  = AXIS_FORMAT_DEFAULT;
+     $this->Data["Axis"][0]["Position"] = AXIS_POSITION_LEFT;
+     $this->Data["Axis"][0]["Identity"] = AXIS_Y;
+    }
+
+   /* Add a single point or an array to the given serie */
+   function addPoints($Values,$SerieName="Serie1")
+    {
+     if (!isset($this->Data["Series"][$SerieName]))
+      $this->initialise($SerieName);
+
+     if ( is_array($Values) )
+      {
+       foreach($Values as $Key => $Value)
+        { $this->Data["Series"][$SerieName]["Data"][] = $Value; }
+      }
+     else
+      $this->Data["Series"][$SerieName]["Data"][] = $Values;
+
+     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);
+       $this->Data["Series"][$SerieName]["Min"] = min($StrippedData);
+      }
+    }
+
+   /* Strip VOID values */
+   function stripVOID($Values)
+    { if (!is_array($Values)) { return(array()); } $Result = array(); foreach($Values as $Key => $Value) { if ( $Value != VOID ) { $Result[] = $Value; } } return($Result); }
+
+   /* Return the number of values contained in a given serie */
+   function getSerieCount($Serie)
+    { 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)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie) { if (isset($this->Data["Series"][$Serie])) { unset($this->Data["Series"][$Serie]); } }
+    }
+
+   /* Return a value from given serie & index */
+   function getValueAt($Serie,$Index=0)
+    { if (isset($this->Data["Series"][$Serie]["Data"][$Index])) { return($this->Data["Series"][$Serie]["Data"][$Index]); } else { return(NULL); } }
+
+   /* Return the values array */
+   function getValues($Serie)
+    { 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)
+    {
+     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"]); } }
+    }
+
+   /* Return the sum of the serie values */
+   function getSum($Serie)
+    { if (isset($this->Data["Series"][$Serie])) { return(array_sum($this->Data["Series"][$Serie]["Data"])); } else { return(NULL); } }
+
+   /* Return the max value of a given serie */
+   function getMax($Serie)
+    { if (isset($this->Data["Series"][$Serie]["Max"])) { return($this->Data["Series"][$Serie]["Max"]); } else { return(NULL); } }
+
+   /* Return the min value of a given serie */
+   function getMin($Serie)
+    { 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)
+    {
+     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")
+    {
+     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)
+    {
+     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)
+    {
+     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; } }
+    }
+
+   /* Set the name of the X Axis */
+   function setXAxisName($Name)
+    { $this->Data["XAxisName"] = $Name; }
+
+   /* Set the display mode of the  X Axis */
+   function setXAxisDisplay($Mode,$Format=NULL)
+    { $this->Data["XAxisDisplay"] = $Mode; $this->Data["XAxisFormat"]  = $Format; }
+
+   /* Set the unit that will be displayed on the X axis */
+   function setXAxisUnit($Unit)
+    { $this->Data["XAxisUnit"] = $Unit; }
+
+   /* Set the serie that will be used as abscissa */
+   function setAbscissa($Serie)
+    { if (isset($this->Data["Series"][$Serie])) { $this->Data["Abscissa"] = $Serie; } }
+
+   function setAbsicssaPosition($Position = AXIS_POSITION_BOTTOM)
+    { $this->Data["AbsicssaPosition"] = $Position; }
+
+   /* Set the name of the abscissa axis */
+   function setAbscissaName($Name)
+    { $this->Data["AbscissaName"] = $Name; }
+
+   /* Create a scatter group specifyin X and Y data series */
+   function setScatterSerie($SerieX,$SerieY,$ID=0)
+    { if (isset($this->Data["Series"][$SerieX]) && isset($this->Data["Series"][$SerieY]) ) { $this->initScatterSerie($ID); $this->Data["ScatterSeries"][$ID]["X"] = $SerieX; $this->Data["ScatterSeries"][$ID]["Y"] = $SerieY; } }
+
+   /* Set the shape of a given sctatter serie */
+   function setScatterSerieShape($ID,$Shape=SERIE_SHAPE_FILLEDCIRCLE)
+    { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Shape"] = $Shape; } }
+
+   /* Set the description of a given scatter serie */
+   function setScatterSerieDescription($ID,$Description="My serie")
+    { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Description"] = $Description; } }
+
+   /* Set the icon associated to a given scatter serie */
+   function setScatterSeriePicture($ID,$Picture=NULL)
+    { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Picture"] = $Picture; } }
+
+   /* Set a scatter serie as "drawable" while calling a rendering function */
+   function setScatterSerieDrawable($ID ,$Drawable=TRUE)
+    { if (isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["isDrawable"] = $Drawable; } }
+
+   /* Define if a scatter serie should be draw with ticks */
+   function setScatterSerieTicks($ID,$Width=0)
+    { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Ticks"] = $Width; } }
+
+   /* Define if a scatter serie should be draw with a special weight */
+   function setScatterSerieWeight($ID,$Weight=0)
+    { if ( isset($this->Data["ScatterSeries"][$ID]) ) { $this->Data["ScatterSeries"][$ID]["Weight"] = $Weight; } }
+
+   /* Associate a color to a scatter serie */
+   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]) )
+      {
+       $this->Data["ScatterSeries"][$ID]["Color"]["R"] = $R;
+       $this->Data["ScatterSeries"][$ID]["Color"]["G"] = $G;
+       $this->Data["ScatterSeries"][$ID]["Color"]["B"] = $B;
+       $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = $Alpha;
+      }
+    }
+
+   /* Compute the series limits for an individual and global point of view */
+   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)
+        {
+         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"]; }
+        }
+      }
+     $this->Data["Min"] = $GlobalMin;
+     $this->Data["Max"] = $GlobalMax;
+
+     return(array($GlobalMin,$GlobalMax));
+    }
+
+   /* Mark all series as drawable */
+   function drawAll()
+    { 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]) )
+      {
+       $SerieData = $this->stripVOID($this->Data["Series"][$Serie]["Data"]);
+       return(array_sum($SerieData)/sizeof($SerieData));
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the geometric mean of the given 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
+      return(NULL);
+    }
+
+   /* Return the harmonic mean of the given 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
+      return(NULL);
+    }
+
+   /* Return the standard deviation of the given 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);
+
+       $Deviation = sqrt($DeviationSum/count($SerieData));
+
+       return($Deviation);
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the Coefficient of variation of the given serie */
+   function getCoefficientOfVariation($Serie)
+    {
+     if ( isset($this->Data["Series"][$Serie]) )
+      {
+       $Average           = $this->getSerieAverage($Serie);
+       $StandardDeviation = $this->getStandardDeviation($Serie);
+
+       if ( $StandardDeviation != 0 )
+        return($StandardDeviation/$Average);
+       else
+        return(NULL);
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the median value of the given 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);
+
+       if ( isset($SerieData[$SerieCenter]) )
+        return($SerieData[$SerieCenter]);
+       else
+        return(NULL);
+      }
+     else
+      return(NULL);
+    }
+
+   /* Return the x th percentil of the given serie */
+   function getSeriePercentile($Serie="Serie1",$Percentil=95)
+    {
+     if (!isset($this->Data["Series"][$Serie]["Data"])) { return(NULL); }
+
+     $Values = count($this->Data["Series"][$Serie]["Data"])-1;
+     if ( $Values < 0 ) { $Values = 0; }
+
+     $PercentilID  = floor(($Values/100)*$Percentil+.5);
+     $SortedValues = $this->Data["Series"][$Serie]["Data"];
+     sort($SortedValues);
+
+     if ( is_numeric($SortedValues[$PercentilID]) )
+      return($SortedValues[$PercentilID]);
+     else
+      return(NULL);
+    }
+
+   /* Add random values to a given serie */
+   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++)
+      {
+       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()
+    {
+     if (!isset($this->Data["Series"])) { return(FALSE); }
+
+     $Result = FALSE;
+     foreach($this->Data["Series"] as $Key => $Value)
+      { if ( $this->Data["Abscissa"] != $Key && $this->Data["Series"][$Key]["isDrawable"]==TRUE) { $Result=TRUE; } }
+     return($Result);
+    }
+
+   /* Set the display mode of an Axis */
+   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; }
+      }
+    }
+
+   /* Set the position of an Axis */
+   function setAxisPosition($AxisID,$Position=AXIS_POSITION_LEFT)
+    { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Position"] = $Position; } }
+
+   /* Associate an unit to an axis */
+   function setAxisUnit($AxisID,$Unit)
+    { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Unit"] = $Unit; } }
+
+   /* Associate a name to an axis */
+   function setAxisName($AxisID,$Name)
+    { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Name"] = $Name; } }
+
+   /* Associate a color to an axis */
+   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] ) )
+      {
+       $this->Data["Axis"][$AxisID]["Color"]["R"] = $R;
+       $this->Data["Axis"][$AxisID]["Color"]["G"] = $G;
+       $this->Data["Axis"][$AxisID]["Color"]["B"] = $B;
+       $this->Data["Axis"][$AxisID]["Color"]["Alpha"] = $Alpha;
+      }
+    }
+
+
+   /* Design an axis as X or Y member */
+   function setAxisXY($AxisID,$Identity=AXIS_Y)
+    { if ( isset($this->Data["Axis"][$AxisID] ) ) { $this->Data["Axis"][$AxisID]["Identity"] = $Identity; } }
+
+   /* Associate one data serie with one axis */
+   function setSerieOnAxis($Series,$AxisID)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     foreach($Series as $Key => $Serie)
+      {
+       $PreviousAxis = $this->Data["Series"][$Serie]["Axis"];
+
+       /* Create missing axis */
+       if ( !isset($this->Data["Axis"][$AxisID] ) )
+        { $this->Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; $this->Data["Axis"][$AxisID]["Identity"] = AXIS_Y;}
+
+       $this->Data["Series"][$Serie]["Axis"] = $AxisID;
+
+       /* Cleanup unused axis */
+       $Found = FALSE;
+       foreach($this->Data["Series"] as $SerieName => $Values) { if ( $Values["Axis"] == $PreviousAxis ) { $Found = TRUE; } }
+       if (!$Found) { unset($this->Data["Axis"][$PreviousAxis]); }
+      }
+    }
+
+   /* Define if a serie should be draw with ticks */
+   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)
+    {
+     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)
+    {
+     if ( !isset($this->Data["Series"][$Serie]) ) { return(NULL); }
+
+     $Result = "";
+     $Result["R"] = $this->Data["Series"][$Serie]["Color"]["R"];
+     $Result["G"] = $this->Data["Series"][$Serie]["Color"]["G"];
+     $Result["B"] = $this->Data["Series"][$Serie]["Color"]["B"];
+     $Result["Alpha"] = $this->Data["Series"][$Serie]["Color"]["Alpha"];
+
+     return($Result);
+    }
+
+   /* Set the color of one serie */
+   function setPalette($Series,$Format=NULL)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+
+     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]) )
+        {
+         $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;
+         $this->Data["Series"][$Serie]["Color"]["B"] = $B;
+         $this->Data["Series"][$Serie]["Color"]["Alpha"] = $Alpha;
+
+         /* Do reverse processing on the internal palette array */
+         foreach ($this->Palette as $Key => $Value)
+          { if ($Value["R"] == $OldR && $Value["G"] == $OldG && $Value["B"] == $OldB) { $this->Palette[$Key]["R"] = $R; $this->Palette[$Key]["G"] = $G; $this->Palette[$Key]["B"] = $B; $this->Palette[$Key]["Alpha"] = $Alpha;} }
+        }
+      }
+    }
+
+   /* Load a palette file */
+   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))
+      {
+       $buffer = fgets($fileHandle, 4096);
+       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);
+        }
+      }
+     fclose($fileHandle);
+
+     /* Apply changes to current series */
+     $ID = 0;
+     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
+          $this->Data["Series"][$Key]["Color"] = $this->Palette[$ID];
+         $ID++;
+        }
+      }
+    }
+
+   /* Initialise a given scatter serie */
+   function initScatterSerie($ID)
+    {
+     if ( isset($this->Data["ScatterSeries"][$ID]) ) { return(0); }
+
+     $this->Data["ScatterSeries"][$ID]["Description"]	= "Scatter ".$ID;
+     $this->Data["ScatterSeries"][$ID]["isDrawable"]	= TRUE;
+     $this->Data["ScatterSeries"][$ID]["Picture"]	= NULL;
+     $this->Data["ScatterSeries"][$ID]["Ticks"]		= 0;
+     $this->Data["ScatterSeries"][$ID]["Weight"]	= 0;
+
+     if ( isset($this->Palette[$ID]) )
+      $this->Data["ScatterSeries"][$ID]["Color"] = $this->Palette[$ID];
+     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);
+       $this->Data["ScatterSeries"][$ID]["Color"]["Alpha"] = 100;
+      }
+    }
+
+   /* Initialise a given serie */
+   function initialise($Serie)
+    {
+     if ( isset($this->Data["Series"]) ) { $ID = count($this->Data["Series"]); } else { $ID = 0; }
+
+     $this->Data["Series"][$Serie]["Description"]	= $Serie;
+     $this->Data["Series"][$Serie]["isDrawable"]	= TRUE;
+     $this->Data["Series"][$Serie]["Picture"]		= NULL;
+     $this->Data["Series"][$Serie]["Max"]		= NULL;
+     $this->Data["Series"][$Serie]["Min"]		= NULL;
+     $this->Data["Series"][$Serie]["Axis"]		= 0;
+     $this->Data["Series"][$Serie]["Ticks"]		= 0;
+     $this->Data["Series"][$Serie]["Weight"]		= 0;
+     $this->Data["Series"][$Serie]["Shape"]		= SERIE_SHAPE_FILLEDCIRCLE;
+
+     if ( isset($this->Palette[$ID]) )
+      $this->Data["Series"][$Serie]["Color"] = $this->Palette[$ID];
+     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);
+       $this->Data["Series"][$Serie]["Color"]["Alpha"] = 100;
+      }
+    }
+     
+   function normalize($NormalizationFactor=100,$UnitChange=NULL,$Round=1)
+    {
+     $Abscissa = $this->Data["Abscissa"];
+
+     $SelectedSeries = "";
+     $MaxVal         = 0;
+     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)
+          {
+           $SelectedSeries[$SerieName] = $SerieName;
+
+           if ( count($Serie["Data"] ) > $MaxVal ) { $MaxVal = count($Serie["Data"]); }
+          }
+        }
+      }
+
+     for($i=0;$i<=$MaxVal-1;$i++)
+      {
+       $Factor = 0;
+       foreach ($SelectedSeries as $Key => $SerieName )
+        {
+         $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+         if ( $Value != VOID )
+          $Factor = $Factor + abs($Value);
+        }
+
+       if ( $Factor != 0 )
+        {
+         $Factor = $NormalizationFactor / $Factor;
+
+         foreach ($SelectedSeries as $Key => $SerieName )
+          {
+           $Value = $this->Data["Series"][$SerieName]["Data"][$i];
+
+           if ( $Value != VOID && $Factor != $NormalizationFactor )
+            $this->Data["Series"][$SerieName]["Data"][$i] = round(abs($Value)*$Factor,$Round);
+           elseif ( $Value == VOID || $Value == 0 )
+            $this->Data["Series"][$SerieName]["Data"][$i] = VOID;
+           elseif ( $Factor == $NormalizationFactor )
+            $this->Data["Series"][$SerieName]["Data"][$i] = $NormalizationFactor;
+          }
+        }
+      }
+
+     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="")
+    {
+     $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)
+      {
+       $HeaderParsed = FALSE; $SerieNames = "";
+       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 )
+            {
+             foreach($Values as $Key => $Name) { if ( !in_array($Key,$SkipColumns) ) { $SerieNames[$Key] = $Name; } }
+             $HeaderParsed = TRUE;
+            }
+           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]); } }
+            }
+          }
+        }
+       fclose($Handle);
+      }
+    }
+
+   /* Create a dataset based on a formula */
+   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;
+     $AutoDescription	= isset($Options["AutoDescription"]) ? $Options["AutoDescription"] : FALSE;
+     $RecordAbscissa	= isset($Options["RecordAbscissa"]) ? $Options["RecordAbscissa"] : FALSE;
+     $AbscissaSerie	= isset($Options["AbscissaSerie"]) ? $Options["AbscissaSerie"] : "Abscissa";
+
+     if ( $Formula == "" ) { return(0); }
+
+     $Result = ""; $Abscissa = "";
+     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); }
+       if ( $return == "NAN" ) { $return = VOID; }
+       if ( $return == "INF" ) { $return = VOID; }
+       if ( $return == "-INF" ) { $return = VOID; }
+
+       $Abscissa[] = $i;
+       $Result[]   = $return;
+      }
+
+     $this->addPoints($Result,$SerieName);
+     if ( $AutoDescription ) { $this->setSerieDescription($SerieName,$Formula); }
+     if ( $RecordAbscissa ) { $this->addPoints($Abscissa,$AbscissaSerie); }
+    }
+
+   function negateValues($Series)
+    {
+     if ( !is_array($Series) ) { $Series = $this->convertToArray($Series); }
+     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; } }
+         $this->Data["Series"][$SerieName]["Data"] = $Data;
+
+         $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"]));
+        }
+      }
+    }
+
+   /* Return the data & configuration of the series */
+   function getData()
+    { return($this->Data); }
+
+   /* Save a palette element */
+   function savePalette($ID,$Color)
+    { $this->Palette[$ID] = $Color; }
+
+   /* Return the palette of the series */
+   function getPalette()
+    { return($this->Palette); }
+
+   /* Called by the scaling algorithm to save the config */
+   function saveAxisConfig($Axis) { $this->Data["Axis"]=$Axis; }
+
+   /* Save the Y Margin if set */
+   function saveYMargin($Value) { $this->Data["YMargin"]=$Value; }
+
+   /* Save extended configuration to the pData object */
+   function saveExtendedData($Tag,$Values) { $this->Data["Extended"][$Tag]=$Values; }
+
+   /* Called by the scaling algorithm to save the orientation of the scale */
+   function saveOrientation($Orientation) { $this->Data["Orientation"]=$Orientation; }
+
+   /* Convert a string to a single elements array */
+   function convertToArray($Value)
+    { $Values = ""; $Values[] = $Value; return($Values); }
+
+   /* Class string wrapper */
+   function __toString()
+    { return("pData object."); }
+
+   function left($value,$NbChar)	{ return substr($value,0,$NbChar); }  
+   function right($value,$NbChar)	{ return substr($value,strlen($value)-$NbChar,$NbChar); }  
+   function mid($value,$Depart,$NbChar)	{ return substr($value,$Depart-1,$NbChar); }  
+  }
+?>
diff --git a/libs/pChart2.1.3/class/pDraw.class.php b/libs/pChart2.1.3/class/pDraw.class.php
new file mode 100644
index 0000000000..8906d7d5d0
--- /dev/null
+++ b/libs/pChart2.1.3/class/pDraw.class.php
@@ -0,0 +1,6193 @@
+<?php
+ /*
+     pDraw - class extension with drawing methods
+
+     Version     : 2.1.3
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 09/09/11
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ define("DIRECTION_VERTICAL"		, 690001);
+ define("DIRECTION_HORIZONTAL"		, 690002);
+
+ define("SCALE_POS_LEFTRIGHT"		, 690101);
+ define("SCALE_POS_TOPBOTTOM"		, 690102);
+
+ define("SCALE_MODE_FLOATING"		, 690201);
+ define("SCALE_MODE_START0"		, 690202);
+ define("SCALE_MODE_ADDALL"		, 690203);
+ define("SCALE_MODE_ADDALL_START0"	, 690204);
+ define("SCALE_MODE_MANUAL"		, 690205);
+
+ define("SCALE_SKIP_NONE"		, 690301);
+ define("SCALE_SKIP_SAME"		, 690302);
+ define("SCALE_SKIP_NUMBERS"		, 690303);
+
+ define("TEXT_ALIGN_TOPLEFT"		, 690401);
+ define("TEXT_ALIGN_TOPMIDDLE"		, 690402);
+ define("TEXT_ALIGN_TOPRIGHT"		, 690403);
+ define("TEXT_ALIGN_MIDDLELEFT"		, 690404);
+ define("TEXT_ALIGN_MIDDLEMIDDLE"	, 690405);
+ define("TEXT_ALIGN_MIDDLERIGHT"	, 690406);
+ define("TEXT_ALIGN_BOTTOMLEFT"		, 690407);
+ define("TEXT_ALIGN_BOTTOMMIDDLE"	, 690408);
+ define("TEXT_ALIGN_BOTTOMRIGHT"	, 690409);
+
+ define("POSITION_TOP"                  , 690501);
+ define("POSITION_BOTTOM"               , 690502);
+
+ define("LABEL_POS_LEFT"		, 690601);
+ define("LABEL_POS_CENTER"		, 690602);
+ define("LABEL_POS_RIGHT"		, 690603);
+ define("LABEL_POS_TOP"			, 690604);
+ define("LABEL_POS_BOTTOM"		, 690605);
+ define("LABEL_POS_INSIDE"		, 690606);
+ define("LABEL_POS_OUTSIDE"		, 690607);
+
+ define("ORIENTATION_HORIZONTAL"	, 690701);
+ define("ORIENTATION_VERTICAL"		, 690702);
+ define("ORIENTATION_AUTO"		, 690703);
+
+ define("LEGEND_NOBORDER"		, 690800);
+ define("LEGEND_BOX"			, 690801);
+ define("LEGEND_ROUND"			, 690802);
+
+ define("LEGEND_VERTICAL"		, 690901);
+ define("LEGEND_HORIZONTAL"		, 690902);
+
+ define("LEGEND_FAMILY_BOX"		, 691051);
+ define("LEGEND_FAMILY_CIRCLE"		, 691052);
+ define("LEGEND_FAMILY_LINE"		, 691053);
+
+ define("DISPLAY_AUTO"			, 691001);
+ define("DISPLAY_MANUAL"		, 691002);
+
+ define("LABELING_ALL"			, 691011);
+ define("LABELING_DIFFERENT"		, 691012);
+
+ define("BOUND_MIN"			, 691021);
+ define("BOUND_MAX"			, 691022);
+ define("BOUND_BOTH"			, 691023);
+
+ define("BOUND_LABEL_POS_TOP"		, 691031);
+ define("BOUND_LABEL_POS_BOTTOM"	, 691032);
+ define("BOUND_LABEL_POS_AUTO"		, 691033);
+
+ define("CAPTION_LEFT_TOP"		, 691041);
+ define("CAPTION_RIGHT_BOTTOM"		, 691042);
+
+ define("GRADIENT_SIMPLE"		, 691051);
+ define("GRADIENT_EFFECT_CAN"		, 691052);
+
+ define("LABEL_TITLE_NOBACKGROUND"	, 691061);
+ define("LABEL_TITLE_BACKGROUND"	, 691062);
+
+ define("LABEL_POINT_NONE"		, 691071);
+ define("LABEL_POINT_CIRCLE"		, 691072);
+ define("LABEL_POINT_BOX"		, 691073);
+
+ define("ZONE_NAME_ANGLE_AUTO"		, 691081);
+
+ define("PI"		, 3.14159265);
+ define("ALL"		, 69);
+ define("NONE"		, 31);
+ define("AUTO"		, 690000);
+ define("OUT_OF_SIGHT"	, -10000000000000);
+
+ class pDraw
+  {
+   /* Returns the number of drawable series */
+   function countDrawableSeries()
+    {
+     $Results = 0;
+     $Data = $this->DataSet->getData();
+
+     foreach($Data["Series"] as $SerieName => $Serie)
+      { if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] ) { $Results++; } }
+
+     return($Results);
+    }
+
+   /* Fix box coordinates */
+   function fixBoxCoordinates($Xa,$Ya,$Xb,$Yb)
+    {
+     $X1 = min($Xa,$Xb); $Y1 = min($Ya,$Yb);
+     $X2 = max($Xa,$Xb); $Y2 = max($Ya,$Yb);
+
+     return(array($X1,$Y1,$X2,$Y2));
+    }
+
+   /* Draw a polygon */
+   function drawPolygon($Points,$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;
+     $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
+     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+     $BorderAlpha 	= isset($Format["Alpha"]) ? $Format["Alpha"] : $Alpha / 2;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $SkipX		= isset($Format["SkipX"]) ? $Format["SkipX"] : OUT_OF_SIGHT;
+     $SkipY		= isset($Format["SkipY"]) ? $Format["SkipY"] : OUT_OF_SIGHT;
+
+     /* Calling the ImageFilledPolygon() function over the $Points array will round it */ 	
+     $Backup = $Points;
+
+     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+     if ( $SkipX != OUT_OF_SIGHT ) { $SkipX = floor($SkipX); }
+     if ( $SkipY != OUT_OF_SIGHT ) { $SkipY = floor($SkipY); }
+
+     $RestoreShadow = $this->Shadow;
+     if ( !$NoFill )
+      {
+       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+         $this->Shadow = FALSE;
+         for($i=0;$i<=count($Points)-1;$i=$i+2)
+          { $Shadow[] = $Points[$i] + $this->ShadowX; $Shadow[] = $Points[$i+1] + $this->ShadowY; }
+         $this->drawPolygon($Shadow,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"NoBorder"=>TRUE));
+        }
+
+       $FillColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+
+       if ( count($Points) >= 6 )
+        { ImageFilledPolygon($this->Picture,$Points,count($Points)/2,$FillColor); }
+      }
+
+     if ( !$NoBorder )
+      {
+       $Points = $Backup;
+
+       if ( $NoFill )
+        $BorderSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+       else
+        $BorderSettings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+
+       for($i=0;$i<=count($Points)-1;$i=$i+2)
+        {
+         if ( isset($Points[$i+2]) )
+          {
+           if ( !($Points[$i] == $Points[$i+2] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[$i+3] && $Points[$i+1] == $SkipY ) )
+            $this->drawLine($Points[$i],$Points[$i+1],$Points[$i+2],$Points[$i+3],$BorderSettings);
+          }
+         else
+          {
+           if ( !($Points[$i] == $Points[0] && $Points[$i] == $SkipX ) && !($Points[$i+1] == $Points[1] && $Points[$i+1] == $SkipY ) )
+            $this->drawLine($Points[$i],$Points[$i+1],$Points[0],$Points[1],$BorderSettings);
+          }
+        }
+      }
+
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Apply AALias correction to the rounded box boundaries */
+   function offsetCorrection($Value,$Mode)
+    {
+     $Value = round($Value,1);
+
+     if ( $Value == 0 && $Mode == 1 ) { return(.9); }
+     if ( $Value == 0 ) { return(0); }
+
+     if ( $Mode == 1) 
+      { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.9); }; if ( $Value == .2 ) { return(.8); }; if ( $Value == .3 ) { return(.8); }; if ( $Value == .4 ) { return(.7); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.6); }; if ( $Value == .9 ) { return(.9); }; }
+
+     if ( $Mode == 2) 
+      { if ( $Value == 1 ) { return(.9); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.5); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.8); }; if ( $Value == .9 ) { return(.9); }; }
+
+     if ( $Mode == 3) 
+      { if ( $Value == 1 ) { return(.1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.4); }; if ( $Value == .5 ) { return(.9); }; if ( $Value == .6 ) { return(.6); }; if ( $Value == .7 ) { return(.7); }; if ( $Value == .8 ) { return(.4); }; if ( $Value == .9 ) { return(.5); }; }
+
+     if ( $Mode == 4) 
+      { if ( $Value == 1 ) { return(-1); }; if ( $Value == .1 ) { return(.1); }; if ( $Value == .2 ) { return(.2); }; if ( $Value == .3 ) { return(.3); }; if ( $Value == .4 ) { return(.1); }; if ( $Value == .5 ) { return(-.1); }; if ( $Value == .6 ) { return(.8); }; if ( $Value == .7 ) { return(.1); }; if ( $Value == .8 ) { return(.1); }; if ( $Value == .9 ) { return(.1); }; }
+    }
+
+   /* Draw a rectangle with rounded corners */
+   function drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,$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;
+
+     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+
+     if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1))/2); }
+     if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1))/2); }
+
+     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
+
+     if ( $Radius <= 0 ) { $this->drawRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
+
+     if ( $this->Antialias )
+      {
+       $this->drawLine($X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
+       $this->drawLine($X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
+       $this->drawLine($X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
+       $this->drawLine($X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
+      }
+     else
+      {
+       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+       imageline($this->Picture,$X1+$Radius,$Y1,$X2-$Radius,$Y1,$Color);
+       imageline($this->Picture,$X2,$Y1+$Radius,$X2,$Y2-$Radius,$Color);
+       imageline($this->Picture,$X2-$Radius,$Y2,$X1+$Radius,$Y2,$Color);
+       imageline($this->Picture,$X1,$Y1+$Radius,$X1,$Y2-$Radius,$Color);
+      }
+
+     $Step = 360 / (2 * PI * $Radius);
+     for($i=0;$i<=90;$i=$i+$Step)
+      {
+       $X = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+       $Y = sin(($i+180)*PI/180) * $Radius + $Y1 + $Radius;
+       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+       $X = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+       $Y = sin(($i+90)*PI/180) * $Radius + $Y2 - $Radius;
+       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+       $X = cos($i*PI/180) * $Radius + $X2 - $Radius;
+       $Y = sin($i*PI/180) * $Radius + $Y2 - $Radius;
+       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+       $X = cos(($i+270)*PI/180) * $Radius + $X2 - $Radius;
+       $Y = sin(($i+270)*PI/180) * $Radius + $Y1 + $Radius;
+       $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+      }
+    }
+
+   /* Draw a rectangle with rounded corners */
+   function drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$Radius,$Format="")
+    {
+     $R			= isset($Format["R"]) ? $Format["R"] : 0;
+     $G			= isset($Format["G"]) ? $Format["G"] : 0;
+     $B			= isset($Format["B"]) ? $Format["B"] : 0;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+
+     /* Temporary fix for AA issue */
+     $Y1 = floor($Y1); $Y2 = floor($Y2); $X1 = floor($X1); $X2 = floor($X2);
+
+     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+     if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
+
+     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+
+     if ( $X2 - $X1 < $Radius*2 ) { $Radius = floor((($X2-$X1))/4); }
+     if ( $Y2 - $Y1 < $Radius*2 ) { $Radius = floor((($Y2-$Y1))/4); }
+
+     $RestoreShadow = $this->Shadow;
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+      {
+       $this->Shadow = FALSE;
+       $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+      }
+
+     $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE);
+
+     if ( $Radius <= 0 ) { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color); return(0); }
+
+     $YTop    = $Y1+$Radius;
+     $YBottom = $Y2-$Radius;
+
+     $Step = 360 / (2 * PI * $Radius);
+     $Positions = ""; $Radius--; $MinY = ""; $MaxY = "";
+     for($i=0;$i<=90;$i=$i+$Step)
+      {
+       $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+       $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
+       $Yp  = floor(sin(($i+180)*PI/180) * $Radius + $YTop);
+       if ( $MinY == "" || $Yp > $MinY ) { $MinY = $Yp; }
+
+       if ( $Xp1 <= floor($X1) )  { $Xp1++; }
+       if ( $Xp2 >= floor($X2) )  { $Xp2--; }
+       $Xp1++;
+
+       if ( !isset($Positions[$Yp]) )
+        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
+       else
+        { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
+
+       $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+       $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
+       $Yp  = floor(sin(($i+90)*PI/180) * $Radius + $YBottom);
+       if ( $MaxY == "" || $Yp < $MaxY ) { $MaxY = $Yp; }
+
+       if ( $Xp1 <= floor($X1) ) { $Xp1++; }
+       if ( $Xp2 >= floor($X2) ) { $Xp2--; }
+       $Xp1++;
+
+       if ( !isset($Positions[$Yp]) )
+        { $Positions[$Yp]["X1"] = $Xp1; $Positions[$Yp]["X2"] = $Xp2; }
+       else
+        { $Positions[$Yp]["X1"] = ($Positions[$Yp]["X1"]+$Xp1)/2; $Positions[$Yp]["X2"] = ($Positions[$Yp]["X2"]+$Xp2)/2; }
+      }
+
+     $ManualColor  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+     foreach($Positions as $Yp => $Bounds)
+      {
+       $X1 = $Bounds["X1"]; $X1Dec = $this->getFirstDecimal($X1); if ( $X1Dec != 0 ) { $X1 = floor($X1)+1; }
+       $X2 = $Bounds["X2"]; $X2Dec = $this->getFirstDecimal($X2); if ( $X2Dec != 0 ) { $X2 = floor($X2)-1; }
+       imageline($this->Picture,$X1,$Yp,$X2,$Yp,$ManualColor);
+      }
+     $this->drawFilledRectangle($X1,$MinY+1,floor($X2),$MaxY-1,$Color);
+
+     $Radius++;
+     $this->drawRoundedRectangle($X1,$Y1,$X2+1,$Y2-1,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Draw a rectangle with rounded corners */
+   function drawRoundedFilledRectangle_deprecated($X1,$Y1,$X2,$Y2,$Radius,$Format="")
+    {
+     $R			= isset($Format["R"]) ? $Format["R"] : 0;
+     $G			= isset($Format["G"]) ? $Format["G"] : 0;
+     $B			= isset($Format["B"]) ? $Format["B"] : 0;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+
+     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+     if ( $BorderR == -1 ) { $BorderR = $R; $BorderG = $G; $BorderB = $B; }
+
+     list($X1,$Y1,$X2,$Y2) = $this->fixBoxCoordinates($X1,$Y1,$X2,$Y2);
+
+     if ( $X2 - $X1 < $Radius ) { $Radius = floor((($X2-$X1)+2)/2); }
+     if ( $Y2 - $Y1 < $Radius ) { $Radius = floor((($Y2-$Y1)+2)/2); }
+
+     $RestoreShadow = $this->Shadow;
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+      {
+       $this->Shadow = FALSE;
+       $this->drawRoundedFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+      }
+
+     if ( $this->getFirstDecimal($X2) >= 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+     if ( $this->getFirstDecimal($X1) <= 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+
+     if ( !$this->Antialias ) { $XOffset1 = 1; $XOffset2 = 1; }
+
+     $YTop    = floor($Y1+$Radius);
+     $YBottom = floor($Y2-$Radius);
+
+     $this->drawFilledRectangle($X1-$XOffset1,$YTop,$X2+$XOffset2,$YBottom,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"NoBorder"=>TRUE));
+
+     $Step = 360 / (2 * PI * $Radius);
+     $Color  = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+     $Color2 = $this->allocateColor($this->Picture,255,0,0,$Alpha);
+     $Drawn = "";
+
+     if ( $Alpha < 100 )  { $Drawn[$YTop] = FALSE; }
+     if ( $Alpha < 100 )  { $Drawn[$YBottom] = TRUE; }
+     
+     for($i=0;$i<=90;$i=$i+$Step)
+      {
+       $Xp1 = cos(($i+180)*PI/180) * $Radius + $X1 + $Radius;
+       $Xp2 = cos(((90-$i)+270)*PI/180) * $Radius + $X2 - $Radius;
+       $Yp  = sin(($i+180)*PI/180) * $Radius + $YTop;
+
+       if ( $this->getFirstDecimal($Xp1) > 5 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+       if ( $this->getFirstDecimal($Xp2) > 5 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+       if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
+
+       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
+        imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
+
+       $Drawn[$Yp+$YOffset] = $Xp2;
+
+       $Xp1 = cos(($i+90)*PI/180) * $Radius + $X1 + $Radius;
+       $Xp2 = cos((90-$i)*PI/180) * $Radius + $X2 - $Radius;
+       $Yp  = sin(($i+90)*PI/180) * $Radius + $YBottom;
+
+       if ( $this->getFirstDecimal($Xp1) > 7 )  { $XOffset1 = 1; } else { $XOffset1 = 0; }
+       if ( $this->getFirstDecimal($Xp2) > 7 )  { $XOffset2 = 1; } else { $XOffset2 = 0; }
+       if ( $this->getFirstDecimal($Yp) > 5 )  { $YOffset = 1; } else { $YOffset = 0; }
+
+       if ( !isset($Drawn[$Yp+$YOffset]) || $Alpha == 100 )
+        imageline($this->Picture,$Xp1+$XOffset1,$Yp+$YOffset,$Xp2+$XOffset2,$Yp+$YOffset,$Color);
+
+       $Drawn[$Yp+$YOffset] = $Xp2;
+      }
+
+     $this->drawRoundedRectangle($X1,$Y1,$X2,$Y2,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Draw a rectangle */
+   function drawRectangle($X1,$Y1,$X2,$Y2,$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;
+     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+     $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
+
+     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+     if ( $this->Antialias )
+      {
+       if ( $NoAngle )
+        {
+         $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+         $this->drawLine($X2,$Y1+1,$X2,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+         $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+         $this->drawLine($X1,$Y1+1,$X1,$Y2-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        }
+       else
+        {
+         $this->drawLine($X1+1,$Y1,$X2-1,$Y1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+         $this->drawLine($X2,$Y1,$X2,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+         $this->drawLine($X2-1,$Y2,$X1+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+         $this->drawLine($X1,$Y1,$X1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+        }
+      }
+     else
+      {
+       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+       imagerectangle($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
+      }
+    }
+
+   /* Draw a filled rectangle */
+   function drawFilledRectangle($X1,$Y1,$X2,$Y2,$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;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+     $NoAngle		= isset($Format["NoAngle"]) ? $Format["NoAngle"] : NULL;
+     $Dash		= isset($Format["Dash"]) ? $Format["Dash"] : FALSE;
+     $DashStep		= isset($Format["DashStep"]) ? $Format["DashStep"] : 4;
+     $DashR		= isset($Format["DashR"]) ? $Format["DashR"] : 0;
+     $DashG		= isset($Format["DashG"]) ? $Format["DashG"] : 0;
+     $DashB		= isset($Format["DashB"]) ? $Format["DashB"] : 0;
+     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+
+     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+     $RestoreShadow = $this->Shadow;
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+      {
+       $this->Shadow = FALSE;
+       $this->drawFilledRectangle($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
+      }
+
+     $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+     if ( $NoAngle )
+      {
+       imagefilledrectangle($this->Picture,ceil($X1)+1,ceil($Y1),floor($X2)-1,floor($Y2),$Color);
+       imageline($this->Picture,ceil($X1),ceil($Y1)+1,ceil($X1),floor($Y2)-1,$Color);
+       imageline($this->Picture,floor($X2),ceil($Y1)+1,floor($X2),floor($Y2)-1,$Color);
+      }
+     else
+      imagefilledrectangle($this->Picture,ceil($X1),ceil($Y1),floor($X2),floor($Y2),$Color);
+
+     if ( $Dash )
+      {
+       if ( $BorderR != -1 ) { $iX1=$X1+1; $iY1=$Y1+1; $iX2=$X2-1; $iY2=$Y2-1; } else { $iX1=$X1; $iY1=$Y1; $iX2=$X2; $iY2=$Y2; }
+
+       $Color = $this->allocateColor($this->Picture,$DashR,$DashG,$DashB,$Alpha);
+       $Y=$iY1-$DashStep;
+       for($X=$iX1; $X<=$iX2+($iY2-$iY1); $X=$X+$DashStep)
+        {
+         $Y=$Y+$DashStep;
+         if ( $X > $iX2 ) { $Xa = $X-($X-$iX2); $Ya = $iY1+($X-$iX2); } else { $Xa = $X; $Ya = $iY1; }
+         if ( $Y > $iY2 ) { $Xb = $iX1+($Y-$iY2); $Yb = $Y-($Y-$iY2); } else { $Xb = $iX1; $Yb = $Y; }
+         imageline($this->Picture,$Xa,$Ya,$Xb,$Yb,$Color);
+        }
+      }
+
+     if ( $this->Antialias && !$NoBorder )
+      {
+       if ( $X1 < ceil($X1) )
+        {
+         $AlphaA = $Alpha * (ceil($X1) - $X1);
+         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+         imageline($this->Picture,ceil($X1)-1,ceil($Y1),ceil($X1)-1,floor($Y2),$Color);
+        }
+
+       if ( $Y1 < ceil($Y1) )
+        {
+         $AlphaA = $Alpha * (ceil($Y1) - $Y1);
+         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+         imageline($this->Picture,ceil($X1),ceil($Y1)-1,floor($X2),ceil($Y1)-1,$Color);
+        }
+
+       if ( $X2 > floor($X2) )
+        {
+         $AlphaA = $Alpha * (.5-($X2 - floor($X2)));
+         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+         imageline($this->Picture,floor($X2)+1,ceil($Y1),floor($X2)+1,floor($Y2),$Color);
+        } 
+
+       if ( $Y2 > floor($Y2) )
+        {
+         $AlphaA = $Alpha * (.5-($Y2 - floor($Y2)));
+         $Color = $this->allocateColor($this->Picture,$R,$G,$B,$AlphaA);
+         imageline($this->Picture,ceil($X1),floor($Y2)+1,floor($X2),floor($Y2)+1,$Color);
+        }
+      }
+
+     if ( $BorderR != -1 )
+      $this->drawRectangle($X1,$Y1,$X2,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks,"NoAngle"=>$NoAngle));
+
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Draw a rectangular marker of the specified size */
+   function drawRectangleMarker($X,$Y,$Format="")
+    {
+     $Size = isset($Format["Size"]) ? $Format["Size"] : 4;
+
+     $HalfSize = floor($Size/2);
+     $this->drawFilledRectangle($X-$HalfSize,$Y-$HalfSize,$X+$HalfSize,$Y+$HalfSize,$Format);
+    }
+
+   /* Drawn a spline based on the bezier function */
+   function drawSpline($Coordinates,$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;
+     $Force	= isset($Format["Force"]) ? $Format["Force"] : 30;
+     $Forces	= isset($Format["Forces"]) ? $Format["Forces"] : NULL;
+     $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
+     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+     $PathOnly	= isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
+     $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+
+     $Cpt = NULL; $Mode = NULL; $Result = "";
+     for($i=1;$i<=count($Coordinates)-1;$i++)
+      {
+       $X1 = $Coordinates[$i-1][0]; $Y1 = $Coordinates[$i-1][1];
+       $X2 = $Coordinates[$i][0];   $Y2 = $Coordinates[$i][1];
+
+       if ( $Forces != NULL ) { $Force = $Forces[$i]; }
+
+       /* First segment */
+       if ( $i == 1 )
+        { $Xv1 = $X1; $Yv1 = $Y1; }
+       else
+        {
+         $Angle1 = $this->getAngle($XLast,$YLast,$X1,$Y1);
+         $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
+         $XOff = cos($Angle2 * PI / 180) * $Force + $X1;
+         $YOff = sin($Angle2 * PI / 180) * $Force + $Y1;
+
+         $Xv1 = cos($Angle1 * PI / 180) * $Force + $XOff;
+         $Yv1 = sin($Angle1 * PI / 180) * $Force + $YOff;
+        }
+
+       /* Last segment */
+       if ( $i == count($Coordinates)-1 )
+        { $Xv2 = $X2; $Yv2 = $Y2; }
+       else
+        {
+         $Angle1 = $this->getAngle($X2,$Y2,$Coordinates[$i+1][0],$Coordinates[$i+1][1]);
+         $Angle2 = $this->getAngle($X1,$Y1,$X2,$Y2);
+         $XOff = cos(($Angle2+180) * PI / 180) * $Force + $X2;
+         $YOff = sin(($Angle2+180) * PI / 180) * $Force + $Y2;
+
+         $Xv2 = cos(($Angle1+180) * PI / 180) * $Force + $XOff;
+         $Yv2 = sin(($Angle1+180) * PI / 180) * $Force + $YOff;
+        }
+
+       $Path = $this->drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$Format);
+       if ($PathOnly) { $Result[] = $Path; }
+
+       $XLast = $X1; $YLast = $Y1;
+      }
+
+     return($Result);
+    }
+
+   /* Draw a bezier curve with two controls points */
+   function drawBezier($X1,$Y1,$X2,$Y2,$Xv1,$Yv1,$Xv2,$Yv2,$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;
+     $ShowC	= isset($Format["ShowControl"]) ? $Format["ShowControl"] : FALSE;
+     $Segments	= isset($Format["Segments"]) ? $Format["Segments"] : NULL;
+     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+     $NoDraw    = isset($Format["NoDraw"]) ? $Format["NoDraw"] : FALSE;
+     $PathOnly  = isset($Format["PathOnly"]) ? $Format["PathOnly"] : FALSE;
+     $Weight    = isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+     $DrawArrow		= isset($Format["DrawArrow"]) ? $Format["DrawArrow"] : FALSE;
+     $ArrowSize		= isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 10;
+     $ArrowRatio	= isset($Format["ArrowRatio"]) ? $Format["ArrowRatio"] : .5;
+     $ArrowTwoHeads	= isset($Format["ArrowTwoHeads"]) ? $Format["ArrowTwoHeads"] : FALSE;
+
+     if ( $Segments == NULL )
+      {
+       $Length    = $this->getLength($X1,$Y1,$X2,$Y2);
+       $Precision = ($Length*125)/1000;
+      }
+     else
+      $Precision = $Segments;
+
+     $P[0]["X"] = $X1;  $P[0]["Y"] = $Y1;
+     $P[1]["X"] = $Xv1; $P[1]["Y"] = $Yv1;
+     $P[2]["X"] = $Xv2; $P[2]["Y"] = $Yv2;
+     $P[3]["X"] = $X2;  $P[3]["Y"] = $Y2;
+
+     /* Compute the bezier points */
+     $Q = ""; $ID = 0; $Path = "";
+     for($i=0;$i<=$Precision;$i=$i+1)
+      {
+       $u = $i / $Precision;
+
+       $C    = "";
+       $C[0] = (1 - $u) * (1 - $u) * (1 - $u);
+       $C[1] = ($u * 3) * (1 - $u) * (1 - $u);
+       $C[2] = 3 * $u * $u * (1 - $u);
+       $C[3] = $u * $u * $u;
+
+       for($j=0;$j<=3;$j++)
+        {
+         if ( !isset($Q[$ID]) ) { $Q[$ID] = ""; }
+         if ( !isset($Q[$ID]["X"]) ) { $Q[$ID]["X"] = 0; }
+         if ( !isset($Q[$ID]["Y"]) ) { $Q[$ID]["Y"] = 0; }
+
+         $Q[$ID]["X"] = $Q[$ID]["X"] + $P[$j]["X"] * $C[$j];
+         $Q[$ID]["Y"] = $Q[$ID]["Y"] + $P[$j]["Y"] * $C[$j];
+        }
+       $ID++;
+      }        
+     $Q[$ID]["X"] = $X2; $Q[$ID]["Y"] = $Y2;
+
+     if ( !$NoDraw )
+      {
+       /* Display the control points */
+       if ( $ShowC && !$PathOnly )
+        {
+         $Xv1 = floor($Xv1); $Yv1 = floor($Yv1); $Xv2 = floor($Xv2); $Yv2 = floor($Yv2);
+
+         $this->drawLine($X1,$Y1,$X2,$Y2,array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>30));
+
+         $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+         $this->drawRectangleMarker($Xv1,$Yv1,$MyMarkerSettings);
+         $this->drawText($Xv1+4,$Yv1,"v1");
+         $MyMarkerSettings = array("R"=>0,"G"=>0,"B"=>255,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+         $this->drawRectangleMarker($Xv2,$Yv2,$MyMarkerSettings);
+         $this->drawText($Xv2+4,$Yv2,"v2");
+        }
+
+       /* Draw the bezier */
+       $LastX = NULL; $LastY = NULL; $Cpt = NULL; $Mode = NULL; $ArrowS = NULL;
+       foreach ($Q as $Key => $Point)
+        {
+         $X = $Point["X"]; $Y = $Point["Y"];
+
+         /* Get the first segment */
+         if ( $ArrowS == NULL && $LastX != NULL && $LastY != NULL )
+          { $ArrowS["X2"] = $LastX; $ArrowS["Y2"] = $LastY; $ArrowS["X1"] = $X; $ArrowS["Y1"] = $Y; }
+
+         if ( $LastX != NULL && $LastY != NULL && !$PathOnly)
+          list($Cpt,$Mode) = $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Cpt"=>$Cpt,"Mode"=>$Mode,"Weight"=>$Weight));
+
+         /* Get the last segment */
+         $ArrowE["X1"] = $LastX; $ArrowE["Y1"] = $LastY; $ArrowE["X2"] = $X; $ArrowE["Y2"] = $Y;
+
+         $LastX = $X; $LastY = $Y;
+        }
+
+       if ( $DrawArrow && !$PathOnly )
+        {
+         $ArrowSettings = array("FillR"=>$R,"FillG"=>$G,"FillB"=>$B,"Alpha"=>$Alpha,"Size"=>$ArrowSize,"Ratio"=>$ArrowRatio);
+         if ( $ArrowTwoHeads )
+          $this->drawArrow($ArrowS["X1"],$ArrowS["Y1"],$ArrowS["X2"],$ArrowS["Y2"],$ArrowSettings);
+
+         $this->drawArrow($ArrowE["X1"],$ArrowE["Y1"],$ArrowE["X2"],$ArrowE["Y2"],$ArrowSettings);
+        }
+      }
+     return($Q);
+    }
+
+   /* Draw a line between two points */
+   function drawLine($X1,$Y1,$X2,$Y2,$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;
+     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+     $Cpt	= isset($Format["Cpt"]) ? $Format["Cpt"] : 1;
+     $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : 1;
+     $Weight	= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+     $Threshold	= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+     if ( $this->Antialias == FALSE && $Ticks == NULL )
+      {
+       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+         $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+         imageline($this->Picture,$X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,$ShadowColor);
+        }
+
+       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+       imageline($this->Picture,$X1,$Y1,$X2,$Y2,$Color);
+       return(0);
+      }
+
+     $Distance = sqrt(($X2-$X1)*($X2-$X1)+($Y2-$Y1)*($Y2-$Y1));  
+     if ( $Distance == 0 ) { return(-1); }
+
+     /* Derivative algorithm for overweighted lines, re-route to polygons primitives */
+     if ( $Weight != NULL )
+      {
+       $Angle        = $this->getAngle($X1,$Y1,$X2,$Y2);
+       $PolySettings = array ("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderAlpha"=>$Alpha);
+
+       if ( $Ticks == NULL )
+        {
+         $Points   = ""; 
+         $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y1;
+         $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X1; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y1;
+         $Points[] = cos(deg2rad($Angle+90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Y2;
+         $Points[] = cos(deg2rad($Angle-90)) * $Weight + $X2; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Y2;
+
+         $this->drawPolygon($Points,$PolySettings);
+        }
+       else
+        {
+         for($i=0;$i<=$Distance;$i=$i+$Ticks*2)
+          {
+           $Xa = (($X2-$X1)/$Distance) * $i + $X1; $Ya = (($Y2-$Y1)/$Distance) * $i + $Y1;
+           $Xb = (($X2-$X1)/$Distance) * ($i+$Ticks) + $X1; $Yb = (($Y2-$Y1)/$Distance) * ($i+$Ticks) + $Y1;
+
+           $Points   = ""; 
+           $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle-90)) * $Weight + $Ya;
+           $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xa; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Ya;
+           $Points[] = cos(deg2rad($Angle+90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle+90)) * $Weight + $Yb;
+           $Points[] = cos(deg2rad($Angle-90)) * $Weight + $Xb; $Points[] = sin(deg2rad($Angle-90)) * $Weight 	+ $Yb;
+
+           $this->drawPolygon($Points,$PolySettings);
+          }
+        }
+
+       return(1);
+      }
+
+     $XStep = ($X2-$X1) / $Distance;
+     $YStep = ($Y2-$Y1) / $Distance;
+
+     for($i=0;$i<=$Distance;$i++)
+      {
+       $X = $i * $XStep + $X1;
+       $Y = $i * $YStep + $Y1;
+
+       $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+
+       if ( $Threshold != NULL )
+        {
+         foreach($Threshold as $Key => $Parameters)
+          {
+           if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
+            {
+             if ( isset($Parameters["R"]) ) { $RT = $Parameters["R"]; } else { $RT = 0; }
+             if ( isset($Parameters["G"]) ) { $GT = $Parameters["G"]; } else { $GT = 0; }
+             if ( isset($Parameters["B"]) ) { $BT = $Parameters["B"]; } else { $BT = 0; }
+             if ( isset($Parameters["Alpha"]) ) { $AlphaT = $Parameters["Alpha"]; } else { $AlphaT = 0; }
+             $Color = array("R"=>$RT,"G"=>$GT,"B"=>$BT,"Alpha"=>$AlphaT);
+            }
+          }
+        }
+
+       if ( $Ticks != NULL )
+        {
+         if ( $Cpt % $Ticks == 0 )
+          { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
+
+         if ( $Mode == 1 )
+          $this->drawAntialiasPixel($X,$Y,$Color);
+
+         $Cpt++;
+        }
+       else
+        $this->drawAntialiasPixel($X,$Y,$Color);
+      }
+
+     return(array($Cpt,$Mode));
+    }
+
+   /* Draw a circle */
+   function drawCircle($Xc,$Yc,$Height,$Width,$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;
+     $Ticks = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+
+     $Height	= abs($Height);
+     $Width	= abs($Width);
+
+     if ( $Height == 0 ) { $Height = 1; }
+     if ( $Width == 0 )  { $Width = 1; }
+     $Xc = floor($Xc); $Yc = floor($Yc);
+
+     $RestoreShadow = $this->Shadow;
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+      {
+       $this->Shadow = FALSE;
+       $this->drawCircle($Xc+$this->ShadowX,$Yc+$this->ShadowY,$Height,$Width,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
+      }
+
+     if ( $Width == 0 ) { $Width = $Height; }
+     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+     $Step = 360 / (2 * PI * max($Width,$Height));
+     $Mode = 1; $Cpt = 1;
+     for($i=0;$i<=360;$i=$i+$Step)
+      {
+       $X = cos($i*PI/180) * $Height + $Xc;
+       $Y = sin($i*PI/180) * $Width + $Yc;
+
+       if ( $Ticks != NULL )
+        {
+         if ( $Cpt % $Ticks == 0 )
+          { $Cpt = 0; if ( $Mode == 1 ) { $Mode = 0; } else { $Mode = 1; } }
+
+         if ( $Mode == 1 )
+          $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+         $Cpt++;
+        }
+       else
+        $this->drawAntialiasPixel($X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+      }
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Draw a filled circle */
+   function drawFilledCircle($X,$Y,$Radius,$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;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha;
+     $Ticks     	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+     $Surrounding 	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+
+     if ( $Radius == 0 ) { $Radius = 1; }
+     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+     $X = floor($X); $Y = floor($Y);
+
+     $Radius = abs($Radius);
+
+     $RestoreShadow = $this->Shadow;
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+      {
+       $this->Shadow = FALSE;
+       $this->drawFilledCircle($X+$this->ShadowX,$Y+$this->ShadowY,$Radius,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Ticks"=>$Ticks));
+      }
+
+     $this->Mask  = "";
+     $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+     for ($i=0; $i<=$Radius*2; $i++)
+      {
+       $Slice  = sqrt($Radius * $Radius - ($Radius - $i) * ($Radius - $i));
+       $XPos   = floor($Slice);
+       $YPos   = $Y + $i - $Radius;
+       $AAlias = $Slice - floor($Slice);
+
+       $this->Mask[$X-$XPos][$YPos] = TRUE;
+       $this->Mask[$X+$XPos][$YPos] = TRUE;
+       imageline($this->Picture,$X-$XPos,$YPos,$X+$XPos,$YPos,$Color);
+      }
+     if ( $this->Antialias )
+      $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+
+     $this->Mask = "";
+
+     if ( $BorderR != -1 )
+      $this->drawCircle($X,$Y,$Radius,$Radius,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$Ticks));
+
+     $this->Shadow	= $RestoreShadow;
+    }
+
+   /* Write text */
+   function drawText($X,$Y,$Text,$Format="")
+    {
+     $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
+     $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
+     $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
+     $Angle		= isset($Format["Angle"]) ? $Format["Angle"] : 0;
+     $Align		= isset($Format["Align"]) ? $Format["Align"] : TEXT_ALIGN_BOTTOMLEFT;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
+     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+     $ShowOrigine	= isset($Format["ShowOrigine"]) ? $Format["ShowOrigine"] : FALSE;
+     $TOffset		= isset($Format["TOffset"]) ? $Format["TOffset"] : 2;
+     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : FALSE;
+     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : TRUE;
+     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 6;
+     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : FALSE;
+     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 6;
+     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 255;
+     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 255;
+     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 255;
+     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
+     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+     $BoxBorderR	= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+     $BoxBorderG	= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+     $BoxBorderB	= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+     $BoxBorderAlpha	= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 50;
+     $NoShadow		= isset($Format["NoShadow"]) ? $Format["NoShadow"] : FALSE;
+
+     $Shadow = $this->Shadow;
+     if ( $NoShadow ) { $this->Shadow = FALSE; }
+
+     if ( $BoxSurrounding != "" ) { $BoxBorderR = $BoxR - $BoxSurrounding; $BoxBorderG = $BoxG - $BoxSurrounding; $BoxBorderB = $BoxB - $BoxSurrounding; $BoxBorderAlpha = $BoxAlpha; }
+
+     if ( $ShowOrigine )
+      {
+       $MyMarkerSettings = array("R"=>255,"G"=>0,"B"=>0,"BorderR"=>255,"BorderB"=>255,"BorderG"=>255,"Size"=>4);
+       $this->drawRectangleMarker($X,$Y,$MyMarkerSettings);
+      }
+
+     $TxtPos = $this->getTextBox($X,$Y,$FontName,$FontSize,$Angle,$Text);
+
+     if ( $DrawBox && ($Angle == 0 || $Angle == 90 || $Angle == 180 || $Angle == 270))
+      {
+       $T[0]["X"]=0;$T[0]["Y"]=0;$T[1]["X"]=0;$T[1]["Y"]=0;$T[2]["X"]=0;$T[2]["Y"]=0;$T[3]["X"]=0;$T[3]["Y"]=0;
+       if ( $Angle == 0 ) { $T[0]["X"]=-$TOffset;$T[0]["Y"]=$TOffset;$T[1]["X"]=$TOffset;$T[1]["Y"]=$TOffset;$T[2]["X"]=$TOffset;$T[2]["Y"]=-$TOffset;$T[3]["X"]=-$TOffset;$T[3]["Y"]=-$TOffset; }
+
+       $X1 = min($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) - $BorderOffset + 3;
+       $Y1 = min($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) - $BorderOffset;
+       $X2 = max($TxtPos[0]["X"],$TxtPos[1]["X"],$TxtPos[2]["X"],$TxtPos[3]["X"]) + $BorderOffset + 3;
+       $Y2 = max($TxtPos[0]["Y"],$TxtPos[1]["Y"],$TxtPos[2]["Y"],$TxtPos[3]["Y"]) + $BorderOffset - 3;
+
+       $X1 = $X1 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
+       $Y1 = $Y1 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
+       $X2 = $X2 - $TxtPos[$Align]["X"] + $X + $T[0]["X"];
+       $Y2 = $Y2 - $TxtPos[$Align]["Y"] + $Y + $T[0]["Y"];
+
+       $Settings = array("R"=>$BoxR,"G"=>$BoxG,"B"=>$BoxB,"Alpha"=>$BoxAlpha,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"BorderAlpha"=>$BoxBorderAlpha);
+
+       if ( $BoxRounded )
+        { $this->drawRoundedFilledRectangle($X1,$Y1,$X2,$Y2,$RoundedRadius,$Settings); }
+       else
+        { $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Settings); }
+      }
+
+     $X = $X - $TxtPos[$Align]["X"] + $X;
+     $Y = $Y - $TxtPos[$Align]["Y"] + $Y;
+
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+      {
+       $C_ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+       imagettftext($this->Picture,$FontSize,$Angle,$X+$this->ShadowX,$Y+$this->ShadowY,$C_ShadowColor,$FontName,$Text);
+      }
+
+     $C_TextColor = $this->AllocateColor($this->Picture,$R,$G,$B,$Alpha);
+     imagettftext($this->Picture,$FontSize,$Angle,$X,$Y,$C_TextColor,$FontName,$Text);
+
+     $this->Shadow = $Shadow;
+
+     return($TxtPos);
+    }
+
+   /* Draw a gradient within a defined area */
+   function drawGradientArea($X1,$Y1,$X2,$Y2,$Direction,$Format="")
+    {
+     $StartR	= isset($Format["StartR"]) ? $Format["StartR"] : 90;
+     $StartG	= isset($Format["StartG"]) ? $Format["StartG"] : 90;
+     $StartB	= isset($Format["StartB"]) ? $Format["StartB"] : 90;
+     $EndR	= isset($Format["EndR"]) ? $Format["EndR"] : 0;
+     $EndG	= isset($Format["EndG"]) ? $Format["EndG"] : 0;
+     $EndB	= isset($Format["EndB"]) ? $Format["EndB"] : 0;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Levels	= isset($Format["Levels"]) ? $Format["Levels"] : NULL;
+
+     $Shadow = $this->Shadow;
+     $this->Shadow = FALSE;
+
+     if ( $StartR == $EndR && $StartG == $EndG && $StartB == $EndB )
+      {
+       $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,array("R"=>$StartR,"G"=>$StartG,"B"=>$StartB,"Alpha"=>$Alpha));
+       return(0);
+      }
+
+     if ( $Levels != NULL )
+      { $EndR=$StartR+$Levels; $EndG=$StartG+$Levels; $EndB=$StartB+$Levels; }
+
+     if ($X1 > $X2) { list($X1, $X2) = array($X2, $X1); }
+     if ($Y1 > $Y2) { list($Y1, $Y2) = array($Y2, $Y1); }
+
+     if ( $Direction == DIRECTION_VERTICAL )   { $Width = abs($Y2-$Y1); }
+     if ( $Direction == DIRECTION_HORIZONTAL ) { $Width = abs($X2-$X1); }
+
+     $Step     = max(abs($EndR-$StartR),abs($EndG-$StartG),abs($EndB-$StartB));
+     $StepSize = $Width/$Step;
+     $RStep    = ($EndR-$StartR)/$Step;
+     $GStep    = ($EndG-$StartG)/$Step;
+     $BStep    = ($EndB-$StartB)/$Step;
+
+     $R=$StartR;$G=$StartG;$B=$StartB;
+     switch($Direction)
+      {
+       case DIRECTION_VERTICAL:
+        $StartY = $Y1; $EndY = floor($Y2)+1; $LastY2 = $StartY;
+        for($i=0;$i<=$Step;$i++)
+         {
+          $Y2 = floor($StartY + ($i * $StepSize));
+
+          if ($Y2 > $EndY) { $Y2 = $EndY; }
+          if (($Y1 != $Y2 && $Y1 < $Y2) || $Y2 == $EndY)
+           {
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color);
+            $LastY2 = max($LastY2,$Y2);
+            $Y1 = $Y2+1;
+           }
+          $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep;
+         }
+        if ( $LastY2 < $EndY && isset($Color)) { for ($i=$LastY2+1;$i<=$EndY;$i++) { $this->drawLine($X1,$i,$X2,$i,$Color); } }
+        break;
+
+       case DIRECTION_HORIZONTAL:
+        $StartX = $X1; $EndX = $X2;
+        for($i=0;$i<=$Step;$i++)
+         {
+          $X2 = floor($StartX + ($i * $StepSize));
+
+          if ($X2 > $EndX) { $X2 = $EndX; }
+          if (($X1 != $X2 && $X1 < $X2) || $X2 == $EndX)
+           {
+            $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+            $this->drawFilledRectangle($X1,$Y1,$X2,$Y2,$Color);
+            $X1 = $X2+1;
+           }
+          $R = $R + $RStep; $G = $G + $GStep; $B = $B + $BStep; 
+         }
+        if ( $X2 < $EndX && isset($Color)) { $this->drawFilledRectangle($X2,$Y1,$EndX,$Y2,$Color); }
+        break;
+      }
+
+     $this->Shadow = $Shadow;
+
+    }
+
+   /* Draw an aliased pixel */
+   function drawAntialiasPixel($X,$Y,$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 ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
+      return(-1);
+
+     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+     if ( !$this->Antialias )
+      {
+       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+         $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$this->Shadowa);
+         imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
+        }
+
+       $PlotColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+       imagesetpixel($this->Picture,$X,$Y,$PlotColor);
+
+       return(0);
+      }
+
+     $Plot = "";
+     $Xi   = floor($X);
+     $Yi   = floor($Y);
+
+     if ( $Xi == $X && $Yi == $Y)
+      {
+       if ( $Alpha == 100 )
+        $this->drawAlphaPixel($X,$Y,100,$R,$G,$B);
+       else
+        $this->drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B);
+      }
+     else
+      {
+       $Alpha1 = (((1 - ($X - floor($X))) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
+       if ( $Alpha1 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi,$Alpha1,$R,$G,$B); }
+
+       $Alpha2 = ((($X - floor($X)) * (1 - ($Y - floor($Y))) * 100) / 100) * $Alpha;
+       if ( $Alpha2 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi,$Alpha2,$R,$G,$B); }
+
+       $Alpha3 = (((1 - ($X - floor($X))) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
+       if ( $Alpha3 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi,$Yi+1,$Alpha3,$R,$G,$B); }
+
+       $Alpha4 = ((($X - floor($X)) * ($Y - floor($Y)) * 100) / 100) * $Alpha;
+       if ( $Alpha4 > $this->AntialiasQuality ) { $this->drawAlphaPixel($Xi+1,$Yi+1,$Alpha4,$R,$G,$B); }
+      }
+    }
+
+   /* Draw a semi-transparent pixel */
+   function drawAlphaPixel($X,$Y,$Alpha,$R,$G,$B)
+    {
+     if ( isset($this->Mask[$X])) { if ( isset($this->Mask[$X][$Y]) ) { return(0); } }
+
+     if ( $X < 0 || $Y < 0 || $X >= $this->XSize || $Y >= $this->YSize )
+      return(-1);
+
+     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+      {
+       $AlphaFactor = floor(($Alpha / 100) * $this->Shadowa);
+       $ShadowColor = $this->allocateColor($this->Picture,$this->ShadowR,$this->ShadowG,$this->ShadowB,$AlphaFactor);
+       imagesetpixel($this->Picture,$X+$this->ShadowX,$Y+$this->ShadowY,$ShadowColor);
+      }
+
+     $C_Aliased = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+     imagesetpixel($this->Picture,$X,$Y,$C_Aliased);
+    }
+
+   /* Convert apha to base 10 */
+   function convertAlpha($AlphaValue)
+    { return((127/100)*(100-$AlphaValue)); }
+
+   /* Allocate a color with transparency */
+   function allocateColor($Picture,$R,$G,$B,$Alpha=100)
+    {
+     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
+     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
+     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
+     if ( $Alpha < 0 )  { $Alpha = 0; }
+     if ( $Alpha > 100) { $Alpha = 100; }
+
+     $Alpha = $this->convertAlpha($Alpha);
+     return(imagecolorallocatealpha($Picture,$R,$G,$B,$Alpha));
+    }
+
+   /* Load a PNG file and draw it over the chart */
+   function drawFromPNG($X,$Y,$FileName)
+    { $this->drawFromPicture(1,$FileName,$X,$Y); }
+
+   /* Load a GIF file and draw it over the chart */
+   function drawFromGIF($X,$Y,$FileName)
+    { $this->drawFromPicture(2,$FileName,$X,$Y); }
+
+   /* Load a JPEG file and draw it over the chart */
+   function drawFromJPG($X,$Y,$FileName)
+    { $this->drawFromPicture(3,$FileName,$X,$Y); }
+
+   function getPicInfo($FileName)
+    {
+     $Infos  = getimagesize($FileName);
+     $Width  = $Infos[0];
+     $Height = $Infos[1];
+     $Type   = $Infos["mime"];
+
+     if ( $Type == "image/png") { $Type = 1; }
+     if ( $Type == "image/gif") { $Type = 2; }
+     if ( $Type == "image/jpeg ") { $Type = 3; }
+
+     return(array($Width,$Height,$Type));
+    }
+
+   /* Generic loader function for external pictures */
+   function drawFromPicture($PicType,$FileName,$X,$Y)
+    {
+     if ( file_exists($FileName))
+      {
+       list($Width,$Height) = $this->getPicInfo($FileName);
+
+       if ( $PicType == 1 )
+        { $Raster = imagecreatefrompng($FileName); }
+       elseif ( $PicType == 2 )
+        { $Raster = imagecreatefromgif($FileName); }
+       elseif ( $PicType == 3 )
+        { $Raster = imagecreatefromjpeg($FileName); }
+       else
+        { return(0); }
+
+
+       $RestoreShadow = $this->Shadow;
+       if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+        {
+         $this->Shadow = FALSE;
+         if ( $PicType == 3 )
+          $this->drawFilledRectangle($X+$this->ShadowX,$Y+$this->ShadowY,$X+$Width+$this->ShadowX,$Y+$Height+$this->ShadowY,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+         else
+          {
+           $TranparentID = imagecolortransparent($Raster);
+           for ($Xc=0;$Xc<=$Width-1;$Xc++)
+            {
+             for ($Yc=0;$Yc<=$Height-1;$Yc++)
+              {
+               $RGBa   = imagecolorat($Raster,$Xc,$Yc);
+               $Values = imagecolorsforindex($Raster,$RGBa);
+               if ( $Values["alpha"] < 120 )
+                {
+                 $AlphaFactor = floor(($this->Shadowa / 100) * ((100 / 127) * (127-$Values["alpha"])));
+                 $this->drawAlphaPixel($X+$Xc+$this->ShadowX,$Y+$Yc+$this->ShadowY,$AlphaFactor,$this->ShadowR,$this->ShadowG,$this->ShadowB);
+                }
+              }
+            }
+          }
+        }
+       $this->Shadow = $RestoreShadow;
+
+       imagecopy($this->Picture,$Raster,$X,$Y,0,0,$Width,$Height);
+       imagedestroy($Raster);
+      }
+    }
+
+   /* Draw an arrow */
+   function drawArrow($X1,$Y1,$X2,$Y2,$Format="")
+    {
+     $FillR	= isset($Format["FillR"]) ? $Format["FillR"] : 0;
+     $FillG	= isset($Format["FillG"]) ? $Format["FillG"] : 0;
+     $FillB	= isset($Format["FillB"]) ? $Format["FillB"] : 0;
+     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
+     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
+     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Size	= isset($Format["Size"]) ? $Format["Size"] : 10;
+     $Ratio	= isset($Format["Ratio"]) ? $Format["Ratio"] : .5;
+     $TwoHeads	= isset($Format["TwoHeads"]) ? $Format["TwoHeads"] : FALSE;
+     $Ticks	= isset($Format["Ticks"]) ? $Format["Ticks"] : FALSE;
+
+     /* Calculate the line angle */
+     $Angle = $this->getAngle($X1,$Y1,$X2,$Y2);
+
+     /* Override Shadow support, this will be managed internally */
+     $RestoreShadow = $this->Shadow;
+     if ( $this->Shadow && $this->ShadowX != 0 && $this->ShadowY != 0 )
+      {
+       $this->Shadow = FALSE;
+       $this->drawArrow($X1+$this->ShadowX,$Y1+$this->ShadowY,$X2+$this->ShadowX,$Y2+$this->ShadowY,array("FillR"=>$this->ShadowR,"FillG"=>$this->ShadowG,"FillB"=>$this->ShadowB,"Alpha"=>$this->Shadowa,"Size"=>$Size,"Ratio"=>$Ratio,"TwoHeads"=>$TwoHeads,"Ticks"=>$Ticks));
+      }
+
+     /* Draw the 1st Head */
+     $TailX = cos(($Angle-180)*PI/180)*$Size+$X2;
+     $TailY = sin(($Angle-180)*PI/180)*$Size+$Y2;
+
+     $Points	= "";
+     $Points[]  = $X2; $Points[]  = $Y2;
+     $Points[]	= cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY;
+     $Points[]	= cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY;
+     $Points[]  = $X2; $Points[]  = $Y2;
+
+     /* Visual correction */
+     if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
+     if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
+
+     $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
+     ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
+
+     $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+     $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+     $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+
+     /* Draw the second head */
+     if ( $TwoHeads )
+      {
+       $Angle = $this->getAngle($X2,$Y2,$X1,$Y1);
+
+       $TailX2 = cos(($Angle-180)*PI/180)*$Size+$X1;
+       $TailY2 = sin(($Angle-180)*PI/180)*$Size+$Y1;
+
+       $Points   = "";
+       $Points[] = $X1; $Points[]  = $Y1;
+       $Points[] = cos(($Angle-90)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-90)*PI/180)*$Size*$Ratio+$TailY2;
+       $Points[] = cos(($Angle-270)*PI/180)*$Size*$Ratio+$TailX2; $Points[] = sin(($Angle-270)*PI/180)*$Size*$Ratio+$TailY2;
+       $Points[] = $X1; $Points[]  = $Y1;
+
+       /* Visual correction */
+       if ($Angle == 180 || $Angle == 360 ) { $Points[4] = $Points[2]; }
+       if ($Angle == 90 || $Angle == 270 ) { $Points[5] = $Points[3]; }
+
+       $ArrowColor = $this->allocateColor($this->Picture,$FillR,$FillG,$FillB,$Alpha);
+       ImageFilledPolygon($this->Picture,$Points,4,$ArrowColor);
+
+       $this->drawLine($Points[0],$Points[1],$Points[2],$Points[3],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+       $this->drawLine($Points[2],$Points[3],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+       $this->drawLine($Points[0],$Points[1],$Points[4],$Points[5],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+
+       $this->drawLine($TailX,$TailY,$TailX2,$TailY2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+      }
+     else
+      $this->drawLine($X1,$Y1,$TailX,$TailY,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+
+     /* Re-enable shadows */
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Draw a label with associated arrow */
+   function drawArrowLabel($X1,$Y1,$Text,$Format="")
+    {
+     $FillR    = isset($Format["FillR"]) ? $Format["FillR"] : 0;
+     $FillG    = isset($Format["FillG"]) ? $Format["FillG"] : 0;
+     $FillB    = isset($Format["FillB"]) ? $Format["FillB"] : 0;
+     $BorderR  = isset($Format["BorderR"]) ? $Format["BorderR"] : $FillR;
+     $BorderG  = isset($Format["BorderG"]) ? $Format["BorderG"] : $FillG;
+     $BorderB  = isset($Format["BorderB"]) ? $Format["BorderB"] : $FillB;
+     $FontName = isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+     $FontSize = isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+     $Alpha    = isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Length   = isset($Format["Length"]) ? $Format["Length"] : 50;
+     $Angle    = isset($Format["Angle"]) ? $Format["Angle"] : 315;
+     $Size     = isset($Format["Size"]) ? $Format["Size"] : 10;
+     $Position = isset($Format["Position"]) ? $Format["Position"] : POSITION_TOP;
+     $RoundPos = isset($Format["RoundPos"]) ? $Format["RoundPos"] : FALSE;
+     $Ticks    = isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+
+     $Angle = $Angle % 360;
+
+     $X2 = sin(($Angle+180)*PI/180)*$Length+$X1;
+     $Y2 = cos(($Angle+180)*PI/180)*$Length+$Y1;
+
+     if ( $RoundPos && $Angle > 0 && $Angle < 180 ) { $Y2 = ceil($Y2); }
+     if ( $RoundPos && $Angle > 180 ) { $Y2 = floor($Y2); }
+
+     $this->drawArrow($X2,$Y2,$X1,$Y1,$Format);
+
+     $Size	= imagettfbbox($FontSize,0,$FontName,$Text);
+     $TxtWidth	= max(abs($Size[2]-$Size[0]),abs($Size[0]-$Size[6]));
+     $TxtHeight	= max(abs($Size[1]-$Size[7]),abs($Size[3]-$Size[1]));
+
+     if ( $Angle > 0 && $Angle < 180 )
+      {
+       $this->drawLine($X2,$Y2,$X2-$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+       if ( $Position == POSITION_TOP )
+        $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_BOTTOMRIGHT));
+       else
+        $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPRIGHT));
+      }
+     else
+      {
+       $this->drawLine($X2,$Y2,$X2+$TxtWidth,$Y2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+       if ( $Position == POSITION_TOP )
+        $this->drawText($X2,$Y2-2,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha));
+       else
+        $this->drawText($X2,$Y2+4,$Text,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$Alpha,"Align"=>TEXT_ALIGN_TOPLEFT));
+      }
+    }
+
+   /* Draw a progress bar filled with specified % */
+   function drawProgress($X,$Y,$Percent,$Format="")
+    {
+     if ( $Percent > 100 ) { $Percent = 100; }
+     if ( $Percent < 0 ) { $Percent = 0; }
+
+     $Width	= isset($Format["Width"]) ? $Format["Width"] : 200;
+     $Height	= isset($Format["Height"]) ? $Format["Height"] : 20;
+     $Orientation = isset($Format["Orientation"]) ? $Format["Orientation"] : ORIENTATION_HORIZONTAL;
+     $ShowLabel = isset($Format["ShowLabel"]) ? $Format["ShowLabel"] : FALSE;
+     $LabelPos	= isset($Format["LabelPos"]) ? $Format["LabelPos"] : LABEL_POS_INSIDE;
+     $Margin    = isset($Format["Margin"]) ? $Format["Margin"] : 10;
+     $R		= isset($Format["R"]) ? $Format["R"] : 130;
+     $G		= isset($Format["G"]) ? $Format["G"] : 130;
+     $B		= isset($Format["B"]) ? $Format["B"] : 130;
+     $RFade	= isset($Format["RFade"]) ? $Format["RFade"] : -1;
+     $GFade	= isset($Format["GFade"]) ? $Format["GFade"] : -1;
+     $BFade	= isset($Format["BFade"]) ? $Format["BFade"] : -1;
+     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+     $BoxBorderR = isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 0;
+     $BoxBorderG = isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 0;
+     $BoxBorderB = isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 0;
+     $BoxBackR	= isset($Format["BoxBackR"]) ? $Format["BoxBackR"] : 255;
+     $BoxBackG	= isset($Format["BoxBackG"]) ? $Format["BoxBackG"] : 255;
+     $BoxBackB	= isset($Format["BoxBackB"]) ? $Format["BoxBackB"] : 255;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $BoxSurrounding = isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : NULL;
+     $NoAngle	= isset($Format["NoAngle"]) ? $Format["NoAngle"] : FALSE;
+
+     if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+      {
+       $RFade = (($RFade-$R)/100)*$Percent+$R;
+       $GFade = (($GFade-$G)/100)*$Percent+$G;
+       $BFade = (($BFade-$B)/100)*$Percent+$B;
+      }
+
+     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+     if ( $BoxSurrounding != NULL ) { $BoxBorderR = $BoxBackR + $Surrounding; $BoxBorderG = $BoxBackG + $Surrounding; $BoxBorderB = $BoxBackB + $Surrounding; }
+
+     if ( $Orientation == ORIENTATION_VERTICAL )
+      {
+       $InnerHeight = (($Height-2)/100)*$Percent;
+       $this->drawFilledRectangle($X,$Y,$X+$Width,$Y-$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
+
+       $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
+       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+        {
+         $GradientOptions = array("StartR"=>$RFade,"StartG"=>$GFade,"StartB"=>$BFade,"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+         $this->drawGradientArea($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,DIRECTION_VERTICAL,$GradientOptions);
+
+         if ( $Surrounding )
+          $this->drawRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
+        }
+       else
+        $this->drawFilledRectangle($X+1,$Y-1,$X+$Width-1,$Y-$InnerHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+
+       $this->Shadow = $RestoreShadow;
+
+       if ( $ShowLabel && $LabelPos == LABEL_POS_BOTTOM )	{ $this->drawText($X+($Width/2),$Y+$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_TOPMIDDLE)); }
+       if ( $ShowLabel && $LabelPos == LABEL_POS_TOP )		{ $this->drawText($X+($Width/2),$Y-$Height-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+       if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+($Width/2),$Y-$InnerHeight-$Margin,$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT,"Angle"=>90)); }
+       if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y-($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"Angle"=>90)); }
+      }
+     else
+      {
+       if ( $Percent == 100 )
+        $InnerWidth = $Width-1;
+       else
+        $InnerWidth = (($Width-2)/100)*$Percent;
+
+       $this->drawFilledRectangle($X,$Y,$X+$Width,$Y+$Height,array("R"=>$BoxBackR,"G"=>$BoxBackG,"B"=>$BoxBackB,"BorderR"=>$BoxBorderR,"BorderG"=>$BoxBorderG,"BorderB"=>$BoxBorderB,"NoAngle"=>$NoAngle));
+
+       $RestoreShadow = $this->Shadow; $this->Shadow  = FALSE;
+       if ( $RFade != -1 && $GFade != -1 && $BFade != -1 )
+        {
+         $GradientOptions = array("StartR"=>$R,"StartG"=>$G,"StartB"=>$B,"EndR"=>$RFade,"EndG"=>$GFade,"EndB"=>$BFade);
+         $this->drawGradientArea($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,DIRECTION_HORIZONTAL,$GradientOptions);
+
+         if ( $Surrounding )
+          $this->drawRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>255,"G"=>255,"B"=>255,"Alpha"=>$Surrounding));
+        }
+       else
+        $this->drawFilledRectangle($X+1,$Y+1,$X+$InnerWidth,$Y+$Height-1,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+ 
+       $this->Shadow = $RestoreShadow;
+
+       if ( $ShowLabel && $LabelPos == LABEL_POS_LEFT )		{ $this->drawText($X-$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLERIGHT)); }
+       if ( $ShowLabel && $LabelPos == LABEL_POS_RIGHT )	{ $this->drawText($X+$Width+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
+       if ( $ShowLabel && $LabelPos == LABEL_POS_CENTER )	{ $this->drawText($X+($Width/2),$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLEMIDDLE)); }
+       if ( $ShowLabel && $LabelPos == LABEL_POS_INSIDE )	{ $this->drawText($X+$InnerWidth+$Margin,$Y+($Height/2),$Percent."%",array("Align"=>TEXT_ALIGN_MIDDLELEFT)); }
+      }
+    }
+
+   /* Get the legend box size */
+   function getLegendSize($Format="")
+    {
+     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+     $BoxSize		= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
+     $Margin		= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+     $Style		= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
+     $BoxHeight		= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
+     $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
+     $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
+     $XSpacing		= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
+
+     $Data = $this->DataSet->getData();
+
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
+        {
+         list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
+         if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
+         if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+        }
+      }
+
+     $YStep = max($this->FontSize,$IconAreaHeight) + 5;
+     $XStep = $IconAreaWidth + 5;
+     $XStep = $XSpacing;
+
+     $X=100; $Y=100;
+
+     $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         if ( $Mode == LEGEND_VERTICAL )
+          {
+           $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
+
+           if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+           if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+           if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+
+           $Lines = preg_split("/\n/",$Serie["Description"]);
+           $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
+          }
+         elseif ( $Mode == LEGEND_HORIZONTAL )
+          {
+           $Lines = preg_split("/\n/",$Serie["Description"]);
+           $Width = "";
+           foreach($Lines as $Key => $Value)
+            {
+             $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
+
+             if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+             if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+             if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+
+             $Width[] = $BoxArray[1]["X"];
+            }
+
+           $vX=max($Width)+$XStep;
+          }
+        }
+      }
+     $vY=$vY-$YStep; $vX=$vX-$XStep;
+
+     $TopOffset  = $Y - $Boundaries["T"];
+     if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
+
+     $Width  = ($Boundaries["R"]+$Margin) - ($Boundaries["L"]-$Margin);
+     $Height = ($Boundaries["B"]+$Margin) - ($Boundaries["T"]-$Margin);
+
+     return(array("Width"=>$Width,"Height"=>$Height));
+    }
+
+   /* Draw the legend of the active series */
+   function drawLegend($X,$Y,$Format="")
+    {
+     $Family	= isset($Format["Family"]) ? $Format["Family"] : LEGEND_FAMILY_BOX;
+     $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+     $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+     $FontR	= isset($Format["FontR"]) ? $Format["FontR"] : $this->FontColorR;
+     $FontG	= isset($Format["FontG"]) ? $Format["FontG"] : $this->FontColorG;
+     $FontB	= isset($Format["FontB"]) ? $Format["FontB"] : $this->FontColorB;
+     $BoxWidth	= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 5;
+     $BoxHeight	= isset($Format["BoxHeight"]) ? $Format["BoxHeight"] : 5;
+     $IconAreaWidth	= isset($Format["IconAreaWidth"]) ? $Format["IconAreaWidth"] : $BoxWidth;
+     $IconAreaHeight	= isset($Format["IconAreaHeight"]) ? $Format["IconAreaHeight"] : $BoxHeight;
+     $XSpacing	= isset($Format["XSpacing"]) ? $Format["XSpacing"] : 5;
+     $Margin	= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+     $R		= isset($Format["R"]) ? $Format["R"] : 200;
+     $G		= isset($Format["G"]) ? $Format["G"] : 200;
+     $B		= isset($Format["B"]) ? $Format["B"] : 200;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $BorderR	= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+     $BorderG	= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+     $BorderB	= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+     $Surrounding = isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Style	= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+     $Mode	= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+
+     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+
+     $Data = $this->DataSet->getData();
+
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && isset($Serie["Picture"]))
+        {
+         list($PicWidth,$PicHeight) = $this->getPicInfo($Serie["Picture"]);
+         if ( $IconAreaWidth < $PicWidth ) { $IconAreaWidth = $PicWidth; }
+         if ( $IconAreaHeight < $PicHeight ) { $IconAreaHeight = $PicHeight; }
+        }
+      }
+
+     $YStep = max($this->FontSize,$IconAreaHeight) + 5;
+     $XStep = $IconAreaWidth + 5;
+     $XStep = $XSpacing;
+
+     $Boundaries = ""; $Boundaries["L"] = $X; $Boundaries["T"] = $Y; $Boundaries["R"] = 0; $Boundaries["B"] = 0; $vY = $Y; $vX = $X;
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         if ( $Mode == LEGEND_VERTICAL )
+          {
+           $BoxArray = $this->getTextBox($vX+$IconAreaWidth+4,$vY+$IconAreaHeight/2,$FontName,$FontSize,0,$Serie["Description"]);
+
+           if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+           if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+           if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+
+           $Lines = preg_split("/\n/",$Serie["Description"]);
+           $vY = $vY + max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
+          }
+         elseif ( $Mode == LEGEND_HORIZONTAL )
+          {
+           $Lines = preg_split("/\n/",$Serie["Description"]);
+           $Width = "";
+           foreach($Lines as $Key => $Value)
+            {
+             $BoxArray = $this->getTextBox($vX+$IconAreaWidth+6,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$FontName,$FontSize,0,$Value);
+
+             if ( $Boundaries["T"] > $BoxArray[2]["Y"]+$IconAreaHeight/2 ) { $Boundaries["T"] = $BoxArray[2]["Y"]+$IconAreaHeight/2; }
+             if ( $Boundaries["R"] < $BoxArray[1]["X"]+2 ) { $Boundaries["R"] = $BoxArray[1]["X"]+2; }
+             if ( $Boundaries["B"] < $BoxArray[1]["Y"]+2+$IconAreaHeight/2 ) { $Boundaries["B"] = $BoxArray[1]["Y"]+2+$IconAreaHeight/2; }
+
+             $Width[] = $BoxArray[1]["X"];
+            }
+
+           $vX=max($Width)+$XStep;
+          }
+        }
+      }
+     $vY=$vY-$YStep; $vX=$vX-$XStep;
+
+     $TopOffset  = $Y - $Boundaries["T"];
+     if ( $Boundaries["B"]-($vY+$IconAreaHeight) < $TopOffset ) { $Boundaries["B"] = $vY+$IconAreaHeight+$TopOffset; }
+
+     if ( $Style == LEGEND_ROUND )
+      $this->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     elseif ( $Style == LEGEND_BOX )
+      $this->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->Shadow; $this->Shadow = FALSE;
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"];
+         $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+         if ( isset($Serie["Picture"]) )
+          {
+           $Picture = $Serie["Picture"];
+           list($PicWidth,$PicHeight) = $this->getPicInfo($Picture);
+           $PicX = $X+$IconAreaWidth/2; $PicY = $Y+$IconAreaHeight/2; 
+
+           $this->drawFromPNG($PicX-$PicWidth/2,$PicY-$PicHeight/2,$Picture);
+          }
+         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->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->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 )
+            {
+             $this->drawFilledCircle($X+1+$IconAreaWidth/2,$Y+1+$IconAreaHeight/2,min($IconAreaHeight/2,$IconAreaWidth/2),array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20));
+             $this->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 )
+            {
+             $this->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->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 )
+          {
+           $Lines = preg_split("/\n/",$Serie["Description"]);
+           foreach($Lines as $Key => $Value)
+            $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+
+           $Y=$Y+max($this->FontSize*count($Lines),$IconAreaHeight) + 5;
+          }
+         elseif ( $Mode == LEGEND_HORIZONTAL )
+          {
+           $Lines = preg_split("/\n/",$Serie["Description"]);
+           $Width = "";
+           foreach($Lines as $Key => $Value)
+            {
+             $BoxArray = $this->drawText($X+$IconAreaWidth+4,$Y+$IconAreaHeight/2+(($this->FontSize+3)*$Key),$Value,array("R"=>$FontR,"G"=>$FontG,"B"=>$FontB,"Align"=>TEXT_ALIGN_MIDDLELEFT,"FontSize"=>$FontSize,"FontName"=>$FontName));
+             $Width[] = $BoxArray[1]["X"];
+            }
+           $X=max($Width)+2+$XStep;
+          }
+        }
+      }
+
+
+     $this->Shadow = $RestoreShadow;
+    }
+
+   function drawScale($Format="")
+    {
+     $Pos		= isset($Format["Pos"]) ? $Format["Pos"] : SCALE_POS_LEFTRIGHT;
+     $Floating		= isset($Format["Floating"]) ? $Format["Floating"] : FALSE;
+     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : SCALE_MODE_FLOATING;
+     $RemoveXAxis	= isset($Format["RemoveXAxis"]) ? $Format["RemoveXAxis"] : FALSE;
+     $MinDivHeight	= isset($Format["MinDivHeight"]) ? $Format["MinDivHeight"] : 20;
+     $Factors		= isset($Format["Factors"]) ? $Format["Factors"] : array(1,2,5);
+     $ManualScale	= isset($Format["ManualScale"]) ? $Format["ManualScale"] : array("0"=>array("Min"=>-100,"Max"=>100));
+     $XMargin		= isset($Format["XMargin"]) ? $Format["XMargin"] : AUTO;
+     $YMargin		= isset($Format["YMargin"]) ? $Format["YMargin"] : 0;
+     $ScaleSpacing	= isset($Format["ScaleSpacing"]) ? $Format["ScaleSpacing"] : 15;
+     $InnerTickWidth	= isset($Format["InnerTickWidth"]) ? $Format["InnerTickWidth"] : 2;
+     $OuterTickWidth	= isset($Format["OuterTickWidth"]) ? $Format["OuterTickWidth"] : 2;
+     $DrawXLines	= isset($Format["DrawXLines"]) ? $Format["DrawXLines"] : TRUE;
+     $DrawYLines	= isset($Format["DrawYLines"]) ? $Format["DrawYLines"] : ALL;
+     $GridTicks		= isset($Format["GridTicks"]) ? $Format["GridTicks"] : 4;
+     $GridR		= isset($Format["GridR"]) ? $Format["GridR"] : 255;
+     $GridG		= isset($Format["GridG"]) ? $Format["GridG"] : 255;
+     $GridB		= isset($Format["GridB"]) ? $Format["GridB"] : 255;
+     $GridAlpha		= isset($Format["GridAlpha"]) ? $Format["GridAlpha"] : 40;
+     $AxisRo		= isset($Format["AxisR"]) ? $Format["AxisR"] : 0;
+     $AxisGo		= isset($Format["AxisG"]) ? $Format["AxisG"] : 0;
+     $AxisBo		= isset($Format["AxisB"]) ? $Format["AxisB"] : 0;
+     $AxisAlpha		= isset($Format["AxisAlpha"]) ? $Format["AxisAlpha"] : 100;
+     $TickRo		= isset($Format["TickR"]) ? $Format["TickR"] : 0;
+     $TickGo		= isset($Format["TickG"]) ? $Format["TickG"] : 0;
+     $TickBo		= isset($Format["TickB"]) ? $Format["TickB"] : 0;
+     $TickAlpha		= isset($Format["TickAlpha"]) ? $Format["TickAlpha"] : 100;
+     $DrawSubTicks	= isset($Format["DrawSubTicks"]) ? $Format["DrawSubTicks"] : FALSE;
+     $InnerSubTickWidth	= isset($Format["InnerSubTickWidth"]) ? $Format["InnerSubTickWidth"] : 0;
+     $OuterSubTickWidth	= isset($Format["OuterSubTickWidth"]) ? $Format["OuterSubTickWidth"] : 2;
+     $SubTickR		= isset($Format["SubTickR"]) ? $Format["SubTickR"] : 255;
+     $SubTickG		= isset($Format["SubTickG"]) ? $Format["SubTickG"] : 0;
+     $SubTickB		= isset($Format["SubTickB"]) ? $Format["SubTickB"] : 0;
+     $SubTickAlpha	= isset($Format["SubTickAlpha"]) ? $Format["SubTickAlpha"] : 100;
+     $AutoAxisLabels	= isset($Format["AutoAxisLabels"]) ? $Format["AutoAxisLabels"] : TRUE;
+     $XReleasePercent	= isset($Format["XReleasePercent"]) ? $Format["XReleasePercent"] : 1;
+     $DrawArrows	= isset($Format["DrawArrows"]) ? $Format["DrawArrows"] : FALSE;
+     $ArrowSize         = isset($Format["ArrowSize"]) ? $Format["ArrowSize"] : 8;
+     $CycleBackground	= isset($Format["CycleBackground"]) ? $Format["CycleBackground"] : FALSE;
+     $BackgroundR1	= isset($Format["BackgroundR1"]) ? $Format["BackgroundR1"] : 255;
+     $BackgroundG1	= isset($Format["BackgroundG1"]) ? $Format["BackgroundG1"] : 255;
+     $BackgroundB1	= isset($Format["BackgroundB1"]) ? $Format["BackgroundB1"] : 255;
+     $BackgroundAlpha1	= isset($Format["BackgroundAlpha1"]) ? $Format["BackgroundAlpha1"] : 20;
+     $BackgroundR2	= isset($Format["BackgroundR2"]) ? $Format["BackgroundR2"] : 230;
+     $BackgroundG2	= isset($Format["BackgroundG2"]) ? $Format["BackgroundG2"] : 230;
+     $BackgroundB2	= isset($Format["BackgroundB2"]) ? $Format["BackgroundB2"] : 230;
+     $BackgroundAlpha2	= isset($Format["BackgroundAlpha2"]) ? $Format["BackgroundAlpha2"] : 20;
+     $LabelingMethod	= isset($Format["LabelingMethod"]) ? $Format["LabelingMethod"] : LABELING_ALL;
+     $LabelSkip		= isset($Format["LabelSkip"]) ? $Format["LabelSkip"] : 0;
+     $LabelRotation	= isset($Format["LabelRotation"]) ? $Format["LabelRotation"] : 0;
+     $SkippedAxisTicks	= isset($Format["SkippedAxisTicks"]) ? $Format["SkippedAxisTicks"] : $GridTicks+2;
+     $SkippedAxisR	= isset($Format["SkippedAxisR"]) ? $Format["SkippedAxisR"] : $GridR;
+     $SkippedAxisG	= isset($Format["SkippedAxisG"]) ? $Format["SkippedAxisG"] : $GridG;
+     $SkippedAxisB	= isset($Format["SkippedAxisB"]) ? $Format["SkippedAxisB"] : $GridB;
+     $SkippedAxisAlpha	= isset($Format["SkippedAxisAlpha"]) ? $Format["SkippedAxisAlpha"] : $GridAlpha-30;
+     $SkippedTickR	= isset($Format["SkippedTickR"]) ? $Format["SkippedTickR"] : $TickRo;
+     $SkippedTickG	= isset($Format["SkippedTickG"]) ? $Format["SkippedTickG"] : $TickGo;
+     $SkippedTickB	= isset($Format["SkippedTicksB"]) ? $Format["SkippedTickB"] : $TickBo;
+     $SkippedTickAlpha	= isset($Format["SkippedTickAlpha"]) ? $Format["SkippedTickAlpha"] : $TickAlpha-80;
+     $SkippedInnerTickWidth	= isset($Format["SkippedInnerTickWidth"]) ? $Format["SkippedInnerTickWidth"] : 0;
+     $SkippedOuterTickWidth	= isset($Format["SkippedOuterTickWidth"]) ? $Format["SkippedOuterTickWidth"] : 2;
+
+     /* Floating scale require X & Y margins to be set manually */
+     if ( $Floating && ( $XMargin == AUTO || $YMargin == 0 ) ) { $Floating = FALSE; }
+
+     /* Skip a NOTICE event in case of an empty array */
+     if ( $DrawYLines == NONE || $DrawYLines == FALSE ) { $DrawYLines = array("zarma"=>"31"); }
+
+     /* Define the color for the skipped elements */
+     $SkippedAxisColor = array("R"=>$SkippedAxisR,"G"=>$SkippedAxisG,"B"=>$SkippedAxisB,"Alpha"=>$SkippedAxisAlpha,"Ticks"=>$SkippedAxisTicks);
+     $SkippedTickColor = array("R"=>$SkippedTickR,"G"=>$SkippedTickG,"B"=>$SkippedTickB,"Alpha"=>$SkippedTickAlpha);
+
+     $Data = $this->DataSet->getData();
+     if ( isset($Data["Abscissa"]) ) { $Abscissa = $Data["Abscissa"]; } else { $Abscissa = NULL; }
+
+     /* Unset the abscissa axis, needed if we display multiple charts on the same picture */
+     if ( $Abscissa != NULL )
+      {
+       foreach($Data["Axis"] as $AxisID => $Parameters)
+        { if ($Parameters["Identity"] == AXIS_X) { unset($Data["Axis"][$AxisID]); } }
+      }
+
+     /* Build the scale settings */
+     $GotXAxis = FALSE;
+     foreach($Data["Axis"] as $AxisID => $AxisParameter)
+      {
+       if ( $AxisParameter["Identity"] == AXIS_X ) { $GotXAxis = TRUE; }
+
+       if ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_Y)
+        { $Height = $this->GraphAreaY2-$this->GraphAreaY1 - $YMargin*2; }
+       elseif ( $Pos == SCALE_POS_LEFTRIGHT && $AxisParameter["Identity"] == AXIS_X)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
+       elseif ( $Pos == SCALE_POS_TOPBOTTOM && $AxisParameter["Identity"] == AXIS_Y)
+        { $Height = $this->GraphAreaX2-$this->GraphAreaX1 - $YMargin*2;; }
+       else
+        { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
+
+       $AxisMin = ABSOLUTE_MAX; $AxisMax = OUT_OF_SIGHT;
+       if ( $Mode == SCALE_MODE_FLOATING || $Mode == SCALE_MODE_START0 )
+        {
+         foreach($Data["Series"] as $SerieID => $SerieParameter)
+          {
+           if ( $SerieParameter["Axis"] == $AxisID && $Data["Series"][$SerieID]["isDrawable"] && $Data["Abscissa"] != $SerieID)
+            {
+             $AxisMax = max($AxisMax,$Data["Series"][$SerieID]["Max"]);
+             $AxisMin = min($AxisMin,$Data["Series"][$SerieID]["Min"]);
+            }
+          }
+         $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
+
+         $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
+         if ( $Mode == SCALE_MODE_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
+        }
+       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
+          { echo "Manual scale boundaries not set."; exit(); }
+        }
+       elseif ( $Mode == SCALE_MODE_ADDALL || $Mode == SCALE_MODE_ADDALL_START0 )
+        {
+         $Series = "";
+         foreach($Data["Series"] as $SerieID => $SerieParameter)
+          { if ( $SerieParameter["Axis"] == $AxisID && $SerieParameter["isDrawable"] && $Data["Abscissa"] != $SerieID ) { $Series[$SerieID] = count($Data["Series"][$SerieID]["Data"]); } }
+
+         for ($ID=0;$ID<=max($Series)-1;$ID++)
+          {
+           $PointMin = 0; $PointMax = 0;
+           foreach($Series as $SerieID => $ValuesCount )
+            {
+             if (isset($Data["Series"][$SerieID]["Data"][$ID]) && $Data["Series"][$SerieID]["Data"][$ID] != NULL )
+              {
+               $Value = $Data["Series"][$SerieID]["Data"][$ID];
+               if ( $Value > 0 ) { $PointMax = $PointMax + $Value; } else { $PointMin = $PointMin + $Value; }
+              }
+            }
+           $AxisMax = max($AxisMax,$PointMax);
+           $AxisMin = min($AxisMin,$PointMin);
+          }
+         $AutoMargin = (($AxisMax-$AxisMin)/100)*$XReleasePercent;
+         $Data["Axis"][$AxisID]["Min"] = $AxisMin-$AutoMargin; $Data["Axis"][$AxisID]["Max"] = $AxisMax+$AutoMargin;
+        }
+       $MaxDivs = floor($Height/$MinDivHeight);
+
+       if ( $Mode == SCALE_MODE_ADDALL_START0 ) { $Data["Axis"][$AxisID]["Min"] = 0; }
+
+       $Scale   = $this->computeScale($Data["Axis"][$AxisID]["Min"],$Data["Axis"][$AxisID]["Max"],$MaxDivs,$Factors,$AxisID);
+
+       $Data["Axis"][$AxisID]["Margin"]    = $AxisParameter["Identity"] == AXIS_X ? $XMargin : $YMargin;
+       $Data["Axis"][$AxisID]["ScaleMin"]  = $Scale["XMin"];
+       $Data["Axis"][$AxisID]["ScaleMax"]  = $Scale["XMax"];
+       $Data["Axis"][$AxisID]["Rows"]      = $Scale["Rows"];
+       $Data["Axis"][$AxisID]["RowHeight"] = $Scale["RowHeight"];
+
+       if ( isset($Scale["Format"]) ) { $Data["Axis"][$AxisID]["Format"] = $Scale["Format"]; }
+
+       if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
+       if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
+       if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
+      }
+
+     /* Still no X axis */
+     if ( $GotXAxis == FALSE )
+      {
+       if ( $Abscissa != NULL )
+        {
+         $Points = count($Data["Series"][$Abscissa]["Data"]);
+         if ( $AutoAxisLabels )
+          $AxisName = isset($Data["Series"][$Abscissa]["Description"]) ? $Data["Series"][$Abscissa]["Description"] : NULL;
+         else
+          $AxisName = NULL;
+        }
+       else
+        {
+         $Points = 0;
+         $AxisName = isset($Data["XAxisName"]) ? $Data["XAxisName"] : NULL;
+         foreach($Data["Series"] as $SerieID => $SerieParameter)
+          { if ( $SerieParameter["isDrawable"] ) { $Points = max($Points,count($SerieParameter["Data"])); } }
+        }
+
+       $AxisID = count($Data["Axis"]);
+       $Data["Axis"][$AxisID]["Identity"] = AXIS_X;
+       if ( $Pos == SCALE_POS_LEFTRIGHT ) { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_BOTTOM; } else { $Data["Axis"][$AxisID]["Position"] = AXIS_POSITION_LEFT; }
+       if ( isset($Data["AbscissaName"]) ) { $Data["Axis"][$AxisID]["Name"] = $Data["AbscissaName"]; }
+       if ( $XMargin == AUTO )
+        {
+         if ( $Pos == SCALE_POS_LEFTRIGHT )
+          { $Height = $this->GraphAreaX2-$this->GraphAreaX1; }
+         else
+          { $Height = $this->GraphAreaY2-$this->GraphAreaY1; }
+
+         if ( $Points == 1 )
+          $Data["Axis"][$AxisID]["Margin"] = $Height / 2;
+         else
+          $Data["Axis"][$AxisID]["Margin"] = ($Height/$Points) / 2;
+        }
+       else
+        { $Data["Axis"][$AxisID]["Margin"] = $XMargin; }
+       $Data["Axis"][$AxisID]["Rows"] = $Points-1;
+       if ( !isset($Data["Axis"][$AxisID]["Display"]) ) { $Data["Axis"][$AxisID]["Display"] = NULL; }
+       if ( !isset($Data["Axis"][$AxisID]["Format"]) )  { $Data["Axis"][$AxisID]["Format"] = NULL; }
+       if ( !isset($Data["Axis"][$AxisID]["Unit"]) )    { $Data["Axis"][$AxisID]["Unit"] = NULL; }
+      }
+
+     /* Do we need to reverse the abscissa position? */
+     if ( $Pos != SCALE_POS_LEFTRIGHT )
+      {
+       if ( $Data["AbsicssaPosition"] == AXIS_POSITION_BOTTOM )
+        { $Data["AbsicssaPosition"] = AXIS_POSITION_LEFT; }
+       else
+        { $Data["AbsicssaPosition"] = AXIS_POSITION_RIGHT; }
+      }
+     $Data["Axis"][$AxisID]["Position"] = $Data["AbsicssaPosition"];
+
+     $this->DataSet->saveOrientation($Pos);
+     $this->DataSet->saveAxisConfig($Data["Axis"]);
+     $this->DataSet->saveYMargin($YMargin);
+
+     $FontColorRo = $this->FontColorR; $FontColorGo = $this->FontColorG; $FontColorBo = $this->FontColorB;
+
+     $AxisPos["L"] = $this->GraphAreaX1; $AxisPos["R"] = $this->GraphAreaX2; $AxisPos["T"] = $this->GraphAreaY1; $AxisPos["B"] = $this->GraphAreaY2;
+     foreach($Data["Axis"] as $AxisID => $Parameters)
+      {
+       if ( isset($Parameters["Color"]) )
+        {
+         $AxisR = $Parameters["Color"]["R"]; $AxisG = $Parameters["Color"]["G"]; $AxisB = $Parameters["Color"]["B"];
+         $TickR = $Parameters["Color"]["R"]; $TickG = $Parameters["Color"]["G"]; $TickB = $Parameters["Color"]["B"];
+         $this->setFontProperties(array("R"=>$Parameters["Color"]["R"],"G"=>$Parameters["Color"]["G"],"B"=>$Parameters["Color"]["B"]));
+        }
+       else
+        {
+         $AxisR = $AxisRo; $AxisG = $AxisGo; $AxisB = $AxisBo;
+         $TickR = $TickRo; $TickG = $TickGo; $TickB = $TickBo;
+         $this->setFontProperties(array("R"=>$FontColorRo,"G"=>$FontColorGo,"B"=>$FontColorBo));
+        }
+
+       $LastValue = "w00t"; $ID = 1;
+       if ( $Parameters["Identity"] == AXIS_X )
+        {
+         if ( $Pos == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            {
+             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 2; }
+             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
+             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 5; }
+             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
+
+             if ( !$RemoveXAxis )
+              {
+               if ( $Floating )
+                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+               else
+                { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+
+               if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+              }
+
+             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+
+             if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / ($Parameters["Rows"]); }
+             
+             $MaxBottom = $AxisPos["B"];
+             for($i=0;$i<=$Parameters["Rows"];$i++)
+              {
+               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+               $YPos  = $AxisPos["B"];
+
+               if ( $Abscissa != NULL )
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
+               else
+                {
+                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                 else
+                  $Value = $i;
+                }
+
+               $ID++; $Skipped = TRUE;
+               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                {
+                 $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                 $TxtBottom = $YPos+$OuterTickWidth+2+($Bounds[0]["Y"]-$Bounds[2]["Y"]);
+                 $MaxBottom = max($MaxBottom,$TxtBottom);
+                 $LastValue = $Value;
+                 $Skipped   = FALSE;
+                }
+
+               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+
+               if ( $Skipped )
+                {
+                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
+                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$SkippedInnerTickWidth,$XPos,$YPos+$SkippedOuterTickWidth,$SkippedTickColor); }
+                }
+               else
+                {
+                 if ( $DrawXLines && ($XPos != $this->GraphAreaX1 && $XPos != $this->GraphAreaX2) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos-$InnerTickWidth,$XPos,$YPos+$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                }
+              }
+
+             if ( isset($Parameters["Name"]) && !$RemoveXAxis)
+              {
+               $YPos   = $MaxBottom+2;
+               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+               $MaxBottom = $Bounds[0]["Y"];
+
+               $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
+              }
+
+             $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
+            }
+           elseif ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            {
+             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_BOTTOMMIDDLE; $YLabelOffset = 2; }
+             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $YLabelOffset = 2; }
+             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_TOPMIDDLE; $YLabelOffset = 5; }
+             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $YLabelOffset = 5; }
+
+             if ( !$RemoveXAxis )
+              {
+               if ( $Floating )
+                { $FloatingOffset = $YMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+               else
+                { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+
+               if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+              }
+
+             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+
+             if ($Parameters["Rows"] == 0 ) { $Step  = $Width; } else { $Step  = $Width / $Parameters["Rows"]; }
+             
+             $MinTop = $AxisPos["T"];
+             for($i=0;$i<=$Parameters["Rows"];$i++)
+              {
+               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+               $YPos  = $AxisPos["T"];
+
+               if ( $Abscissa != NULL )
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
+               else
+                {
+                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                 else
+                  $Value = $i;
+                }
+
+               $ID++; $Skipped = TRUE;
+               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                {
+                 $Bounds = $this->drawText($XPos,$YPos-$OuterTickWidth-$YLabelOffset,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                 $TxtBox = $YPos-$OuterTickWidth-2-($Bounds[0]["Y"]-$Bounds[2]["Y"]);
+                 $MinTop = min($MinTop,$TxtBox);
+                 $LastValue = $Value;
+                 $Skipped   = FALSE;
+                }
+
+               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+
+               if ( $Skipped )
+                {
+                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$SkippedAxisColor); }
+                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$SkippedInnerTickWidth,$XPos,$YPos-$SkippedOuterTickWidth,$SkippedTickColor); }
+                }
+               else
+                {
+                 if ( $DrawXLines ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos,$YPos+$InnerTickWidth,$XPos,$YPos-$OuterTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                }
+
+              }
+
+             if ( isset($Parameters["Name"]) && !$RemoveXAxis )
+              {
+               $YPos   = $MinTop-2;
+               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+               $MinTop = $Bounds[2]["Y"];
+
+               $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
+              }
+
+             $AxisPos["T"] = $MinTop - $ScaleSpacing;
+            }
+          }
+         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
+          {
+           if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
+            {
+             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -2; }
+             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = -6; }
+             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -2; }
+             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = -5; }
+
+             if ( !$RemoveXAxis )
+              {
+               if ( $Floating )
+                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+               else
+                { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+
+               if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+              }
+
+             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+
+             if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
+
+             $MinLeft = $AxisPos["L"];
+             for($i=0;$i<=$Parameters["Rows"];$i++)
+              {
+               $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+               $XPos  = $AxisPos["L"];
+
+               if ( $Abscissa != NULL )
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
+               else
+                {
+                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                 else
+                  $Value = $i;
+                }
+
+               $ID++; $Skipped = TRUE;
+               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                {
+                 $Bounds  = $this->drawText($XPos-$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                 $TxtBox  = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
+                 $MinLeft = min($MinLeft,$TxtBox);
+                 $LastValue = $Value;
+                 $Skipped   = FALSE;
+                }
+
+               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+
+               if ( $Skipped )
+                {
+                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
+                 if ( ($SkippedInnerTickWidth !=0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$SkippedOuterTickWidth,$YPos,$XPos+$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
+                }
+               else
+                {
+                 if ( $DrawXLines && ($YPos != $this->GraphAreaY1 && $YPos != $this->GraphAreaY2) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                 if ( ($InnerTickWidth !=0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                }
+
+              }
+             if ( isset($Parameters["Name"]) && !$RemoveXAxis )
+              {
+               $XPos   = $MinLeft-2;
+               $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
+               $MinLeft = $Bounds[0]["X"];
+
+               $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
+              }
+
+             $AxisPos["L"] = $MinLeft - $ScaleSpacing;
+            }
+           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
+            {
+             if ( $LabelRotation == 0 )					{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 2; }
+             if ( $LabelRotation > 0 && $LabelRotation < 190 )		{ $LabelAlign = TEXT_ALIGN_MIDDLELEFT; $XLabelOffset = 6; }
+             if ( $LabelRotation == 180 )				{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 5; }
+             if ( $LabelRotation > 180 && $LabelRotation < 360 )	{ $LabelAlign = TEXT_ALIGN_MIDDLERIGHT; $XLabelOffset = 7; }
+
+             if ( !$RemoveXAxis )
+              {
+               if ( $Floating )
+                { $FloatingOffset = $YMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+               else
+                { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+
+               if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2+($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+              }
+
+             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+
+             if ($Parameters["Rows"] == 0 ) { $Step  = $Height; } else { $Step   = $Height / $Parameters["Rows"]; }
+             
+             $MaxRight = $AxisPos["R"];
+             for($i=0;$i<=$Parameters["Rows"];$i++)
+              {
+               $YPos  = $this->GraphAreaY1 + $Parameters["Margin"] + $Step*$i;
+               $XPos  = $AxisPos["R"];
+
+               if ( $Abscissa != NULL )
+                { if ( isset($Data["Series"][$Abscissa]["Data"][$i]) ) { $Value = $this->scaleFormat($Data["Series"][$Abscissa]["Data"][$i],$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]); } else { $Value = ""; } }
+               else
+                {
+                 if ( isset($Parameters["ScaleMin"]) && isset ($Parameters["RowHeight"]) )
+                  $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Data["XAxisDisplay"],$Data["XAxisFormat"],$Data["XAxisUnit"]);
+                 else
+                  $Value = $i;
+                }
+
+               $ID++; $Skipped = TRUE;
+               if ( $this->isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip) && !$RemoveXAxis)
+                {
+                 $Bounds   = $this->drawText($XPos+$OuterTickWidth+$XLabelOffset,$YPos,$Value,array("Angle"=>$LabelRotation,"Align"=>$LabelAlign));
+                 $TxtBox   = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
+                 $MaxRight = max($MaxRight,$TxtBox);
+                 $LastValue = $Value;
+                 $Skipped   = FALSE;
+                }
+
+               if ( $RemoveXAxis ) { $Skipped   = FALSE; }
+
+               if ( $Skipped )
+                {
+                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,$SkippedAxisColor); }
+                 if ( ($SkippedInnerTickWidth != 0 || $SkippedOuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$SkippedOuterTickWidth,$YPos,$XPos-$SkippedInnerTickWidth,$YPos,$SkippedTickColor); }
+                }
+               else
+                {
+                 if ( $DrawXLines ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+                 if ( ($InnerTickWidth != 0 || $OuterTickWidth != 0) && !$RemoveXAxis ) { $this->drawLine($XPos+$OuterTickWidth,$YPos,$XPos-$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha)); }
+                }
+
+              }
+
+             if ( isset($Parameters["Name"]) && !$RemoveXAxis)
+              {
+               $XPos   = $MaxRight+4;
+               $YPos   = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
+               $MaxRight = $Bounds[1]["X"];
+
+               $this->DataSet->Data["GraphArea"]["X2"] = $MaxRight + $this->FontSize;
+              }
+
+             $AxisPos["R"] = $MaxRight + $ScaleSpacing;
+            }
+          }
+        }
+
+
+
+       if ( $Parameters["Identity"] == AXIS_Y )
+        {
+         if ( $Pos == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $Parameters["Position"] == AXIS_POSITION_LEFT )
+            {
+
+             if ( $Floating )
+              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+             else
+              { $FloatingOffset = 0; $this->drawLine($AxisPos["L"],$this->GraphAreaY1,$AxisPos["L"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+
+             if ( $DrawArrows ) { $this->drawArrow($AxisPos["L"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["L"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+
+             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+             $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinLeft = $AxisPos["L"];
+             $LastY  = NULL;
+             for($i=0;$i<=$Parameters["Rows"];$i++)
+              {
+               $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
+               $XPos  = $AxisPos["L"];
+               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+
+               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+               if ( $LastY != NULL && $CycleBackground && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
+
+               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+
+               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+
+               $this->drawLine($XPos-$OuterTickWidth,$YPos,$XPos+$InnerTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+               $Bounds  = $this->drawText($XPos-$OuterTickWidth-2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
+               $TxtLeft = $XPos-$OuterTickWidth-2-($Bounds[1]["X"]-$Bounds[0]["X"]);
+               $MinLeft = min($MinLeft,$TxtLeft);
+
+               $LastY = $YPos;
+              }
+
+             if ( isset($Parameters["Name"]) )
+              {
+               $XPos    = $MinLeft-2;
+               $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+               $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>90));
+               $MinLeft = $Bounds[2]["X"];
+
+               $this->DataSet->Data["GraphArea"]["X1"] = $MinLeft;
+              }
+
+             $AxisPos["L"] = $MinLeft - $ScaleSpacing;
+            }
+           elseif ( $Parameters["Position"] == AXIS_POSITION_RIGHT )
+            {
+             if ( $Floating )
+              { $FloatingOffset = $XMargin; $this->drawLine($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY2-$Parameters["Margin"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+             else
+              { $FloatingOffset = 0; $this->drawLine($AxisPos["R"],$this->GraphAreaY1,$AxisPos["R"],$this->GraphAreaY2,array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+
+             if ( $DrawArrows ) { $this->drawArrow($AxisPos["R"],$this->GraphAreaY1+$Parameters["Margin"],$AxisPos["R"],$this->GraphAreaY1-($ArrowSize*2),array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+
+             $Height = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Parameters["Margin"]*2;
+             $Step   = $Height / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxLeft = $AxisPos["R"];
+             $LastY  = NULL;
+             for($i=0;$i<=$Parameters["Rows"];$i++)
+              {
+               $YPos  = $this->GraphAreaY2 - $Parameters["Margin"] - $Step*$i;
+               $XPos  = $AxisPos["R"];
+               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+
+               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+               if ( $LastY != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($this->GraphAreaX1+$FloatingOffset,$LastY,$this->GraphAreaX2-$FloatingOffset,$YPos,$BGColor); }
+
+               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($this->GraphAreaX1+$FloatingOffset,$YPos,$this->GraphAreaX2-$FloatingOffset,$YPos,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+
+               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                $this->drawLine($XPos-$OuterSubTickWidth,$YPos-$SubTicksSize,$XPos+$InnerSubTickWidth,$YPos-$SubTicksSize,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+
+               $this->drawLine($XPos-$InnerTickWidth,$YPos,$XPos+$OuterTickWidth,$YPos,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+               $Bounds  = $this->drawText($XPos+$OuterTickWidth+2,$YPos,$Value,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+               $TxtLeft = $XPos+$OuterTickWidth+2+($Bounds[1]["X"]-$Bounds[0]["X"]);
+               $MaxLeft = max($MaxLeft,$TxtLeft);
+
+               $LastY = $YPos;
+              }
+
+             if ( isset($Parameters["Name"]) )
+              {
+               $XPos    = $MaxLeft+6;
+               $YPos    = $this->GraphAreaY1+($this->GraphAreaY2-$this->GraphAreaY1)/2;
+               $Bounds  = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE,"Angle"=>270));
+               $MaxLeft = $Bounds[2]["X"];
+
+               $this->DataSet->Data["GraphArea"]["X2"] = $MaxLeft + $this->FontSize;
+              }
+             $AxisPos["R"] = $MaxLeft + $ScaleSpacing;
+            }
+          }
+         elseif ( $Pos == SCALE_POS_TOPBOTTOM )
+          {
+           if ( $Parameters["Position"] == AXIS_POSITION_TOP )
+            {
+             if ( $Floating )
+              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+             else
+              { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["T"],$this->GraphAreaX2,$AxisPos["T"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+
+             if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["T"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["T"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+
+             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+             $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MinTop = $AxisPos["T"];
+             $LastX  = NULL;
+             for($i=0;$i<=$Parameters["Rows"];$i++)
+              {
+               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+               $YPos  = $AxisPos["T"];
+               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+
+               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+               if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
+
+               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+
+               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+
+               $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+               $Bounds    = $this->drawText($XPos,$YPos-$OuterTickWidth-2,$Value,array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+               $TxtHeight = $YPos-$OuterTickWidth-2-($Bounds[1]["Y"]-$Bounds[2]["Y"]);
+               $MinTop    = min($MinTop,$TxtHeight);
+
+               $LastX = $XPos;
+              }
+
+             if ( isset($Parameters["Name"]) )
+              {
+               $YPos   = $MinTop-2;
+               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+               $MinTop = $Bounds[2]["Y"];
+
+               $this->DataSet->Data["GraphArea"]["Y1"] = $MinTop;
+              }
+
+             $AxisPos["T"] = $MinTop - $ScaleSpacing;
+            }
+           elseif ( $Parameters["Position"] == AXIS_POSITION_BOTTOM )
+            {
+             if ( $Floating )
+              { $FloatingOffset = $XMargin; $this->drawLine($this->GraphAreaX1+$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+             else
+              { $FloatingOffset = 0; $this->drawLine($this->GraphAreaX1,$AxisPos["B"],$this->GraphAreaX2,$AxisPos["B"],array("R"=>$AxisR,"G"=>$AxisG,"B"=>$AxisB,"Alpha"=>$AxisAlpha)); }
+
+             if ( $DrawArrows ) { $this->drawArrow($this->GraphAreaX2-$Parameters["Margin"],$AxisPos["B"],$this->GraphAreaX2+($ArrowSize*2),$AxisPos["B"],array("FillR"=>$AxisR,"FillG"=>$AxisG,"FillB"=>$AxisB,"Size"=>$ArrowSize)); }
+
+             $Width = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Parameters["Margin"]*2;
+             $Step   = $Width / $Parameters["Rows"]; $SubTicksSize = $Step /2; $MaxBottom = $AxisPos["B"];
+             $LastX  = NULL;
+             for($i=0;$i<=$Parameters["Rows"];$i++)
+              {
+               $XPos  = $this->GraphAreaX1 + $Parameters["Margin"] + $Step*$i;
+               $YPos  = $AxisPos["B"];
+               $Value = $this->scaleFormat($Parameters["ScaleMin"] + $Parameters["RowHeight"]*$i,$Parameters["Display"],$Parameters["Format"],$Parameters["Unit"]);
+
+               if ( $i%2 == 1 ) { $BGColor = array("R"=>$BackgroundR1,"G"=>$BackgroundG1,"B"=>$BackgroundB1,"Alpha"=>$BackgroundAlpha1); } else { $BGColor = array("R"=>$BackgroundR2,"G"=>$BackgroundG2,"B"=>$BackgroundB2,"Alpha"=>$BackgroundAlpha2); }
+               if ( $LastX != NULL && $CycleBackground  && ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) )) { $this->drawFilledRectangle($LastX,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,$BGColor); }
+
+               if ( $DrawYLines == ALL || in_array($AxisID,$DrawYLines) ) { $this->drawLine($XPos,$this->GraphAreaY1+$FloatingOffset,$XPos,$this->GraphAreaY2-$FloatingOffset,array("R"=>$GridR,"G"=>$GridG,"B"=>$GridB,"Alpha"=>$GridAlpha,"Ticks"=>$GridTicks)); }
+
+               if ( $DrawSubTicks && $i != $Parameters["Rows"] )
+                $this->drawLine($XPos+$SubTicksSize,$YPos-$OuterSubTickWidth,$XPos+$SubTicksSize,$YPos+$InnerSubTickWidth,array("R"=>$SubTickR,"G"=>$SubTickG,"B"=>$SubTickB,"Alpha"=>$SubTickAlpha));
+
+               $this->drawLine($XPos,$YPos-$OuterTickWidth,$XPos,$YPos+$InnerTickWidth,array("R"=>$TickR,"G"=>$TickG,"B"=>$TickB,"Alpha"=>$TickAlpha));
+               $Bounds    = $this->drawText($XPos,$YPos+$OuterTickWidth+2,$Value,array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+               $TxtHeight = $YPos+$OuterTickWidth+2+($Bounds[1]["Y"]-$Bounds[2]["Y"]);
+               $MaxBottom = max($MaxBottom,$TxtHeight);
+
+               $LastX = $XPos;
+              }
+
+             if ( isset($Parameters["Name"]) )
+              {
+               $YPos   = $MaxBottom+2;
+               $XPos   = $this->GraphAreaX1+($this->GraphAreaX2-$this->GraphAreaX1)/2;
+               $Bounds = $this->drawText($XPos,$YPos,$Parameters["Name"],array("Align"=>TEXT_ALIGN_TOPMIDDLE));
+               $MaxBottom = $Bounds[0]["Y"];
+
+               $this->DataSet->Data["GraphArea"]["Y2"] = $MaxBottom + $this->FontSize;
+              }
+
+             $AxisPos["B"] = $MaxBottom + $ScaleSpacing;
+            }
+          }
+        }
+      }
+    }
+
+   function isValidLabel($Value,$LastValue,$LabelingMethod,$ID,$LabelSkip)
+    {
+     if ( $LabelingMethod == LABELING_DIFFERENT && $Value != $LastValue ) { return(TRUE); }
+     if ( $LabelingMethod == LABELING_DIFFERENT && $Value == $LastValue ) { return(FALSE); }
+     if ( $LabelingMethod == LABELING_ALL && $LabelSkip == 0 ) { return(TRUE); }
+     if ( $LabelingMethod == LABELING_ALL && ($ID+$LabelSkip) % ($LabelSkip+1) != 1 ) { return(FALSE); }
+
+     return(TRUE);
+    }
+
+   /* Compute the scale, check for the best visual factors */
+   function computeScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID=0)
+    {
+     /* Compute each factors */
+     $Results = "";
+     foreach ($Factors as $Key => $Factor)
+      $Results[$Factor] = $this->processScale($XMin,$XMax,$MaxDivs,array($Factor),$AxisID);
+
+     /* Remove scales that are creating to much decimals */
+     $GoodScaleFactors = "";
+     foreach ($Results as $Key => $Result)
+      {
+       $Decimals = preg_split("/\./",$Result["RowHeight"]);
+       if ( (!isset($Decimals[1])) || (strlen($Decimals[1]) < 6) ) { $GoodScaleFactors[] = $Key; }
+      }
+
+     /* Found no correct scale, shame,... returns the 1st one as default */
+     if ( $GoodScaleFactors == "" ) { return($Results[$Factors[0]]); }
+
+     /* Find the factor that cause the maximum number of Rows */
+     $MaxRows = 0; $BestFactor = 0;
+     foreach($GoodScaleFactors as $Key => $Factor)
+      { if ( $Results[$Factor]["Rows"] > $MaxRows ) { $MaxRows = $Results[$Factor]["Rows"]; $BestFactor = $Factor; } }
+
+     /* Return the best visual scale */
+     return($Results[$BestFactor]);
+    }
+
+   /* Compute the best matching scale based on size & factors */
+   function processScale($XMin,$XMax,$MaxDivs,$Factors,$AxisID)
+    {
+     $ScaleHeight = abs(ceil($XMax)-floor($XMin));
+
+     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Format"]) )
+      $Format = $this->DataSet->Data["Axis"][$AxisID]["Format"];
+     else
+      $Format = NULL;
+
+     if ( isset($this->DataSet->Data["Axis"][$AxisID]["Display"]) )
+      $Mode = $this->DataSet->Data["Axis"][$AxisID]["Display"];
+     else
+      $Mode = AXIS_FORMAT_DEFAULT;
+
+     $Scale = "";
+     if ( $XMin != $XMax )
+      {
+       $Found = FALSE; $Rescaled = FALSE; $Scaled10Factor = .0001; $Result = 0;
+       while(!$Found)
+        {
+         foreach($Factors as $Key => $Factor)
+          {
+           if ( !$Found )
+            {
+             if ( !($this->modulo($XMin,$Factor*$Scaled10Factor) == 0) || ($XMin != floor($XMin))) { $XMinRescaled = floor($XMin/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor; } else { $XMinRescaled = $XMin; }
+             if ( !($this->modulo($XMax,$Factor*$Scaled10Factor) == 0) || ($XMax != floor($XMax))) { $XMaxRescaled = floor($XMax/($Factor*$Scaled10Factor))*$Factor*$Scaled10Factor+($Factor*$Scaled10Factor); } else { $XMaxRescaled = $XMax; }
+             $ScaleHeightRescaled = abs($XMaxRescaled-$XMinRescaled);
+
+             if ( !$Found && floor($ScaleHeightRescaled/($Factor*$Scaled10Factor)) <= $MaxDivs ) { $Found = TRUE; $Rescaled = TRUE; $Result = $Factor * $Scaled10Factor; }
+            }
+          }
+         $Scaled10Factor = $Scaled10Factor * 10;
+        }
+
+       /* ReCall Min / Max / Height */
+       if ( $Rescaled ) { $XMin = $XMinRescaled; $XMax = $XMaxRescaled; $ScaleHeight = $ScaleHeightRescaled; }
+
+       /* Compute rows size */
+       $Rows      = floor($ScaleHeight / $Result); if ( $Rows == 0 ) { $Rows = 1; }
+       $RowHeight = $ScaleHeight / $Rows;
+
+       /* Return the results */
+       $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
+
+       /* Compute the needed decimals for the metric view to avoid repetition of the same X Axis labels */
+       if ( $Mode == AXIS_FORMAT_METRIC && $Format == NULL )
+        {
+         $Done = FALSE; $GoodDecimals = 0;
+         for($Decimals=0;$Decimals<=10;$Decimals++)
+          {
+           if ( !$Done )
+            {
+             $LastLabel = "zob"; $ScaleOK = TRUE;
+             for($i=0;$i<=$Rows;$i++)
+              {
+               $Value = $XMin + $i*$RowHeight;
+               $Label = $this->scaleFormat($Value,AXIS_FORMAT_METRIC,$Decimals);
+
+               if ( $LastLabel == $Label ) { $ScaleOK = FALSE; }
+               $LastLabel = $Label;
+              }
+             if ( $ScaleOK ) { $Done = TRUE; $GoodDecimals = $Decimals; }
+            }
+          }
+
+         $Scale["Format"] = $GoodDecimals;
+        }
+      }
+     else
+      {
+       /* If all values are the same we keep a +1/-1 scale */
+       $Rows = 2; $XMin = $XMax-1; $XMax = $XMax+1; $RowHeight = 1;
+
+       /* Return the results */
+       $Scale["Rows"] = $Rows; $Scale["RowHeight"] = $RowHeight; $Scale["XMin"] = $XMin;  $Scale["XMax"] = $XMax;
+      }
+
+     return($Scale);
+    }
+
+   function modulo($Value1,$Value2)
+    {
+     if (floor($Value2) == 0) { return(0); }
+     if (floor($Value2) != 0) { return($Value1 % $Value2); }
+
+     $MinValue = min($Value1,$Value2); $Factor = 10;
+     while ( floor($MinValue*$Factor) == 0 )
+      { $Factor = $Factor * 10; }
+
+     return(($Value1*$Factor) % ($Value2*$Factor));
+    }
+
+   /* Draw an X threshold */
+   function drawXThreshold($Value,$Format="")
+    {
+     $R			= isset($Format["R"]) ? $Format["R"] : 255;
+     $G			= isset($Format["G"]) ? $Format["G"] : 0;
+     $B			= isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
+     $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
+     $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
+     $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
+     $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
+     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
+     $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
+     $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 5;
+     $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+     $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+     $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+     $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 3;
+     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 30;
+     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+     $ValueIsLabel	= isset($Format["ValueIsLabel"]) ? $Format["ValueIsLabel"] : FALSE;
+
+     $Data           = $this->DataSet->getData();
+     $AbscissaMargin = $this->getAbscissaMargin($Data);
+     $XScale         = $this->scaleGetXSettings();
+
+     if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawXThreshold($ID,$Format); } return(0); }
+
+     if ( $ValueIsLabel )
+      {
+       $Format["ValueIsLabel"] = FALSE;
+       foreach($Data["Series"][$Data["Abscissa"]]["Data"] as $Key => $SerieValue)
+        { if ( $SerieValue == $Value ) { $this->drawXThreshold($Key,$Format); } }
+
+       return(0);
+      }
+
+     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
+                              "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
+
+     if ( $Caption == NULL )
+      {
+       if ( isset($Data["Abscissa"]) )
+        {
+         if ( isset($Data["Series"][$Data["Abscissa"]]["Data"][$Value]) )
+          $Caption = $Data["Series"][$Data["Abscissa"]]["Data"][$Value];
+         else
+          $Caption = $Value;
+        }
+       else
+        $Caption = $Value;
+      }
+
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+      {
+       $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
+       $XPos  = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value;
+       $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
+       $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
+
+       if ( $XPos >= $this->GraphAreaX1 + $AbscissaMargin && $XPos <= $this->GraphAreaX2 - $AbscissaMargin )
+        {
+         $this->drawLine($XPos,$YPos1,$XPos,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+         if ( $Wide )
+          {
+           $this->drawLine($XPos-1,$YPos1,$XPos-1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+           $this->drawLine($XPos+1,$YPos1,$XPos+1,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+          }
+
+         if ( $WriteCaption )
+          {
+           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
+           else 
+            { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
+           
+           $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
+          }
+
+         return(array("X"=>$XPos));
+        }
+      }
+     elseif( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+      {
+       $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
+       $XPos  = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value;
+       $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
+       $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
+
+       if ( $XPos >= $this->GraphAreaY1 + $AbscissaMargin && $XPos <= $this->GraphAreaY2 - $AbscissaMargin )
+        {
+         $this->drawLine($YPos1,$XPos,$YPos2,$XPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+         if ( $Wide )
+          {
+           $this->drawLine($YPos1,$XPos-1,$YPos2,$XPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+           $this->drawLine($YPos1,$XPos+1,$YPos2,$XPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+          }
+
+         if ( $WriteCaption )
+          {
+           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            { $Y = $YPos1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
+           else 
+            { $Y = $YPos2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
+           
+           $this->drawText($Y,$XPos,$Caption,$CaptionSettings);
+          }
+
+         return(array("X"=>$XPos));
+        }
+      }
+    }
+
+   /* Draw an X threshold area */
+   function drawXThresholdArea($Value1,$Value2,$Format="")
+    {
+     $R		= isset($Format["R"]) ? $Format["R"] : 255;
+     $G		= isset($Format["G"]) ? $Format["G"] : 0;
+     $B		= isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
+     $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
+     $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+     $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+     $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+     $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
+     $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
+     $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
+     $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
+     $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
+     $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
+     $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
+     $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
+     $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
+
+     $RestoreShadow = $this->Shadow;
+     if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
+
+     if ($BorderAlpha >100) { $BorderAlpha = 100;}
+
+     $Data           = $this->DataSet->getData();
+     $XScale         = $this->scaleGetXSettings();
+     $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+      {
+       $XStep = (($this->GraphAreaX2 - $this->GraphAreaX1) - $XScale[0] *2 ) / $XScale[1];
+       $XPos1 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value1;
+       $XPos2 = $this->GraphAreaX1 + $XScale[0] + $XStep * $Value2;
+       $YPos1 = $this->GraphAreaY1 + $Data["YMargin"];
+       $YPos2 = $this->GraphAreaY2 - $Data["YMargin"];
+
+       if ( $XPos1 < $this->GraphAreaX1 + $XScale[0] ) { $XPos1 = $this->GraphAreaX1 + $XScale[0]; }
+       if ( $XPos1 > $this->GraphAreaX2 - $XScale[0] ) { $XPos1 = $this->GraphAreaX2 - $XScale[0]; }
+       if ( $XPos2 < $this->GraphAreaX1 + $XScale[0] ) { $XPos2 = $this->GraphAreaX1 + $XScale[0]; }
+       if ( $XPos2 > $this->GraphAreaX2 - $XScale[0] ) { $XPos2 = $this->GraphAreaX2 - $XScale[0]; }
+
+       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+       if ( $Border )
+        {
+         $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+         $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+       if ( $AreaName != NULL )
+        {
+         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+
+         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
+          {
+           $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
+           $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
+           if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
+          }
+         $this->Shadow = $RestoreShadow;
+         $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+       $this->Shadow = $RestoreShadow;
+       return(array("X1"=>$XPos1,"X2"=>$XPos2));
+      }
+     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+      {
+       $XStep = (($this->GraphAreaY2 - $this->GraphAreaY1) - $XScale[0] *2 ) / $XScale[1];
+       $XPos1 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value1;
+       $XPos2 = $this->GraphAreaY1 + $XScale[0] + $XStep * $Value2;
+       $YPos1 = $this->GraphAreaX1 + $Data["YMargin"];
+       $YPos2 = $this->GraphAreaX2 - $Data["YMargin"];
+
+       if ( $XPos1 < $this->GraphAreaY1 + $XScale[0] ) { $XPos1 = $this->GraphAreaY1 + $XScale[0]; }
+       if ( $XPos1 > $this->GraphAreaY2 - $XScale[0] ) { $XPos1 = $this->GraphAreaY2 - $XScale[0]; }
+       if ( $XPos2 < $this->GraphAreaY1 + $XScale[0] ) { $XPos2 = $this->GraphAreaY1 + $XScale[0]; }
+       if ( $XPos2 > $this->GraphAreaY2 - $XScale[0] ) { $XPos2 = $this->GraphAreaY2 - $XScale[0]; }
+
+       $this->drawFilledRectangle($YPos1,$XPos1,$YPos2,$XPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+
+       if ( $Border )
+        {
+         $this->drawLine($YPos1,$XPos1,$YPos2,$XPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+         $this->drawLine($YPos1,$XPos2,$YPos2,$XPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+       if ( $AreaName != NULL )
+        {
+         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+
+         $this->Shadow = $RestoreShadow;
+         $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+       $this->Shadow = $RestoreShadow;
+       return(array("X1"=>$XPos1,"X2"=>$XPos2));
+      }
+    }
+
+   /* Draw an Y threshold with the computed scale */
+   function drawThreshold($Value,$Format="")
+    {
+     $AxisID		= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+     $R			= isset($Format["R"]) ? $Format["R"] : 255;
+     $G			= isset($Format["G"]) ? $Format["G"] : 0;
+     $B			= isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 50;
+     $Weight		= isset($Format["Weight"]) ? $Format["Weight"] : NULL;
+     $Ticks		= isset($Format["Ticks"]) ? $Format["Ticks"] : 6;
+     $Wide		= isset($Format["Wide"]) ? $Format["Wide"] : FALSE;
+     $WideFactor	= isset($Format["WideFactor"]) ? $Format["WideFactor"] : 5;
+     $WriteCaption	= isset($Format["WriteCaption"]) ? $Format["WriteCaption"] : FALSE;
+     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : NULL;
+     $CaptionAlign	= isset($Format["CaptionAlign"]) ? $Format["CaptionAlign"] : CAPTION_LEFT_TOP;
+     $CaptionOffset     = isset($Format["CaptionOffset"]) ? $Format["CaptionOffset"] : 10;
+     $CaptionR		= isset($Format["CaptionR"]) ? $Format["CaptionR"] : 255;
+     $CaptionG		= isset($Format["CaptionG"]) ? $Format["CaptionG"] : 255;
+     $CaptionB		= isset($Format["CaptionB"]) ? $Format["CaptionB"] : 255;
+     $CaptionAlpha	= isset($Format["CaptionAlpha"]) ? $Format["CaptionAlpha"] : 100;
+     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
+     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
+     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+     $NoMargin		= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
+
+     if ( is_array($Value) ) { foreach ($Value as $Key => $ID) { $this->drawThreshold($ID,$Format); } return(0); }
+
+     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha,
+                              "R"=>$CaptionR,"G"=>$CaptionG,"B"=>$CaptionB,"Alpha"=>$CaptionAlpha);
+
+     $Data           = $this->DataSet->getData();
+     $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+     if ( $NoMargin ) { $AbscissaMargin = 0; }
+     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+     if ( $Caption == NULL ) { $Caption = $Value; }
+
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+      {
+       $YPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
+       if ( $YPos >= $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] && $YPos <= $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] )
+        {
+         $X1 = $this->GraphAreaX1 + $AbscissaMargin;
+         $X2 = $this->GraphAreaX2 - $AbscissaMargin;
+
+         $this->drawLine($X1,$YPos,$X2,$YPos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+         if ( $Wide )
+          {
+           $this->drawLine($X1,$YPos-1,$X2,$YPos-1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+           $this->drawLine($X1,$YPos+1,$X2,$YPos+1,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+          }
+
+         if ( $WriteCaption )
+          {
+           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            { $X = $X1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLELEFT; }
+           else 
+            { $X = $X2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_MIDDLERIGHT; }
+           
+           $this->drawText($X,$YPos,$Caption,$CaptionSettings);
+          }
+        }
+
+       return(array("Y"=>$YPos));
+      }
+
+     if ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+      {
+       $XPos = $this->scaleComputeY($Value,array("AxisID"=>$AxisID));
+       if ( $XPos >= $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] && $XPos <= $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] )
+        {
+         $Y1 = $this->GraphAreaY1 + $AbscissaMargin;
+         $Y2 = $this->GraphAreaY2 - $AbscissaMargin;
+
+         $this->drawLine($XPos,$Y1,$XPos,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+         if ( $Wide )
+          {
+           $this->drawLine($XPos-1,$Y1,$XPos-1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+           $this->drawLine($XPos+1,$Y1,$XPos+1,$Y2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/$WideFactor,"Ticks"=>$Ticks));
+          }
+
+         if ( $WriteCaption )
+          {
+           if ( $CaptionAlign == CAPTION_LEFT_TOP )
+            { $Y = $Y1 + $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE; }
+           else 
+            { $Y = $Y2 - $CaptionOffset; $CaptionSettings["Align"] = TEXT_ALIGN_BOTTOMMIDDLE; }
+
+           $CaptionSettings["Align"] = TEXT_ALIGN_TOPMIDDLE;
+           $this->drawText($XPos,$Y,$Caption,$CaptionSettings);
+          }
+        }
+
+       return(array("Y"=>$XPos));
+      }
+    }
+
+   /* Draw a threshold with the computed scale */
+   function drawThresholdArea($Value1,$Value2,$Format="")
+    {
+     $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+     $R		= isset($Format["R"]) ? $Format["R"] : 255;
+     $G		= isset($Format["G"]) ? $Format["G"] : 0;
+     $B		= isset($Format["B"]) ? $Format["B"] : 0;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 20;
+     $Border    = isset($Format["Border"]) ? $Format["Border"] : TRUE;
+     $BorderR   = isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+     $BorderG   = isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+     $BorderB   = isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+     $BorderAlpha = isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha + 20;
+     $BorderTicks = isset($Format["BorderTicks"]) ? $Format["BorderTicks"] : 2;
+     $AreaName 	= isset($Format["AreaName"]) ? $Format["AreaName"] : NULL;
+     $NameAngle	= isset($Format["NameAngle"]) ? $Format["NameAngle"] : ZONE_NAME_ANGLE_AUTO;
+     $NameR	= isset($Format["NameR"]) ? $Format["NameR"] : 255;
+     $NameG	= isset($Format["NameG"]) ? $Format["NameG"] : 255;
+     $NameB	= isset($Format["NameB"]) ? $Format["NameB"] : 255;
+     $NameAlpha	= isset($Format["NameAlpha"]) ? $Format["NameAlpha"] : 100;
+     $DisableShadowOnArea = isset($Format["DisableShadowOnArea"]) ? $Format["DisableShadowOnArea"] : TRUE;
+     $NoMargin	= isset($Format["NoMargin"]) ? $Format["NoMargin"] : FALSE;
+
+     if ($Value1 > $Value2) { list($Value1, $Value2) = array($Value2, $Value1); }
+
+     $RestoreShadow = $this->Shadow;
+     if ( $DisableShadowOnArea && $this->Shadow ) { $this->Shadow = FALSE; }
+
+     if ($BorderAlpha >100) { $BorderAlpha = 100;}
+
+     $Data           = $this->DataSet->getData();
+     $AbscissaMargin = $this->getAbscissaMargin($Data);
+
+     if ( $NoMargin ) { $AbscissaMargin = 0; }
+     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+      {
+       $XPos1 = $this->GraphAreaX1 + $AbscissaMargin;
+       $XPos2 = $this->GraphAreaX2 - $AbscissaMargin;
+       $YPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
+       $YPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
+
+       if ( $YPos1 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
+       if ( $YPos1 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos1 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
+       if ( $YPos2 < $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY1+$Data["Axis"][$AxisID]["Margin"]; }
+       if ( $YPos2 > $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"] ) { $YPos2 = $this->GraphAreaY2-$Data["Axis"][$AxisID]["Margin"]; }
+
+       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+       if ( $Border )
+        {
+         $this->drawLine($XPos1,$YPos1,$XPos2,$YPos1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+         $this->drawLine($XPos1,$YPos2,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+       if ( $AreaName != NULL )
+        {
+         $XPos = ($XPos2-$XPos1)/2 + $XPos1;
+         $YPos = ($YPos2-$YPos1)/2 + $YPos1;
+         $this->Shadow = $RestoreShadow;
+         $this->drawText($XPos,$YPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>0,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+       $this->Shadow = $RestoreShadow;
+       return(array("Y1"=>$YPos1,"Y2"=>$YPos2));
+      }
+     elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+      {
+       $YPos1 = $this->GraphAreaY1 + $AbscissaMargin;
+       $YPos2 = $this->GraphAreaY2 - $AbscissaMargin;
+       $XPos1 = $this->scaleComputeY($Value1,array("AxisID"=>$AxisID));
+       $XPos2 = $this->scaleComputeY($Value2,array("AxisID"=>$AxisID));
+
+       if ( $XPos1 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
+       if ( $XPos1 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos1 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
+       if ( $XPos2 < $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX1+$Data["Axis"][$AxisID]["Margin"]; }
+       if ( $XPos2 > $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"] ) { $XPos2 = $this->GraphAreaX2-$Data["Axis"][$AxisID]["Margin"]; }
+
+       $this->drawFilledRectangle($XPos1,$YPos1,$XPos2,$YPos2,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+       if ( $Border )
+        {
+         $this->drawLine($XPos1,$YPos1,$XPos1,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+         $this->drawLine($XPos2,$YPos1,$XPos2,$YPos2,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Ticks"=>$BorderTicks));
+        }
+
+       if ( $AreaName != NULL )
+        {
+         $XPos = ($YPos2-$YPos1)/2 + $YPos1;
+         $YPos = ($XPos2-$XPos1)/2 + $XPos1;
+
+         if ( $NameAngle == ZONE_NAME_ANGLE_AUTO )
+          {
+           $TxtPos   = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$AreaName);
+           $TxtWidth = $TxtPos[1]["X"] - $TxtPos[0]["X"];
+           if ( abs($XPos2 - $XPos1) > $TxtWidth ) { $NameAngle = 0; } else { $NameAngle = 90; }
+          }
+         $this->Shadow = $RestoreShadow;
+         $this->drawText($YPos,$XPos,$AreaName,array("R"=>$NameR,"G"=>$NameG,"B"=>$NameB,"Alpha"=>$NameAlpha,"Angle"=>$NameAngle,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE));
+         if ( $DisableShadowOnArea ) { $this->Shadow = FALSE; }
+        }
+
+       $this->Shadow = $RestoreShadow;
+       return(array("Y1"=>$XPos1,"Y2"=>$XPos2));
+      }
+    }
+
+   function scaleGetXSettings()
+    {
+     $Data = $this->DataSet->getData();
+     foreach($Data["Axis"] as $AxisID => $Settings)
+      {
+       if ( $Settings["Identity"] == AXIS_X )
+        {
+         $Rows = $Settings["Rows"];
+
+         return(array($Settings["Margin"],$Rows));
+        }
+      }
+    }
+
+   function scaleComputeY($Values,$Option="",$ReturnOnly0Height=FALSE)
+    {
+     $AxisID	= isset($Option["AxisID"]) ? $Option["AxisID"] : 0;
+     $SerieName	= isset($Option["SerieName"]) ? $Option["SerieName"] : NULL;
+
+     $Data = $this->DataSet->getData();
+     if ( !isset($Data["Axis"][$AxisID]) ) { return(-1); }
+
+     if ( $SerieName != NULL ) { $AxisID = $Data["Series"][$SerieName]["Axis"]; }
+     if ( !is_array($Values) ) { $tmp = $Values; $Values = ""; $Values[0] = $tmp; }
+
+     $Result = "";
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+      {
+       $Height      = ($this->GraphAreaY2 - $this->GraphAreaY1) - $Data["Axis"][$AxisID]["Margin"]*2;
+       $ScaleHeight = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
+       $Step        = $Height / $ScaleHeight;
+
+       if ( $ReturnOnly0Height )
+        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
+       else
+        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaY2 - $Data["Axis"][$AxisID]["Margin"] - ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
+      }
+     else
+      {
+       $Width      = ($this->GraphAreaX2 - $this->GraphAreaX1) - $Data["Axis"][$AxisID]["Margin"]*2;
+       $ScaleWidth = $Data["Axis"][$AxisID]["ScaleMax"] - $Data["Axis"][$AxisID]["ScaleMin"];
+       $Step       = $Width / $ScaleWidth;
+
+       if ( $ReturnOnly0Height )
+        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $Step * $Value; } } }
+       else
+        { foreach($Values as $Key => $Value) { if ( $Value == VOID ) { $Result[] = VOID; } else { $Result[] = $this->GraphAreaX1 + $Data["Axis"][$AxisID]["Margin"] + ($Step * ($Value-$Data["Axis"][$AxisID]["ScaleMin"])); } } }
+      }
+
+     if ( count($Result) == 1 )
+      return($Result[0]);
+     else
+      return($Result);
+    }
+
+   /* Format the axis values */
+   function scaleFormat($Value,$Mode=NULL,$Format=NULL,$Unit=NULL)
+    {
+     if ( $Value == VOID ) { return(""); }
+
+     if ( $Mode == AXIS_FORMAT_CUSTOM )
+      { if ( function_exists($Format) ) { return(call_user_func($Format,$Value)); } }
+
+     if ( $Mode == AXIS_FORMAT_DATE )
+      { if ( $Format == NULL ) { $Pattern = "d/m/Y"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
+
+     if ( $Mode == AXIS_FORMAT_TIME )
+      { if ( $Format == NULL ) { $Pattern = "H:i:s"; } else { $Pattern = $Format; } return(date($Pattern,$Value)); }
+
+     if ( $Mode == AXIS_FORMAT_CURRENCY )
+      { return($Format.number_format($Value,2)); }
+
+     if ( $Mode == AXIS_FORMAT_METRIC )
+      {
+       if (abs($Value) > 1000000000)
+        return(round($Value/1000000000,$Format)."g".$Unit);
+       if (abs($Value) > 1000000)
+        return(round($Value/1000000,$Format)."m".$Unit);
+       elseif (abs($Value) >= 1000)
+        return(round($Value/1000,$Format)."k".$Unit);
+       
+      }
+     return($Value.$Unit);
+    }
+
+   /* Write Max value on a chart */
+   function writeBounds($Type=BOUND_BOTH,$Format=NULL)
+    {
+     $MaxLabelTxt	= isset($Format["MaxLabelTxt"]) ? $Format["MaxLabelTxt"] : "max=";
+     $MinLabelTxt	= isset($Format["MinLabelTxt"]) ? $Format["MinLabelTxt"] : "min=";
+     $Decimals		= isset($Format["Decimals"]) ? $Format["Decimals"] : 1;
+     $ExcludedSeries	= isset($Format["ExcludedSeries"]) ? $Format["ExcludedSeries"] : "";
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $MaxDisplayR	= isset($Format["MaxDisplayR"]) ? $Format["MaxDisplayR"] : 0;
+     $MaxDisplayG	= isset($Format["MaxDisplayG"]) ? $Format["MaxDisplayG"] : 0;
+     $MaxDisplayB	= isset($Format["MaxDisplayB"]) ? $Format["MaxDisplayB"] : 0;
+     $MinDisplayR	= isset($Format["MinDisplayR"]) ? $Format["MinDisplayR"] : 255;
+     $MinDisplayG	= isset($Format["MinDisplayG"]) ? $Format["MinDisplayG"] : 255;
+     $MinDisplayB	= isset($Format["MinDisplayB"]) ? $Format["MinDisplayB"] : 255;
+     $MinLabelPos	= isset($Format["MinLabelPos"]) ? $Format["MinLabelPos"] : BOUND_LABEL_POS_AUTO;
+     $MaxLabelPos	= isset($Format["MaxLabelPos"]) ? $Format["MaxLabelPos"] : BOUND_LABEL_POS_AUTO;
+     $DrawBox		= isset($Format["DrawBox"]) ? $Format["DrawBox"] : TRUE;
+     $DrawBoxBorder	= isset($Format["DrawBoxBorder"]) ? $Format["DrawBoxBorder"] : FALSE;
+     $BorderOffset	= isset($Format["BorderOffset"]) ? $Format["BorderOffset"] : 5;
+     $BoxRounded	= isset($Format["BoxRounded"]) ? $Format["BoxRounded"] : TRUE;
+     $RoundedRadius	= isset($Format["RoundedRadius"]) ? $Format["RoundedRadius"] : 3;
+     $BoxR		= isset($Format["BoxR"]) ? $Format["BoxR"] : 0;
+     $BoxG		= isset($Format["BoxG"]) ? $Format["BoxG"] : 0;
+     $BoxB		= isset($Format["BoxB"]) ? $Format["BoxB"] : 0;
+     $BoxAlpha		= isset($Format["BoxAlpha"]) ? $Format["BoxAlpha"] : 20;
+     $BoxSurrounding	= isset($Format["BoxSurrounding"]) ? $Format["BoxSurrounding"] : "";
+     $BoxBorderR	= isset($Format["BoxBorderR"]) ? $Format["BoxBorderR"] : 255;
+     $BoxBorderG	= isset($Format["BoxBorderG"]) ? $Format["BoxBorderG"] : 255;
+     $BoxBorderB	= isset($Format["BoxBorderB"]) ? $Format["BoxBorderB"] : 255;
+     $BoxBorderAlpha	= isset($Format["BoxBorderAlpha"]) ? $Format["BoxBorderAlpha"] : 100;
+
+     $CaptionSettings = array("DrawBox"=>$DrawBox,"DrawBoxBorder"=>$DrawBoxBorder,"BorderOffset"=>$BorderOffset,"BoxRounded"=>$BoxRounded,"RoundedRadius"=>$RoundedRadius,
+                              "BoxR"=>$BoxR,"BoxG"=>$BoxG,"BoxB"=>$BoxB,"BoxAlpha"=>$BoxAlpha,"BoxSurrounding"=>$BoxSurrounding,
+                              "BoxBorderR"=>$BoxBorderR,"BoxBorderG"=>$BoxBorderG,"BoxBorderB"=>$BoxBorderB,"BoxBorderAlpha"=>$BoxBorderAlpha);
+
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     $Data = $this->DataSet->getData();
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] && !isset($ExcludedSeries[$SerieName]))
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+         $MinValue = $this->DataSet->getMin($SerieName);
+         $MaxValue = $this->DataSet->getMax($SerieName);
+
+         $MinPos = VOID; $MaxPos = VOID;
+         foreach($Serie["Data"] as $Key => $Value)
+          { 
+           if ( $Value == $MinValue && $MinPos == VOID ) { $MinPos = $Key; }
+           if ( $Value == $MaxValue ) { $MaxPos = $Key; }
+          }
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           $XStep       = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs;
+           $X           = $this->GraphAreaX1 + $XMargin;
+           $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
+
+           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
+            {
+             if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
+             if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
+
+             $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
+             $Label = $MaxLabelTxt.$this->scaleFormat(round($MaxValue,$Decimals),$Mode,$Format,$Unit);
+
+             $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
+             $XOffset = 0; $YOffset = 0;
+             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
+             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
+             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
+             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
+
+             $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
+             $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
+
+             $this->drawText($XPos+$XOffset,$YPos+$YOffset,$Label,$CaptionSettings);
+            }
+
+           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
+            {
+             if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_BOTTOMMIDDLE; }
+             if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_TOPMIDDLE; }
+
+             $XPos  = $X + $MinPos*$XStep + $SerieOffset;
+             $Label = $MinLabelTxt.$this->scaleFormat(round($MinValue,$Decimals),$Mode,$Format,$Unit);
+
+             $TxtPos  = $this->getTextBox($XPos,$YPos,$this->FontName,$this->FontSize,0,$Label);
+             $XOffset = 0; $YOffset = 0;
+             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = (($this->GraphAreaX1 - $TxtPos[0]["X"])/2); }
+             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -(($TxtPos[1]["X"] - $this->GraphAreaX2)/2); }
+             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $TxtPos[2]["Y"]; }
+             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -($TxtPos[0]["Y"] - $this->GraphAreaY2); }
+
+             $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
+             $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
+
+             $this->drawText($XPos+$XOffset,$YPos-$DisplayOffset+$YOffset,$Label,$CaptionSettings);
+            }
+          }
+         else
+          {
+           $XStep       = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs;
+           $X           = $this->GraphAreaY1 + $XMargin;
+           $SerieOffset = isset($Serie["XOffset"]) ? $Serie["XOffset"] : 0;
+
+           if ( $Type == BOUND_MAX || $Type == BOUND_BOTH )
+            {
+             if ( $MaxLabelPos == BOUND_LABEL_POS_TOP    || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue >= 0) ) { $YPos  = $PosArray[$MaxPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
+             if ( $MaxLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MaxLabelPos ==  BOUND_LABEL_POS_AUTO && $MaxValue < 0) ) { $YPos  = $PosArray[$MaxPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
+
+             $XPos  = $X + $MaxPos*$XStep + $SerieOffset;
+             $Label = $MaxLabelTxt.$this->scaleFormat($MaxValue,$Mode,$Format,$Unit);
+
+             $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
+             $XOffset = 0; $YOffset = 0;
+             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
+             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
+             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
+             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
+
+             $CaptionSettings["R"] = $MaxDisplayR; $CaptionSettings["G"] = $MaxDisplayG;
+             $CaptionSettings["B"] = $MaxDisplayB; $CaptionSettings["Align"] = $Align;
+
+             $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
+            }
+
+           if ( $Type == BOUND_MIN || $Type == BOUND_BOTH )
+            {
+             if ( $MinLabelPos == BOUND_LABEL_POS_TOP    || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue >= 0) ) { $YPos  = $PosArray[$MinPos] + $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLELEFT; }
+             if ( $MinLabelPos == BOUND_LABEL_POS_BOTTOM || ( $MinLabelPos ==  BOUND_LABEL_POS_AUTO && $MinValue < 0) ) { $YPos  = $PosArray[$MinPos] - $DisplayOffset + 2; $Align = TEXT_ALIGN_MIDDLERIGHT; }
+
+             $XPos  = $X + $MinPos*$XStep + $SerieOffset;
+             $Label = $MinLabelTxt.$this->scaleFormat($MinValue,$Mode,$Format,$Unit);
+
+             $TxtPos  = $this->getTextBox($YPos,$XPos,$this->FontName,$this->FontSize,0,$Label);
+             $XOffset = 0; $YOffset = 0;
+             if ( $TxtPos[0]["X"] < $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $TxtPos[0]["X"]; }
+             if ( $TxtPos[1]["X"] > $this->GraphAreaX2 ) { $XOffset = -($TxtPos[1]["X"] - $this->GraphAreaX2); }
+             if ( $TxtPos[2]["Y"] < $this->GraphAreaY1 ) { $YOffset = ($this->GraphAreaY1 - $TxtPos[2]["Y"])/2; }
+             if ( $TxtPos[0]["Y"] > $this->GraphAreaY2 ) { $YOffset = -(($TxtPos[0]["Y"] - $this->GraphAreaY2)/2);}
+
+             $CaptionSettings["R"] = $MinDisplayR; $CaptionSettings["G"] = $MinDisplayG;
+             $CaptionSettings["B"] = $MinDisplayB; $CaptionSettings["Align"] = $Align;
+
+             $this->drawText($YPos+$XOffset,$XPos+$YOffset,$Label,$CaptionSettings);
+            }
+          }
+        }
+      }
+    }
+
+   /* Draw a plot chart */
+   function drawPlotChart($Format=NULL)
+    {
+     $PlotSize		= isset($Format["PlotSize"]) ? $Format["PlotSize"] : NULL;
+     $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : FALSE;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 50;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 50;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 50;
+     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 30;
+     $BorderSize	= isset($Format["BorderSize"]) ? $Format["BorderSize"] : 2;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 4;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         if ( isset($Serie["Weight"]) ) { $SerieWeight = $Serie["Weight"] + 2; } else { $SerieWeight = 2; }
+         if ( $PlotSize != NULL ) { $SerieWeight = $PlotSize; }
+
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+         if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+         if ( isset($Serie["Picture"]) )
+          { $Picture = $Serie["Picture"]; list($PicWidth,$PicHeight,$PicType) = $this->getPicInfo($Picture); }
+         else { $Picture = NULL; $PicOffset = 0; }
+
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+         $AxisID	= $Serie["Axis"];
+         $Shape		= $Serie["Shape"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           if ( $Picture != NULL ) { $PicOffset = $PicHeight / 2; $SerieWeight = 0; }
+           $X = $this->GraphAreaX1 + $XMargin;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $DisplayValues ) 
+              $this->drawText($X,$Y-$DisplayOffset-$SerieWeight-$BorderSize-$PicOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+             if ( $Y != VOID )
+              {
+               if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+               if ( $Picture != NULL )
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
+               else
+                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
+              }
+             $X = $X + $XStep;
+            }
+          }
+         else
+          {
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           if ( $Picture != NULL ) { $PicOffset = $PicWidth / 2; $SerieWeight = 0; }
+           $Y = $this->GraphAreaY1 + $XMargin;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $DisplayValues ) 
+              $this->drawText($X+$DisplayOffset+$SerieWeight+$BorderSize+$PicOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+             if ( $X != VOID )
+              {
+               if ( $RecordImageMap ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$SerieWeight,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+               if ( $Picture != NULL )
+                { $this->drawFromPicture($PicType,$Picture,$X-$PicWidth/2,$Y-$PicHeight/2); }
+               else
+                { $this->drawShape($X,$Y,$Shape,$SerieWeight,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha); }
+              }
+             $Y = $Y + $YStep;
+            }
+          }
+        }
+      }
+    }
+
+   /* Draw a spline chart */
+   function drawSplineChart($Format=NULL)
+    {
+     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
+     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL; // 234
+     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL; // 55
+     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL; // 26
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+         if ( $BreakR == NULL )
+          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks);
+         else
+          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
+           $Force = $XStep / 5;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $DisplayValues ) 
+              $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+	
+             if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+             if ( $Y == VOID && $LastY != NULL )
+              { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+
+             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+
+             if ( $Y != VOID )
+              $WayPoints[] = array($X,$Y);
+
+             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+             if ( $Y == VOID ) { $Y = NULL; }
+
+             $LastX = $X; $LastY = $Y;
+             $X = $X + $XStep;
+            }
+           $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+          }
+         else
+          {
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
+           $Force = $YStep / 5;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $LastGoodY = NULL; $LastGoodX = NULL; $LastX = 1; $LastY = 1;
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $DisplayValues ) 
+              $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+             if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+             if ( $X == VOID && $LastX != NULL )
+              { $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight)); $WayPoints = ""; }
+
+             if ( $X != VOID && $LastX == NULL && $LastGoodX != NULL && !$BreakVoid )
+              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); }
+
+             if ( $X != VOID )
+              $WayPoints[] = array($X,$Y);
+
+             if ( $X != VOID ) { $LastGoodX = $X; $LastGoodY = $Y; }
+             if ( $X == VOID ) { $X = NULL; }
+
+             $LastX = $X; $LastY = $Y;
+             $Y = $Y + $YStep;
+            }
+           $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+          }
+        }
+      }
+    }
+
+   /* Draw a filled spline chart */
+   function drawFilledSplineChart($Format=NULL)
+    {
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+     $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+         if ( $AroundZero ) { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
+
+         if ( $Threshold != NULL )
+          {
+           foreach($Threshold as $Key => $Params)
+            {
+             $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
+             $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
+            }
+          }
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X     = $this->GraphAreaX1 + $XMargin; $WayPoints = "";
+           $Force = $XStep / 5;
+
+           if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
+           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+
+           $LastX = ""; $LastY = "";
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $DisplayValues ) 
+              $this->drawText($X,$Y-$DisplayOffset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+             if ( $Y == VOID )
+              {
+               $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+
+               if ( $Area != "" )
+                {
+                 foreach ($Area as $key => $Points)
+                  {
+                   $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
+                   foreach($Points as $subKey => $Point)
+                    {
+                     if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                     $Corners[] = $Point["Y"]+1;
+                    }
+                   $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
+
+                   $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                  }
+                 $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+                }
+
+               $WayPoints = "";
+              }
+             else
+              $WayPoints[] = array($X,$Y-.5); /* -.5 for AA visual fix */
+
+             $X = $X + $XStep;
+            }
+           $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+
+           if ( $Area != "" )
+            {
+             foreach ($Area as $key => $Points)
+              {
+               $Corners = ""; $Corners[] = $Area[$key][0]["X"]; $Corners[] = $YZero;
+               foreach($Points as $subKey => $Point)
+                {
+                 if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                 $Corners[] = $Point["Y"]+1;
+                }
+               $Corners[] = $Points[$subKey]["X"]-1; $Corners[] = $YZero;
+
+               $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+              }
+             $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            }
+          }
+         else
+          {
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y     = $this->GraphAreaY1 + $XMargin; $WayPoints = "";
+           $Force = $YStep / 5;
+
+           if ( !$AroundZero ) { $YZero = $this->GraphAreaX1+1; }
+           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $DisplayValues ) 
+              $this->drawText($X+$DisplayOffset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE));
+
+             if ( $X == VOID )
+              {
+               $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+
+               if ( $Area != "" )
+                {
+                 foreach ($Area as $key => $Points)
+                  {
+                   $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
+                   foreach($Points as $subKey => $Point)
+                    {
+                     if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                     $Corners[] = $Point["Y"];
+                    }
+                   $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
+
+                   $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+                  }
+                 $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+                }
+
+               $WayPoints = "";
+              }
+             else
+              $WayPoints[] = array($X,$Y);
+
+             $Y = $Y + $YStep;
+            }
+           $Area = $this->drawSpline($WayPoints,array("Force"=>$Force,"PathOnly"=>TRUE));
+
+           if ( $Area != "" )
+            {
+             foreach ($Area as $key => $Points)
+              {
+               $Corners = ""; $Corners[] = $YZero; $Corners[] = $Area[$key][0]["Y"];
+               foreach($Points as $subKey => $Point)
+                {
+                 if ( $subKey == count($Points)-1) { $Corners[] = $Point["X"]-1; } else { $Corners[] = $Point["X"]; }
+                 $Corners[] = $Point["Y"];
+                }
+               $Corners[] = $YZero; $Corners[] = $Points[$subKey]["Y"]-1;
+
+               $this->drawPolygonChart($Corners,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha/2,"NoBorder"=>TRUE,"Threshold"=>$Threshold));
+              }
+             $this->drawSpline($WayPoints,array("Force"=>$Force,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks));
+            }
+
+          }
+        }
+      }
+    }
+
+   /* Draw a line chart */
+   function drawLineChart($Format=NULL)
+    {
+     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : TRUE;
+     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
+     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
+     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+     $ForceColor	= isset($Format["ForceColor"]) ? $Format["ForceColor"] : FALSE;
+     $ForceR		= isset($Format["ForceR"]) ? $Format["ForceR"] : 0;
+     $ForceG		= isset($Format["ForceG"]) ? $Format["ForceG"] : 0;
+     $ForceB		= isset($Format["ForceB"]) ? $Format["ForceB"] : 0;
+     $ForceAlpha	= isset($Format["ForceAlpha"]) ? $Format["ForceAlpha"] : 100;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+         if ( $ForceColor )
+          { $R = $ForceR; $G = $ForceG; $B = $ForceB; $Alpha = $ForceAlpha; }
+
+         if ( $BreakR == NULL )
+          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         else
+          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $LastGoodY = NULL; $LastGoodX = NULL;
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+              {
+               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+               $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+              }
+
+             if ( $RecordImageMap && $Y != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+              $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+
+             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+             if ( $Y == VOID ) { $Y = NULL; }
+
+             $LastX = $X; $LastY = $Y;
+             $X = $X + $XStep;
+            }
+          }
+         else
+          {
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $LastGoodY = NULL; $LastGoodX = NULL;
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+              { $this->drawText($X+$DisplayOffset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_BOTTOMMIDDLE)); }
+
+             if ( $RecordImageMap && $X != VOID ) { $this->addToImageMap("CIRCLE",floor($X).",".floor($Y).",".$ImageMapPlotSize,$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+              $this->drawLine($LastX,$LastY,$X,$Y,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight));
+
+             if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
+              { $this->drawLine($LastGoodX,$LastGoodY,$X,$Y,$BreakSettings); $LastGoodY = NULL; }
+
+             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+             if ( $X == VOID ) { $X = NULL; }
+
+             $LastX = $X; $LastY = $Y;
+             $Y = $Y + $YStep;
+            }
+          }
+        }
+      }
+    }
+
+   /* Draw a line chart */
+   function drawZoneChart($SerieA,$SerieB,$Format=NULL)
+    {
+     $AxisID	= isset($Format["AxisID"]) ? $Format["AxisID"] : 0;
+     $LineR	= isset($Format["LineR"]) ? $Format["LineR"] : 150;
+     $LineG	= isset($Format["LineG"]) ? $Format["LineG"] : 150;
+     $LineB	= isset($Format["LineB"]) ? $Format["LineB"] : 150;
+     $LineAlpha	= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 50;
+     $LineTicks	= isset($Format["LineTicks"]) ? $Format["LineTicks"] : 1;
+     $AreaR	= isset($Format["AreaR"]) ? $Format["AreaR"] : 150;
+     $AreaG	= isset($Format["AreaG"]) ? $Format["AreaG"] : 150;
+     $AreaB	= isset($Format["AreaB"]) ? $Format["AreaB"] : 150;
+     $AreaAlpha	= isset($Format["AreaAlpha"]) ? $Format["AreaAlpha"] : 5;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data	 = $this->DataSet->getData();
+     if ( !isset($Data["Series"][$SerieA]["Data"]) || !isset($Data["Series"][$SerieB]["Data"]) ) { return(0); }
+     $SerieAData = $Data["Series"][$SerieA]["Data"];
+     $SerieBData = $Data["Series"][$SerieB]["Data"];
+
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     $Mode	= $Data["Axis"][$AxisID]["Display"];
+     $Format	= $Data["Axis"][$AxisID]["Format"];
+     $Unit	= $Data["Axis"][$AxisID]["Unit"];
+
+     $PosArrayA = $this->scaleComputeY($SerieAData,array("AxisID"=>$AxisID));
+     $PosArrayB = $this->scaleComputeY($SerieBData,array("AxisID"=>$AxisID));
+     if ( count($PosArrayA) != count($PosArrayB) ) { return(0); }
+
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+      {
+       if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+       $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+       $LastX = NULL; $LastY1 = NULL; $LastY2 = NULL;
+       $BoundsA = ""; $BoundsB = "";
+       foreach($PosArrayA as $Key => $Y1)
+        {
+         $Y2 = $PosArrayB[$Key];
+
+         $BoundsA[] = $X; $BoundsA[] = $Y1;
+         $BoundsB[] = $X; $BoundsB[] = $Y2;
+
+         $LastX = $X;
+         $LastY1 = $Y1; $LastY2 = $Y2;
+
+         $X = $X + $XStep;
+        }
+       $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
+       $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
+
+       for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
+        {
+         $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+         $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+        }
+      }
+     else
+      {
+       if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+       $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+       $LastY = NULL; $LastX1 = NULL; $LastX2 = NULL;
+       $BoundsA = ""; $BoundsB = "";
+       foreach($PosArrayA as $Key => $X1)
+        {
+         $X2 = $PosArrayB[$Key];
+
+         $BoundsA[] = $X1; $BoundsA[] = $Y;
+         $BoundsB[] = $X2; $BoundsB[] = $Y;
+
+         $LastY = $Y;
+         $LastX1 = $X1; $LastX2 = $X2;
+
+         $Y = $Y + $YStep;
+        }
+       $Bounds = array_merge($BoundsA,$this->reversePlots($BoundsB));
+       $this->drawPolygonChart($Bounds,array("R"=>$AreaR,"G"=>$AreaG,"B"=>$AreaB,"Alpha"=>$AreaAlpha));
+
+       for($i=0;$i<=count($BoundsA)-4;$i=$i+2)
+        {
+         $this->drawLine($BoundsA[$i],$BoundsA[$i+1],$BoundsA[$i+2],$BoundsA[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+         $this->drawLine($BoundsB[$i],$BoundsB[$i+1],$BoundsB[$i+2],$BoundsB[$i+3],array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha,"Ticks"=>$LineTicks));
+        }
+      }
+    }
+
+   /* Draw a step chart */
+   function drawStepChart($Format=NULL)
+    {
+     $BreakVoid		= isset($Format["BreakVoid"]) ? $Format["BreakVoid"] : FALSE;
+     $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
+     $VoidTicks		= isset($Format["VoidTicks"]) ? $Format["VoidTicks"] : 4;
+     $BreakR		= isset($Format["BreakR"]) ? $Format["BreakR"] : NULL;
+     $BreakG		= isset($Format["BreakG"]) ? $Format["BreakG"] : NULL;
+     $BreakB		= isset($Format["BreakB"]) ? $Format["BreakB"] : NULL;
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $ImageMapPlotSize  = isset($Format["ImageMapPlotSize"]) ? $Format["ImageMapPlotSize"] : 5;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+         if ( $BreakR == NULL )
+          $BreakSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+         else
+          $BreakSettings = array("R"=>$BreakR,"G"=>$BreakG,"B"=>$BreakB,"Alpha"=>$Alpha,"Ticks"=>$VoidTicks,"Weight"=>$Weight);
+
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+         $Color		= array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+              {
+               if ( $Y <= $LastY ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+               $this->drawText($X,$Y-$Offset-$Weight,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+              }
+
+             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+              {
+               $this->drawLine($LastX,$LastY,$X,$LastY,$Color);
+               $this->drawLine($X,$LastY,$X,$Y,$Color);
+               if ( $ReCenter && $X+$XStep < $this->GraphAreaX2 - $XMargin )
+                {
+                 $this->drawLine($X,$Y,$X+$XStep,$Y,$Color);
+                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+               else
+                { if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); } }
+              }
+
+             if ( $Y != VOID && $LastY == NULL && $LastGoodY != NULL && !$BreakVoid )
+              { 
+               if ( $ReCenter )
+                {
+                 $this->drawLine($LastGoodX+$XStep,$LastGoodY,$X,$LastGoodY,$BreakSettings);
+                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX+$XStep-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+               else
+                {
+                 $this->drawLine($LastGoodX,$LastGoodY,$X,$LastGoodY,$BreakSettings);
+                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($LastGoodY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+
+               $this->drawLine($X,$LastGoodY,$X,$Y,$BreakSettings);
+               $LastGoodY = NULL;
+              }
+             elseif( !$BreakVoid && $LastGoodY == NULL && $Y != VOID )
+              {
+              $this->drawLine($this->GraphAreaX1 + $XMargin,$Y,$X,$Y,$BreakSettings);
+               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($this->GraphAreaX1+$XMargin-$ImageMapPlotSize).",".floor($Y-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+              }
+
+             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+             if ( $Y == VOID ) { $Y = NULL; }
+
+             if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
+             $LastX = $X; $LastY = $Y;
+             if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
+             $X = $X + $XStep;
+            }
+           if ( $ReCenter )
+            {
+             $this->drawLine($LastX,$LastY,$this->GraphAreaX2 - $XMargin,$LastY,$Color);
+             if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($this->GraphAreaX2-$XMargin+$ImageMapPlotSize).",".floor($LastY+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            }
+          }
+         else
+          {
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $LastGoodY = NULL; $LastGoodX = NULL; $Init = FALSE;
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+              {
+               if ( $X >= $LastX ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
+               $this->drawText($X+$Offset+$Weight,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+              }
+
+             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+              {
+               $this->drawLine($LastX,$LastY,$LastX,$Y,$Color);
+               $this->drawLine($LastX,$Y,$X,$Y,$Color);
+
+               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$XStep+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+              }
+
+             if ( $X != VOID && $LastX == NULL && $LastGoodY != NULL && !$BreakVoid )
+              {
+               $this->drawLine($LastGoodX,$LastGoodY,$LastGoodX,$LastGoodY+$YStep,$Color);
+               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($LastGoodY+$YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+               $this->drawLine($LastGoodX,$LastGoodY+$YStep,$LastGoodX,$Y,$BreakSettings);
+               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastGoodX-$ImageMapPlotSize).",".floor($LastGoodY+$YStep-$ImageMapPlotSize).",".floor($LastGoodX+$ImageMapPlotSize).",".floor($YStep+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+               $this->drawLine($LastGoodX,$Y,$X,$Y,$BreakSettings);
+               $LastGoodY = NULL;
+              }
+             elseif ( $X != VOID && $LastGoodY == NULL && !$BreakVoid )
+              {
+               $this->drawLine($X,$this->GraphAreaY1 + $XMargin,$X,$Y,$BreakSettings);
+               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X-$ImageMapPlotSize).",".floor($this->GraphAreaY1+$XMargin-$ImageMapPlotSize).",".floor($X+$ImageMapPlotSize).",".floor($Y+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+              }
+
+             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+             if ( $X == VOID ) { $X = NULL; }
+
+             if ( !$Init && $ReCenter ) { $Y = $Y - $YStep/2; $Init = TRUE; }
+             $LastX = $X; $LastY = $Y;
+             if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
+             $Y = $Y + $YStep;
+            }
+           if ( $ReCenter )
+            {
+             $this->drawLine($LastX,$LastY,$LastX,$this->GraphAreaY2 - $XMargin,$Color);
+             if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($LastX-$ImageMapPlotSize).",".floor($LastY-$ImageMapPlotSize).",".floor($LastX+$ImageMapPlotSize).",".floor($this->GraphAreaY2-$XMargin+$ImageMapPlotSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+            }
+          }
+        }
+      }
+    }
+
+   /* Draw a step chart */
+   function drawFilledStepChart($Format=NULL)
+    {
+     $ReCenter		= isset($Format["ReCenter"]) ? $Format["ReCenter"] : TRUE;
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] :FALSE;
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         $Color		= array("R"=>$R,"G"=>$G,"B"=>$B);
+         if ( $ForceTransparency != NULL ) { $Color["Alpha"] = $ForceTransparency; } else { $Color["Alpha"] = $Alpha; }
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+           if ( !$AroundZero ) { $YZero = $this->GraphAreaY2-1; }
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $LastGoodY = NULL; $LastGoodX = NULL; $Points = ""; $Init = FALSE;
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $Y == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
+              {
+               $Points[] = $LastX; $Points[] = $LastY;
+               $Points[] = $X; $Points[] = $LastY;
+               $Points[] = $X; $Points[] = $YZero;
+               $this->drawPolygon($Points,$Color);
+               $Points = "";
+              }
+
+             if ( $Y != VOID && $LastX != NULL && $LastY != NULL )
+              {
+               if ( $Points == "") { $Points[] = $LastX; $Points[] = $YZero; }
+               $Points[] = $LastX; $Points[] = $LastY;
+               $Points[] = $X; $Points[] = $LastY;
+               $Points[] = $X; $Points[] = $Y;
+              }
+
+             if ( $Y != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+             if ( $Y == VOID ) { $Y = NULL; }
+
+             if ( !$Init && $ReCenter ) { $X = $X - $XStep/2; $Init = TRUE; }
+             $LastX = $X; $LastY = $Y;
+             if ( $LastX < $this->GraphAreaX1 + $XMargin ) { $LastX = $this->GraphAreaX1 + $XMargin; }
+             $X = $X + $XStep;
+            }
+
+           if ( $ReCenter )
+            {
+             $Points[] = $LastX+$XStep/2; $Points[] = $LastY;
+             $Points[] = $LastX+$XStep/2; $Points[] = $YZero;
+            }
+           else
+            { $Points[] = $LastX; $Points[] = $YZero; }
+
+           $this->drawPolygon($Points,$Color);
+          }
+         else
+          {
+           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $LastGoodY = NULL; $LastGoodX = NULL; $Points = "";
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $X == VOID && $LastX != NULL && $LastY != NULL && $Points !="" )
+              {
+               $Points[] = $LastX; $Points[] = $LastY;
+               $Points[] = $LastX; $Points[] = $Y;
+               $Points[] = $YZero; $Points[] = $Y;
+               $this->drawPolygon($Points,$Color);
+               $Points = "";
+              }
+
+             if ( $X != VOID && $LastX != NULL && $LastY != NULL )
+              {
+               if ( $Points == "") { $Points[] = $YZero; $Points[] = $LastY; }
+               $Points[] = $LastX; $Points[] = $LastY;
+               $Points[] = $LastX; $Points[] = $Y;
+               $Points[] = $X; $Points[] = $Y;
+              }
+
+             if ( $X != VOID ) { $LastGoodY = $Y; $LastGoodX = $X; }
+             if ( $X == VOID ) { $X = NULL; }
+
+             if ( $LastX == NULL && $ReCenter ) { $Y = $Y - $YStep/2; }
+             $LastX = $X; $LastY = $Y;
+             if ( $LastY < $this->GraphAreaY1 + $XMargin ) { $LastY = $this->GraphAreaY1 + $XMargin; }
+             $Y = $Y + $YStep;
+            }
+
+           if ( $ReCenter )
+            {
+             $Points[] = $LastX; $Points[] = $LastY+$YStep/2;
+             $Points[] = $YZero; $Points[] = $LastY+$YStep/2;
+            }
+           else
+            { $Points[] = $YZero; $Points[] = $LastY; }
+
+           $this->drawPolygon($Points,$Color);
+          }
+        }
+      }
+    }
+
+   /* Draw an area chart */
+   function drawAreaChart($Format=NULL)
+    {
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : 25;
+     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+     $Threshold		= isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data  = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+
+         if ( $Threshold != NULL )
+          {
+           foreach($Threshold as $Key => $Params)
+            {
+             $Threshold[$Key]["MinX"] = $this->scaleComputeY($Params["Min"],array("AxisID"=>$Serie["Axis"]));
+             $Threshold[$Key]["MaxX"] = $this->scaleComputeY($Params["Max"],array("AxisID"=>$Serie["Axis"]));
+            }
+          }
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+
+           $Areas = ""; $AreaID = 0; 
+           $Areas[$AreaID][] = $this->GraphAreaX1 + $XMargin;
+           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X = $this->GraphAreaX1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+              {
+               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+               $this->drawText($X,$Y-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+              }
+
+             if ( $Y == VOID && isset($Areas[$AreaID]) )
+              {
+               if($LastX == NULL)
+                { $Areas[$AreaID][] = $X; }
+               else
+                { $Areas[$AreaID][] = $LastX; }
+
+               if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+               $AreaID++;
+              }
+             elseif ($Y != VOID)
+              {
+               if ( !isset($Areas[$AreaID]) )
+                {
+                 $Areas[$AreaID][] = $X;
+                 if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+                }
+
+               $Areas[$AreaID][] = $X;
+               $Areas[$AreaID][] = $Y;
+              }
+
+             $LastX = $X;
+             $X = $X + $XStep;
+            }
+           $Areas[$AreaID][] = $LastX;
+           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaY2-1; }
+
+           /* Handle shadows in the areas */
+           if ( $this->Shadow )
+            {
+             $ShadowArea = "";
+             foreach($Areas as $Key => $Points)
+              {
+               $ShadowArea[$Key] = "";
+               foreach($Points as $Key2 => $Value)
+                {
+                 if ( $Key2 % 2 == 0 )
+                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
+                 else
+                  { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
+                }
+              }              
+
+             foreach($ShadowArea as $Key => $Points)
+              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+            }
+
+           $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
+           $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
+
+           foreach($Areas as $Key => $Points)
+            $this->drawPolygonChart($Points,$Color);
+          }
+         else
+          {
+           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+
+           $Areas = ""; $AreaID = 0; 
+           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+           $Areas[$AreaID][] = $this->GraphAreaY1 + $XMargin;
+
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y     = $this->GraphAreaY1 + $XMargin; $LastX = NULL; $LastY = NULL;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+              {
+               if ( $Serie["Data"][$Key] > 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+               $this->drawText($X+$Offset,$Y,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("Angle"=>270,"R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align));
+              }
+
+             if ( $X == VOID && isset($Areas[$AreaID]) )
+              {
+               if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+
+               if($LastY == NULL)
+                { $Areas[$AreaID][] = $Y; }
+               else
+                { $Areas[$AreaID][] = $LastY; }
+
+               $AreaID++;
+              }
+             elseif ($X != VOID)
+              {
+               if ( !isset($Areas[$AreaID]) )
+                {
+                 if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+                 $Areas[$AreaID][] = $Y;
+                }
+
+               $Areas[$AreaID][] = $X;
+               $Areas[$AreaID][] = $Y;
+              }
+
+             $LastX = $X; $LastY = $Y;
+             $Y = $Y + $YStep;
+            }
+           if ( $AroundZero ) { $Areas[$AreaID][] = $YZero; } else { $Areas[$AreaID][] = $this->GraphAreaX1+1; }
+           $Areas[$AreaID][] = $LastY;
+
+           /* Handle shadows in the areas */
+           if ( $this->Shadow )
+            {
+             $ShadowArea = "";
+             foreach($Areas as $Key => $Points)
+              {
+               $ShadowArea[$Key] = "";
+               foreach($Points as $Key2 => $Value)
+                {
+                 if ( $Key2 % 2 == 0 )
+                  { $ShadowArea[$Key][] = $Value + $this->ShadowX; }
+                 else
+                  { $ShadowArea[$Key][] = $Value + $this->ShadowY; }
+                }
+              }              
+
+             foreach($ShadowArea as $Key => $Points)
+              $this->drawPolygonChart($Points,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+            }
+
+           $Alpha = $ForceTransparency != NULL ? $ForceTransparency : $Alpha;
+           $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Threshold"=>$Threshold);
+
+           foreach($Areas as $Key => $Points)
+            $this->drawPolygonChart($Points,$Color);
+          }
+        }
+      }
+    }
+
+
+   /* Draw a bar chart */
+   function drawBarChart($Format=NULL)
+    {
+     $Floating0Serie	= isset($Format["Floating0Serie"]) ? $Format["Floating0Serie"] : NULL;
+     $Floating0Value	= isset($Format["Floating0Value"]) ? $Format["Floating0Value"] : NULL;
+     $Draw0Line		= isset($Format["Draw0Line"]) ? $Format["Draw0Line"] : FALSE;
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+     $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_HORIZONTAL;
+     $DisplayOffset	= isset($Format["DisplayOffset"]) ? $Format["DisplayOffset"] : 2;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $DisplayFont	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontName;
+     $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
+     $DisplayPos	= isset($Format["DisplayPos"]) ? $Format["DisplayPos"] : LABEL_POS_OUTSIDE;
+     $DisplayShadow	= isset($Format["DisplayShadow"]) ? $Format["DisplayShadow"] : TRUE;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $AroundZero	= isset($Format["AroundZero"]) ? $Format["AroundZero"] : TRUE;
+     $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
+     $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
+     $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+     $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
+     $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
+     $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
+     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
+     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
+     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
+     $TxtMargin		= isset($Format["TxtMargin"]) ? $Format["TxtMargin"] : 6;
+     $OverrideColors	= isset($Format["OverrideColors"]) ? $Format["OverrideColors"] : NULL;
+     $OverrideSurrounding = isset($Format["OverrideSurrounding"]) ? $Format["OverrideSurrounding"] : 30;
+     $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
+     $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
+     $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
+     $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_REGULAR;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     if ( $OverrideColors != NULL )
+      {
+       $OverrideColors = $this->validatePalette($OverrideColors,$OverrideSurrounding);
+       $this->DataSet->saveExtendedData("Palette",$OverrideColors);
+      }
+
+     $RestoreShadow = $this->Shadow;
+
+     $SeriesCount  = $this->countDrawableSeries();
+     $CurrentSerie = 0;
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = $R; $DisplayG = $G; $DisplayB = $B; }
+         if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+         if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
+         if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
+         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+         if ( $Floating0Value != NULL )
+          { $YZero = $this->scaleComputeY($Floating0Value,array("AxisID"=>$Serie["Axis"])); }
+         else
+          { $YZero = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"])); }
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+
+           if ( $XDivs == 0 ) { $XStep = 0; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X = $this->GraphAreaX1 + $XMargin;
+
+           if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
+           if ( $XDivs == 0 ) { $XSize = ($this->GraphAreaX2-$this->GraphAreaX1)/($SeriesCount+$Interleave); } else { $XSize   = ($XStep / ($SeriesCount+$Interleave) ); }
+
+           $XOffset = -($XSize*$SeriesCount)/2 + $CurrentSerie * $XSize;
+           if ( $X + $XOffset <= $this->GraphAreaX1 ) { $XOffset = $this->GraphAreaX1 - $X + 1 ; }
+
+           $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $XOffset + $XSize / 2;
+
+           if ( $Rounded || $BorderR != -1) { $XSpace = 1; } else { $XSpace = 0; }
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+           $ID = 0;
+           foreach($PosArray as $Key => $Y2)
+            {
+             if ( $Floating0Serie != NULL )
+              {
+               if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
+                { $Value = $Data["Series"][$Floating0Serie]["Data"][$Key]; }
+               else
+                { $Value = 0; }
+
+               $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
+               if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+               if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+
+               if ( $AroundZero ) { $Y1 = $YZero; } else { $Y1 = $this->GraphAreaY2-1; }
+              }
+
+             if ( $OverrideColors != NULL )
+              { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
+
+             if ( $Y2 != VOID )
+              {
+               $BarHeight = $Y1 - $Y2;
+
+               if ( $Serie["Data"][$Key] == 0 )
+                {
+                 $this->drawLine($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y1,$Color);
+                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1-1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y1+1),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+               else
+                {
+                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset+$XSpace).",".floor($Y1).",".floor($X+$XOffset+$XSize-$XSpace).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                 if ( $Rounded )
+                  $this->drawRoundedFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$RoundRadius,$Color);
+                 else
+                  {
+                   $this->drawFilledRectangle($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,$Color);
+
+                   if ( $InnerColor != NULL ) { $this->drawRectangle($X+$XOffset+$XSpace+1,min($Y1,$Y2)+1,$X+$XOffset+$XSize-$XSpace-1,max($Y1,$Y2)-1,$InnerColor); }
+
+                   if ( $Gradient )
+                    {
+                     $this->Shadow  = FALSE;
+
+                     if ( $GradientMode == GRADIENT_SIMPLE )
+                      {
+                       if ( $Serie["Data"][$Key] >= 0 )
+                        $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                       else
+                        $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+
+                       $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_VERTICAL,$GradienColor);
+                      }
+                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                      {
+                       $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                       $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                       $XSpan = floor($XSize / 3);
+
+                       $this->drawGradientArea($X+$XOffset+$XSpace,$Y1,$X+$XOffset+$XSpan-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor1);
+                       $this->drawGradientArea($X+$XOffset+$XSpan+$XSpace,$Y1,$X+$XOffset+$XSize-$XSpace,$Y2,DIRECTION_HORIZONTAL,$GradienColor2);
+                      }
+                     $this->Shadow = $RestoreShadow;
+                    }
+                  }
+
+                 if ( $Draw0Line )
+                  {
+                   $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
+
+                   if ( abs($Y1 - $Y2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
+                   if ( $Y1 - $Y2 < 0 ) { $Line0Width = -$Line0Width; }
+
+                   $this->drawFilledRectangle($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1)-$Line0Width,$Line0Color);
+                   $this->drawLine($X+$XOffset+$XSpace,floor($Y1),$X+$XOffset+$XSize-$XSpace,floor($Y1),$Line0Color);
+                  }
+                }
+
+               if ( $DisplayValues && $Serie["Data"][$Key] != VOID )
+                {
+                 if ( $DisplayShadow ) { $this->Shadow = TRUE; }
+
+                 $Caption    = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
+                 $TxtPos     = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,90,$Caption);
+                 $TxtHeight  = $TxtPos[0]["Y"] - $TxtPos[1]["Y"] + $TxtMargin;
+
+                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtHeight) < abs($BarHeight) )
+                  {
+                   $CenterX = (($X+$XOffset+$XSize-$XSpace)-($X+$XOffset+$XSpace))/2 + $X+$XOffset+$XSpace;
+                   $CenterY = ($Y2-$Y1)/2 + $Y1;
+
+                   $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"Angle"=>90));
+                  }
+                 else
+                  {
+                   if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_BOTTOMMIDDLE; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_TOPMIDDLE; $Offset = -$DisplayOffset; }
+                   $this->drawText($X+$XOffset+$XSize/2,$Y2-$Offset,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
+                  }
+
+                 $this->Shadow = $RestoreShadow;
+                }
+              }
+
+             $X = $X + $XStep;
+             $ID++;
+            }
+          }
+         else
+          {
+           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+
+           if ( $XDivs == 0 ) { $YStep = 0; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           
+           $Y = $this->GraphAreaY1 + $XMargin;
+
+           if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
+           if ( $XDivs == 0 ) { $YSize = ($this->GraphAreaY2-$this->GraphAreaY1)/($SeriesCount+$Interleave); } else { $YSize   = ($YStep / ($SeriesCount+$Interleave) ); }
+           
+           $YOffset = -($YSize*$SeriesCount)/2 + $CurrentSerie * $YSize;
+           if ( $Y + $YOffset <= $this->GraphAreaY1 ) { $YOffset = $this->GraphAreaY1 - $Y + 1 ; }
+
+           $this->DataSet->Data["Series"][$SerieName]["XOffset"] = $YOffset + $YSize / 2;
+
+           if ( $Rounded || $BorderR != -1 ) { $YSpace = 1; } else { $YSpace = 0; }
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+           $ID = 0 ;
+           foreach($PosArray as $Key => $X2)
+            {
+             if ( $Floating0Serie != NULL )
+              {
+               if ( isset($Data["Series"][$Floating0Serie]["Data"][$Key]) )
+                $Value = $Data["Series"][$Floating0Serie]["Data"][$Key];
+               else { $Value = 0; }
+
+               $YZero = $this->scaleComputeY($Value,array("AxisID"=>$Serie["Axis"]));
+               if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+               if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+               if ( $AroundZero ) { $X1 = $YZero; } else { $X1 = $this->GraphAreaX1+1; }
+              }
+
+             if ( $OverrideColors != NULL )
+              { if ( isset($OverrideColors[$ID]) ) { $Color = array("R"=>$OverrideColors[$ID]["R"],"G"=>$OverrideColors[$ID]["G"],"B"=>$OverrideColors[$ID]["B"],"Alpha"=>$OverrideColors[$ID]["Alpha"],"BorderR"=>$OverrideColors[$ID]["BorderR"],"BorderG"=>$OverrideColors[$ID]["BorderG"],"BorderB"=>$OverrideColors[$ID]["BorderB"]); } else { $Color = $this->getRandomColor(); } }
+
+             if ( $X2 != VOID )
+              {
+               $BarWidth = $X2 - $X1;
+
+               if ( $Serie["Data"][$Key] == 0 )
+                {
+                 $this->drawLine($X1,$Y+$YOffset+$YSpace,$X1,$Y+$YOffset+$YSize-$YSpace,$Color);
+                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1-1).",".floor($Y+$YOffset+$YSpace).",".floor($X1+1).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+                }
+               else
+                {
+                 if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1).",".floor($Y+$YOffset+$YSpace).",".floor($X2).",".floor($Y+$YOffset+$YSize-$YSpace),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+                 if ( $Rounded )
+                  $this->drawRoundedFilledRectangle($X1+1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$RoundRadius,$Color);
+                 else
+                  {
+                   $this->drawFilledRectangle($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,$Color);
+
+                   if ( $InnerColor != NULL ) { $this->drawRectangle(min($X1,$X2)+1,$Y+$YOffset+$YSpace+1,max($X1,$X2)-1,$Y+$YOffset+$YSize-$YSpace-1,$InnerColor); }
+
+                   if ( $Gradient )
+                    {
+                     $this->Shadow  = FALSE;
+
+                     if ( $GradientMode == GRADIENT_SIMPLE )
+                      {
+                       if ( $Serie["Data"][$Key] >= 0 )
+                        $GradienColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                       else
+                        $GradienColor = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+
+                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_HORIZONTAL,$GradienColor);
+                      }
+                     elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                      {
+                       $GradienColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                       $GradienColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                       $YSpan = floor($YSize / 3);
+
+                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpace,$X2,$Y+$YOffset+$YSpan-$YSpace,DIRECTION_VERTICAL,$GradienColor1);
+                       $this->drawGradientArea($X1,$Y+$YOffset+$YSpan,$X2,$Y+$YOffset+$YSize-$YSpace,DIRECTION_VERTICAL,$GradienColor2);
+                      }
+                     $this->Shadow = $RestoreShadow;
+                    }
+                  }
+
+                 if ( $Draw0Line )
+                  {
+                   $Line0Color = array("R"=>0,"G"=>0,"B"=>0,"Alpha"=>20);
+
+                   if ( abs($X1 - $X2) > 3 ) { $Line0Width = 3; } else { $Line0Width = 1; }
+                   if ( $X2 - $X1 < 0 ) { $Line0Width = -$Line0Width; }
+
+                   $this->drawFilledRectangle(floor($X1),$Y+$YOffset+$YSpace,floor($X1)+$Line0Width,$Y+$YOffset+$YSize-$YSpace,$Line0Color);
+                   $this->drawLine(floor($X1),$Y+$YOffset+$YSpace,floor($X1),$Y+$YOffset+$YSize-$YSpace,$Line0Color);
+                  }
+                }
+
+               if ( $DisplayValues && $Serie["Data"][$Key] != VOID ) 
+                {
+                 if ( $DisplayShadow ) { $this->Shadow = TRUE; }
+
+                 $Caption   = $this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit);
+                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                 $TxtWidth  = $TxtPos[1]["X"] - $TxtPos[0]["X"] + $TxtMargin;
+
+                 if ( $DisplayPos == LABEL_POS_INSIDE && abs($TxtWidth) < abs($BarWidth) )
+                  {
+                   $CenterX = ($X2-$X1)/2 + $X1;
+                   $CenterY = (($Y+$YOffset+$YSize-$YSpace)-($Y+$YOffset+$YSpace))/2 + ($Y+$YOffset+$YSpace);
+
+                   $this->drawText($CenterX,$CenterY,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize));
+                  }
+                 else
+                  {
+                   if ( $Serie["Data"][$Key] >= 0 ) { $Align = TEXT_ALIGN_MIDDLELEFT; $Offset = $DisplayOffset; } else { $Align = TEXT_ALIGN_MIDDLERIGHT; $Offset = -$DisplayOffset; }
+                   $this->drawText($X2+$Offset,$Y+$YOffset+$YSize/2,$Caption,array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>$Align,"FontSize"=>$DisplaySize));
+                  }
+
+                 $this->Shadow = $RestoreShadow;
+                }
+              }
+             $Y = $Y + $YStep;
+             $ID++;
+            }
+          }
+         $CurrentSerie++;
+        }
+      }
+    }
+
+   /* Draw a bar chart */
+   function drawStackedBarChart($Format=NULL)
+    {
+     $DisplayValues	= isset($Format["DisplayValues"]) ? $Format["DisplayValues"] : FALSE;
+     $DisplayOrientation = isset($Format["DisplayOrientation"]) ? $Format["DisplayOrientation"] : ORIENTATION_AUTO;
+     $DisplayRound      = isset($Format["DisplayRound"]) ? $Format["DisplayRound"] : 0;
+     $DisplayColor	= isset($Format["DisplayColor"]) ? $Format["DisplayColor"] : DISPLAY_MANUAL;
+     $DisplayFont	= isset($Format["DisplayFont"]) ? $Format["DisplayFont"] : $this->FontName;
+     $DisplaySize	= isset($Format["DisplaySize"]) ? $Format["DisplaySize"] : $this->FontSize;
+     $DisplayR		= isset($Format["DisplayR"]) ? $Format["DisplayR"] : 0;
+     $DisplayG		= isset($Format["DisplayG"]) ? $Format["DisplayG"] : 0;
+     $DisplayB		= isset($Format["DisplayB"]) ? $Format["DisplayB"] : 0;
+     $Interleave	= isset($Format["Interleave"]) ? $Format["Interleave"] : .5;
+     $Rounded		= isset($Format["Rounded"]) ? $Format["Rounded"] : FALSE;
+     $RoundRadius	= isset($Format["RoundRadius"]) ? $Format["RoundRadius"] : 4;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : -1;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : -1;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : -1;
+     $Gradient		= isset($Format["Gradient"]) ? $Format["Gradient"] : FALSE;
+     $GradientMode	= isset($Format["GradientMode"]) ? $Format["GradientMode"] : GRADIENT_SIMPLE;
+     $GradientAlpha	= isset($Format["GradientAlpha"]) ? $Format["GradientAlpha"] : 20;
+     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 0;
+     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 0;
+     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 0;
+     $InnerSurrounding	= isset($Format["InnerSurrounding"]) ? $Format["InnerSurrounding"] : NULL;
+     $InnerBorderR	= isset($Format["InnerBorderR"]) ? $Format["InnerBorderR"] : -1;
+     $InnerBorderG	= isset($Format["InnerBorderG"]) ? $Format["InnerBorderG"] : -1;
+     $InnerBorderB	= isset($Format["InnerBorderB"]) ? $Format["InnerBorderB"] : -1;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+     $FontFactor	= isset($Format["FontFactor"]) ? $Format["FontFactor"] : 8;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     $RestoreShadow = $this->Shadow;
+
+     $LastX = ""; $LastY = "";
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+         if ( $DisplayColor == DISPLAY_AUTO ) { $DisplayR = 255; $DisplayG = 255; $DisplayB = 255; }
+         if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+         if ( $InnerSurrounding != NULL ) { $InnerBorderR = $R+$InnerSurrounding; $InnerBorderG = $G+$InnerSurrounding; $InnerBorderB = $B+$InnerSurrounding; }
+         if ( $InnerBorderR == -1 ) { $InnerColor = NULL; } else { $InnerColor = array("R"=>$InnerBorderR,"G"=>$InnerBorderG,"B"=>$InnerBorderB); }
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         if (isset($Serie["Description"])) { $SerieDescription = $Serie["Description"]; } else { $SerieDescription = $SerieName; }
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
+         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         $Color = array("TransCorner"=>TRUE,"R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB);
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X     = $this->GraphAreaX1 + $XMargin;
+
+           $XSize   = ($XStep / (1+$Interleave) );
+           $XOffset = -($XSize/2);
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           foreach($PosArray as $Key => $Height)
+            {
+             if ( $Height != VOID && $Serie["Data"][$Key] != 0 )
+              {
+               if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
+
+               if ( !isset($LastY[$Key] ) ) { $LastY[$Key] = ""; }
+               if ( !isset($LastY[$Key][$Pos] ) ) { $LastY[$Key][$Pos] = $YZero; }
+
+               $Y1 = $LastY[$Key][$Pos];
+               $Y2 = $Y1 - $Height;
+
+               if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $Y1 != $YZero) ) { $YSpaceUp = 1; } else { $YSpaceUp = 0; }
+               if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $Y1 != $YZero) ) { $YSpaceDown = 1; } else { $YSpaceDown = 0; }
+
+               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X+$XOffset).",".floor($Y1-$YSpaceUp+$YSpaceDown).",".floor($X+$XOffset+$XSize).",".floor($Y2),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+               if ( $Rounded )
+                $this->drawRoundedFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$RoundRadius,$Color);
+               else
+                {
+                 $this->drawFilledRectangle($X+$XOffset,$Y1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2,$Color);
+
+                 if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X+$XOffset+1,$X+$XOffset+$XSize),min($Y1-$YSpaceUp+$YSpaceDown,$Y2)+1,max($X+$XOffset+1,$X+$XOffset+$XSize)-1,max($Y1-$YSpaceUp+$YSpaceDown,$Y2)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
+
+                 if ( $Gradient )
+                  {
+                   $this->Shadow  = FALSE;
+
+                   if ( $GradientMode == GRADIENT_SIMPLE )
+                    {
+                     $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                     $this->drawGradientArea($X+$XOffset,$Y1-1-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+1,DIRECTION_VERTICAL,$GradientColor);
+                    }
+                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                    {
+                     $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                     $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                     $XSpan = floor($XSize / 3);
+
+                     $this->drawGradientArea($X+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSpan,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor1);
+                     $this->drawGradientArea($X+$XSpan+$XOffset-.5,$Y1-.5-$YSpaceUp+$YSpaceDown,$X+$XOffset+$XSize,$Y2+.5,DIRECTION_HORIZONTAL,$GradientColor2);
+                    }
+                   $this->Shadow = $RestoreShadow;
+                  }
+                }
+
+               if ( $DisplayValues )
+                {
+                 $BarHeight = abs($Y2-$Y1)-2;
+                 $BarWidth  = $XSize+($XOffset/2)-$FontFactor;
+
+                 $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
+                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                 $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
+                 $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
+
+                 $XCenter = ( ($X+$XOffset+$XSize) - ($X+$XOffset) ) / 2 + $X+$XOffset;
+                 $YCenter = ( ($Y2) - ($Y1-$YSpaceUp+$YSpaceDown) ) / 2 + $Y1-$YSpaceUp+$YSpaceDown;
+
+                 $Done = FALSE;
+                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
+                  {
+                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    {
+                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                     $Done = TRUE;
+                    }
+                  }
+
+                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
+                  {
+                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
+                    $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                  }
+                }
+
+               $LastY[$Key][$Pos] = $Y2;
+              }
+
+             $X = $X + $XStep;
+            }
+          }
+         else
+          {
+           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y     = $this->GraphAreaY1 + $XMargin;
+
+           $YSize   = $YStep / (1+$Interleave);
+           $YOffset = -($YSize/2);
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           foreach($PosArray as $Key => $Width)
+            {
+             if ( $Width != VOID && $Serie["Data"][$Key] != 0 )
+              {
+               if ( $Serie["Data"][$Key] > 0 ) { $Pos = "+"; } else { $Pos = "-"; }
+
+               if ( !isset($LastX[$Key] ) ) { $LastX[$Key] = ""; }
+               if ( !isset($LastX[$Key][$Pos] ) ) { $LastX[$Key][$Pos] = $YZero; }
+
+               $X1 = $LastX[$Key][$Pos];
+               $X2 = $X1 + $Width;
+
+               if ( ($Rounded || $BorderR != -1) && ($Pos == "+" && $X1 != $YZero) ) { $XSpaceLeft = 2; } else { $XSpaceLeft = 0; }
+               if ( ($Rounded || $BorderR != -1) && ($Pos == "-" && $X1 != $YZero) ) { $XSpaceRight = 2; } else { $XSpaceRight = 0; }
+
+               if ( $RecordImageMap ) { $this->addToImageMap("RECT",floor($X1+$XSpaceLeft).",".floor($Y+$YOffset).",".floor($X2-$XSpaceRight).",".floor($Y+$YOffset+$YSize),$this->toHTMLColor($R,$G,$B),$SerieDescription,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit)); }
+
+               if ( $Rounded )
+                $this->drawRoundedFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$RoundRadius,$Color);
+               else
+                {
+                 $this->drawFilledRectangle($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,$Color);
+
+                 if ( $InnerColor != NULL ) { $RestoreShadow = $this->Shadow; $this->Shadow = FALSE; $this->drawRectangle(min($X1+$XSpaceLeft,$X2-$XSpaceRight)+1,min($Y+$YOffset,$Y+$YOffset+$YSize)+1,max($X1+$XSpaceLeft,$X2-$XSpaceRight)-1,max($Y+$YOffset,$Y+$YOffset+$YSize)-1,$InnerColor); $this->Shadow = $RestoreShadow;}
+
+                 if ( $Gradient )
+                  {
+                   $this->Shadow  = FALSE;
+
+                   if ( $GradientMode == GRADIENT_SIMPLE )
+                    {
+                     $GradientColor = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_HORIZONTAL,$GradientColor);
+                    }
+                   elseif ( $GradientMode == GRADIENT_EFFECT_CAN )
+                    {
+                     $GradientColor1 = array("StartR"=>$GradientEndR,"StartG"=>$GradientEndG,"StartB"=>$GradientEndB,"EndR"=>$GradientStartR,"EndG"=>$GradientStartG,"EndB"=>$GradientStartB,"Alpha"=>$GradientAlpha);
+                     $GradientColor2 = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB,"Alpha"=>$GradientAlpha);
+                     $YSpan = floor($YSize / 3);
+
+                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset,$X2-$XSpaceRight,$Y+$YOffset+$YSpan,DIRECTION_VERTICAL,$GradientColor1);
+                     $this->drawGradientArea($X1+$XSpaceLeft,$Y+$YOffset+$YSpan,$X2-$XSpaceRight,$Y+$YOffset+$YSize,DIRECTION_VERTICAL,$GradientColor2);
+                    }
+                   $this->Shadow = $RestoreShadow;
+                  }
+                }
+
+               if ( $DisplayValues )
+                {
+                 $BarWidth = abs($X2-$X1)-$FontFactor;
+                 $BarHeight = $YSize+($YOffset/2)-$FontFactor/2;
+                 $Caption   = $this->scaleFormat(round($Serie["Data"][$Key],$DisplayRound),$Mode,$Format,$Unit);
+                 $TxtPos    = $this->getTextBox(0,0,$DisplayFont,$DisplaySize,0,$Caption);
+                 $TxtHeight = abs($TxtPos[2]["Y"] - $TxtPos[0]["Y"]);
+                 $TxtWidth  = abs($TxtPos[1]["X"] - $TxtPos[0]["X"]);
+
+                 $XCenter  = ( $X2 - $X1 ) / 2 + $X1;
+                 $YCenter  = ( ($Y+$YOffset+$YSize) - ($Y+$YOffset) ) / 2 + $Y+$YOffset;
+
+                 $Done = FALSE;
+                 if ( $DisplayOrientation == ORIENTATION_HORIZONTAL || $DisplayOrientation == ORIENTATION_AUTO )
+                  {
+                   if ( $TxtHeight < $BarHeight && $TxtWidth < $BarWidth  )
+                    {
+                     $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                     $Done = TRUE;
+                    }
+                  }
+
+                 if ( $DisplayOrientation == ORIENTATION_VERTICAL || ( $DisplayOrientation == ORIENTATION_AUTO && !$Done) )
+                  {
+                   if ( $TxtHeight < $BarWidth && $TxtWidth < $BarHeight  )
+                    $this->drawText($XCenter,$YCenter,$this->scaleFormat($Serie["Data"][$Key],$Mode,$Format,$Unit),array("R"=>$DisplayR,"G"=>$DisplayG,"B"=>$DisplayB,"Angle"=>90,"Align"=>TEXT_ALIGN_MIDDLEMIDDLE,"FontSize"=>$DisplaySize,"FontName"=>$DisplayFont));
+                  }
+                }
+
+               $LastX[$Key][$Pos] = $X2;
+              }
+
+             $Y = $Y + $YStep;
+            }
+          }
+        }
+      }
+    }
+
+   /* Draw a stacked area chart */
+   function drawStackedAreaChart($Format=NULL)
+    {
+     $DrawLine		= isset($Format["DrawLine"]) ? $Format["DrawLine"] : FALSE;
+     $LineSurrounding	= isset($Format["LineSurrounding"]) ? $Format["LineSurrounding"] : NULL;
+     $LineR		= isset($Format["LineR"]) ? $Format["LineR"] : VOID;
+     $LineG		= isset($Format["LineG"]) ? $Format["LineG"] : VOID;
+     $LineB		= isset($Format["LineB"]) ? $Format["LineB"] : VOID;
+     $LineAlpha		= isset($Format["LineAlpha"]) ? $Format["LineAlpha"] : 100;
+     $DrawPlot		= isset($Format["DrawPlot"]) ? $Format["DrawPlot"] : FALSE;
+     $PlotRadius	= isset($Format["PlotRadius"]) ? $Format["PlotRadius"] : 2;
+     $PlotBorder	= isset($Format["PlotBorder"]) ? $Format["PlotBorder"] : 1;
+     $PlotBorderSurrounding = isset($Format["PlotBorderSurrounding"]) ? $Format["PlotBorderSurrounding"] : NULL;
+     $PlotBorderR	= isset($Format["PlotBorderR"]) ? $Format["PlotBorderR"] : 0;
+     $PlotBorderG	= isset($Format["PlotBorderG"]) ? $Format["PlotBorderG"] : 0;
+     $PlotBorderB	= isset($Format["PlotBorderB"]) ? $Format["PlotBorderB"] : 0;
+     $PlotBorderAlpha	= isset($Format["PlotBorderAlpha"]) ? $Format["PlotBorderAlpha"] : 50;
+     $ForceTransparency	= isset($Format["ForceTransparency"]) ? $Format["ForceTransparency"] : NULL;
+
+     $this->LastChartLayout = CHART_LAST_LAYOUT_STACKED;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     $RestoreShadow = $this->Shadow;
+     $this->Shadow  = FALSE;
+
+     /* Build the offset data series */
+     $OffsetData    = "";
+     $OverallOffset = "";
+     $SerieOrder    = "";
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $SerieOrder[] = $SerieName;
+
+         foreach($Serie["Data"] as $Key => $Value)
+          {
+           if ( $Value == VOID ) { $Value = 0; }
+           if ($Value >= 0) { $Sign = "+"; } else { $Sign = "-"; }
+           if ( !isset($OverallOffset[$Key]) || !isset($OverallOffset[$Key][$Sign]) ) { $OverallOffset[$Key][$Sign] = 0; }
+
+           if ( $Sign == "+" )
+            { $Data["Series"][$SerieName]["Data"][$Key] = $Value + $OverallOffset[$Key][$Sign]; }
+           else
+            { $Data["Series"][$SerieName]["Data"][$Key] = $Value - $OverallOffset[$Key][$Sign]; }
+
+           $OverallOffset[$Key][$Sign] = $OverallOffset[$Key][$Sign] + abs($Value);
+          }
+        } 
+      }
+     $SerieOrder = array_reverse($SerieOrder);
+
+     $LastX = ""; $LastY = "";
+     foreach($SerieOrder as $Key => $SerieName)
+      {
+       $Serie = $Data["Series"][$SerieName];
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"];
+         if ( $ForceTransparency != NULL ) { $Alpha = $ForceTransparency; }
+
+         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha);
+
+         if ( $LineSurrounding != NULL )
+          $LineColor = array("R"=>$R+$LineSurrounding,"G"=>$G+$LineSurrounding,"B"=>$B+$LineSurrounding,"Alpha"=>$Alpha);
+         elseif ( $LineR != VOID )
+          $LineColor = array("R"=>$LineR,"G"=>$LineG,"B"=>$LineB,"Alpha"=>$LineAlpha);
+         else
+          $LineColor = $Color;
+
+         if ( $PlotBorderSurrounding != NULL )
+          $PlotBorderColor = array("R"=>$R+$PlotBorderSurrounding,"G"=>$G+$PlotBorderSurrounding,"B"=>$B+$PlotBorderSurrounding,"Alpha"=>$PlotBorderAlpha);
+         else
+          $PlotBorderColor = array("R"=>$PlotBorderR,"G"=>$PlotBorderG,"B"=>$PlotBorderB,"Alpha"=>$PlotBorderAlpha);
+
+         $AxisID	= $Serie["Axis"];
+         $Mode		= $Data["Axis"][$AxisID]["Display"];
+         $Format	= $Data["Axis"][$AxisID]["Format"];
+         $Unit		= $Data["Axis"][$AxisID]["Unit"];
+
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]),TRUE);
+         $YZero    = $this->scaleComputeY(0,array("AxisID"=>$Serie["Axis"]));
+
+         $this->DataSet->Data["Series"][$SerieName]["XOffset"] = 0;
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $YZero < $this->GraphAreaY1+1 ) { $YZero = $this->GraphAreaY1+1; }
+           if ( $YZero > $this->GraphAreaY2-1 ) { $YZero = $this->GraphAreaY2-1; }
+
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X = $this->GraphAreaX1 + $XMargin;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+           $Plots = ""; $Plots[] = $X; $Plots[] = $YZero;
+           foreach($PosArray as $Key => $Height)
+            {
+             if ( $Height != VOID ) { $Plots[] = $X; $Plots[] = $YZero-$Height; }
+             $X = $X + $XStep;
+            }
+           $Plots[] = $X-$XStep; $Plots[] = $YZero;
+
+           $this->drawPolygon($Plots,$Color);
+
+           $this->Shadow = $RestoreShadow;
+           if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
+           if ( $DrawPlot )
+            {
+             for($i=2; $i<=count($Plots)-4; $i=$i+2)
+              {
+               if ( $PlotBorder != 0 )
+                { $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius+$PlotBorder,$PlotBorderColor); }
+
+               $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
+              }
+            }
+           $this->Shadow = FALSE;
+          }
+         elseif ( $Data["Orientation"] == SCALE_POS_TOPBOTTOM )
+          {
+           if ( $YZero < $this->GraphAreaX1+1 ) { $YZero = $this->GraphAreaX1+1; }
+           if ( $YZero > $this->GraphAreaX2-1 ) { $YZero = $this->GraphAreaX2-1; }
+
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y = $this->GraphAreaY1 + $XMargin;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+           $Plots = ""; $Plots[] = $YZero; $Plots[] = $Y;
+           foreach($PosArray as $Key => $Height)
+            {
+             if ( $Height != VOID ) { $Plots[] = $YZero+$Height; $Plots[] = $Y; }
+             $Y = $Y + $YStep;
+            }
+           $Plots[] = $YZero; $Plots[] = $Y-$YStep;
+
+           $this->drawPolygon($Plots,$Color);
+
+           $this->Shadow = $RestoreShadow;
+           if ( $DrawLine ) { for($i=2; $i<=count($Plots)-6; $i=$i+2) { $this->drawLine($Plots[$i],$Plots[$i+1],$Plots[$i+2],$Plots[$i+3],$LineColor); } }
+           if ( $DrawPlot )
+            {
+             for($i=2; $i<=count($Plots)-4; $i=$i+2)
+              {
+               if ( $PlotBorder != 0 )
+                { $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius+$PlotBorder,$PlotBorderColor); }
+
+               $this->drawFilledCircle($Plots[$i],$Plots[$i+1],$PlotRadius,$Color);
+              }
+            }
+           $this->Shadow = FALSE;
+          }
+        }
+      }
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Returns a random color */
+   function getRandomColor($Alpha=100)
+    { return(array("R"=>rand(0,255),"G"=>rand(0,255),"B"=>rand(0,255),"Alpha"=>$Alpha)); }
+ 
+   /* Validate a palette */
+   function validatePalette($Colors,$Surrounding=NULL)
+    {
+     $Result = "";
+
+     if ( !is_array($Colors) ) { return($this->getRandomColor()); }
+
+     foreach($Colors as $Key => $Values)
+      {
+       if ( isset($Values["R"]) ) { $Result[$Key]["R"] = $Values["R"]; } else { $Result[$Key]["R"] = rand(0,255); }
+       if ( isset($Values["G"]) ) { $Result[$Key]["G"] = $Values["G"]; } else { $Result[$Key]["G"] = rand(0,255); }
+       if ( isset($Values["B"]) ) { $Result[$Key]["B"] = $Values["B"]; } else { $Result[$Key]["B"] = rand(0,255); }
+       if ( isset($Values["Alpha"]) ) { $Result[$Key]["Alpha"] = $Values["Alpha"]; } else { $Result[$Key]["Alpha"] = 100; }
+
+       if ( $Surrounding != NULL )
+        {
+         $Result[$Key]["BorderR"] = $Result[$Key]["R"] + $Surrounding;
+         $Result[$Key]["BorderG"] = $Result[$Key]["G"] + $Surrounding;
+         $Result[$Key]["BorderB"] = $Result[$Key]["B"] + $Surrounding;
+        }
+       else
+        {
+         if ( isset($Values["BorderR"]) )     { $Result[$Key]["BorderR"] = $Values["BorderR"]; } else { $Result[$Key]["BorderR"] = $Result[$Key]["R"]; }
+         if ( isset($Values["BorderG"]) )     { $Result[$Key]["BorderG"] = $Values["BorderG"]; } else { $Result[$Key]["BorderG"] = $Result[$Key]["G"]; }
+         if ( isset($Values["BorderB"]) )     { $Result[$Key]["BorderB"] = $Values["BorderB"]; } else { $Result[$Key]["BorderB"] = $Result[$Key]["B"]; }
+         if ( isset($Values["BorderAlpha"]) ) { $Result[$Key]["BorderAlpha"] = $Values["BorderAlpha"]; } else { $Result[$Key]["BorderAlpha"] = $Result[$Key]["Alpha"]; }
+        }
+      }
+
+     return($Result);
+    }
+
+   /* Draw the derivative chart associated to the data series */
+   function drawDerivative($Format=NULL)
+    {
+     $Offset		= isset($Format["Offset"]) ? $Format["Offset"] : 10;
+     $SerieSpacing	= isset($Format["SerieSpacing"]) ? $Format["SerieSpacing"] : 3;
+     $DerivativeHeight	= isset($Format["DerivativeHeight"]) ? $Format["DerivativeHeight"] : 4;
+     $ShadedSlopeBox	= isset($Format["ShadedSlopeBox"]) ? $Format["ShadedSlopeBox"] : FALSE;
+     $DrawBackground	= isset($Format["DrawBackground"]) ? $Format["DrawBackground"] : TRUE;
+     $BackgroundR	= isset($Format["BackgroundR"]) ? $Format["BackgroundR"] : 255;
+     $BackgroundG	= isset($Format["BackgroundG"]) ? $Format["BackgroundG"] : 255;
+     $BackgroundB	= isset($Format["BackgroundB"]) ? $Format["BackgroundB"] : 255;
+     $BackgroundAlpha	= isset($Format["BackgroundAlpha"]) ? $Format["BackgroundAlpha"] : 20;
+     $DrawBorder	= isset($Format["DrawBorder"]) ? $Format["DrawBorder"] : TRUE;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 0;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 0;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 0;
+     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
+     $Caption		= isset($Format["Caption"]) ? $Format["Caption"] : TRUE;
+     $CaptionHeight	= isset($Format["CaptionHeight"]) ? $Format["CaptionHeight"] : 10;
+     $CaptionWidth	= isset($Format["CaptionWidth"]) ? $Format["CaptionWidth"] : 20;
+     $CaptionMargin	= isset($Format["CaptionMargin"]) ? $Format["CaptionMargin"] : 4;
+     $CaptionLine	= isset($Format["CaptionLine"]) ? $Format["CaptionLine"] : FALSE;
+     $CaptionBox	= isset($Format["CaptionBox"]) ? $Format["CaptionBox"] : FALSE;
+     $CaptionBorderR	= isset($Format["CaptionBorderR"]) ? $Format["CaptionBorderR"] : 0;
+     $CaptionBorderG	= isset($Format["CaptionBorderG"]) ? $Format["CaptionBorderG"] : 0;
+     $CaptionBorderB	= isset($Format["CaptionBorderB"]) ? $Format["CaptionBorderB"] : 0;
+     $CaptionFillR	= isset($Format["CaptionFillR"]) ? $Format["CaptionFillR"] : 255;
+     $CaptionFillG	= isset($Format["CaptionFillG"]) ? $Format["CaptionFillG"] : 255;
+     $CaptionFillB	= isset($Format["CaptionFillB"]) ? $Format["CaptionFillB"] : 255;
+     $CaptionFillAlpha	= isset($Format["CaptionFillAlpha"]) ? $Format["CaptionFillAlpha"] : 80;
+     $PositiveSlopeStartR	= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 184;
+     $PositiveSlopeStartG	= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 234;
+     $PositiveSlopeStartB	= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 88;
+     $PositiveSlopeEndR		= isset($Format["PositiveSlopeStartR"]) ? $Format["PositiveSlopeStartR"] : 239;
+     $PositiveSlopeEndG		= isset($Format["PositiveSlopeStartG"]) ? $Format["PositiveSlopeStartG"] : 31;
+     $PositiveSlopeEndB		= isset($Format["PositiveSlopeStartB"]) ? $Format["PositiveSlopeStartB"] : 36;
+     $NegativeSlopeStartR	= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 184;
+     $NegativeSlopeStartG	= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 234;
+     $NegativeSlopeStartB	= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 88;
+     $NegativeSlopeEndR		= isset($Format["NegativeSlopeStartR"]) ? $Format["NegativeSlopeStartR"] : 67;
+     $NegativeSlopeEndG		= isset($Format["NegativeSlopeStartG"]) ? $Format["NegativeSlopeStartG"] : 124;
+     $NegativeSlopeEndB		= isset($Format["NegativeSlopeStartB"]) ? $Format["NegativeSlopeStartB"] : 227;
+
+     $Data = $this->DataSet->getData();
+
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+      $YPos = $this->DataSet->Data["GraphArea"]["Y2"] + $Offset;
+     else
+      $XPos = $this->DataSet->Data["GraphArea"]["X2"] + $Offset;
+
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; $Alpha = $Serie["Color"]["Alpha"]; $Ticks = $Serie["Ticks"]; $Weight = $Serie["Weight"];
+
+         $AxisID   = $Serie["Axis"];
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $Caption )
+            {
+             if ( $CaptionLine ) 
+              {
+               $StartX = floor($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin);
+               $EndX   = floor($this->GraphAreaX1-$CaptionMargin+$XMargin);
+
+               $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+               if ( $CaptionBox ) { $this->drawFilledRectangle($StartX,$YPos,$EndX,$YPos+$CaptionHeight,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
+               $this->drawLine($StartX+2,$YPos+($CaptionHeight/2),$EndX-2,$YPos+($CaptionHeight/2),$CaptionSettings);
+              }
+             else
+              $this->drawFilledRectangle($this->GraphAreaX1-$CaptionWidth+$XMargin-$CaptionMargin,$YPos,$this->GraphAreaX1-$CaptionMargin+$XMargin,$YPos+$CaptionHeight,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+            }
+
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X = $this->GraphAreaX1 + $XMargin;
+
+           $TopY    = $YPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
+           $BottomY = $YPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
+
+           $StartX  = floor($this->GraphAreaX1+$XMargin);
+           $EndX    = floor($this->GraphAreaX2-$XMargin);
+
+           if ( $DrawBackground ) { $this->drawFilledRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
+           if ( $DrawBorder ) { $this->drawRectangle($StartX-1,$TopY-1,$EndX+1,$BottomY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+           $RestoreShadow = $this->Shadow;
+           $this->Shadow  = FALSE;
+
+           /* Determine the Max slope index */
+           $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $Y != VOID && $LastX != NULL )
+              { $Slope = ($LastY - $Y); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
+
+             if ( $Y == VOID )
+              { $LastX = NULL; $LastY = NULL; }
+             else
+              { $LastX = $X; $LastY = $Y; }
+            }
+
+           $LastX = NULL; $LastY = NULL; $LastColor = NULL;
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $Y != VOID && $LastY != NULL )
+              {
+               $Slope = ($LastY - $Y);
+
+               if ( $Slope >= 0 )
+                {
+                 $SlopeIndex = (100 / $MaxSlope) * $Slope;
+                 $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
+                 $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
+                 $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
+                }
+               elseif ( $Slope < 0 )
+                {
+                 $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
+                 $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
+                 $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
+                 $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
+                }
+
+               $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
+
+               if ( $ShadedSlopeBox && $LastColor != NULL ) // && $Slope != 0
+                {
+                 $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+                 $this->drawGradientArea($LastX,$TopY,$X,$BottomY,DIRECTION_HORIZONTAL,$GradientSettings);
+                }
+               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) // || $Slope == 0
+                $this->drawFilledRectangle(floor($LastX),$TopY,floor($X),$BottomY,$Color);
+
+               $LastColor = $Color;
+              }
+
+             if ( $Y == VOID )
+              { $LastY = NULL; }
+             else
+              { $LastX = $X; $LastY = $Y; }
+
+             $X = $X + $XStep;
+            }
+
+           $YPos = $YPos + $CaptionHeight + $SerieSpacing;
+          }
+         else
+          {
+           if ( $Caption )
+            {
+             $StartY = floor($this->GraphAreaY1-$CaptionWidth+$XMargin-$CaptionMargin);
+             $EndY   = floor($this->GraphAreaY1-$CaptionMargin+$XMargin);
+             if ( $CaptionLine ) 
+              {
+               $CaptionSettings = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks,"Weight"=>$Weight);
+               if ( $CaptionBox ) { $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$CaptionFillR,"G"=>$CaptionFillG,"B"=>$CaptionFillB,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB,"Alpha"=>$CaptionFillAlpha)); }
+               $this->drawLine($XPos+($CaptionHeight/2),$StartY+2,$XPos+($CaptionHeight/2),$EndY-2,$CaptionSettings);
+              }
+             else
+              $this->drawFilledRectangle($XPos,$StartY,$XPos+$CaptionHeight,$EndY,array("R"=>$R,"G"=>$G,"B"=>$B,"BorderR"=>$CaptionBorderR,"BorderG"=>$CaptionBorderG,"BorderB"=>$CaptionBorderB));
+            }
+
+
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y = $this->GraphAreaY1 + $XMargin;
+
+           $TopX    = $XPos + ($CaptionHeight/2) - ($DerivativeHeight/2);
+           $BottomX = $XPos + ($CaptionHeight/2) + ($DerivativeHeight/2);
+
+           $StartY  = floor($this->GraphAreaY1+$XMargin);
+           $EndY    = floor($this->GraphAreaY2-$XMargin);
+
+           if ( $DrawBackground ) { $this->drawFilledRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BackgroundR,"G"=>$BackgroundG,"B"=>$BackgroundB,"Alpha"=>$BackgroundAlpha)); }
+           if ( $DrawBorder ) { $this->drawRectangle($TopX-1,$StartY-1,$BottomX+1,$EndY+1,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+
+           $RestoreShadow = $this->Shadow;
+           $this->Shadow  = FALSE;
+
+           /* Determine the Max slope index */
+           $LastX = NULL; $LastY = NULL; $MinSlope = 0; $MaxSlope = 1;
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $X != VOID && $LastX != NULL )
+              { $Slope = ($X - $LastX); if ( $Slope > $MaxSlope ) { $MaxSlope = $Slope; } if ( $Slope < $MinSlope ) { $MinSlope = $Slope; } }
+
+             if ( $X == VOID )
+              { $LastX = NULL; }
+             else
+              { $LastX = $X; }
+            }
+
+           $LastX = NULL; $LastY = NULL; $LastColor = NULL;
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $X != VOID && $LastX != NULL )
+              {
+               $Slope = ($X - $LastX);
+
+               if ( $Slope >= 0 )
+                {
+                 $SlopeIndex = (100 / $MaxSlope) * $Slope;
+                 $R = (($PositiveSlopeEndR - $PositiveSlopeStartR)/100)*$SlopeIndex+$PositiveSlopeStartR;
+                 $G = (($PositiveSlopeEndG - $PositiveSlopeStartG)/100)*$SlopeIndex+$PositiveSlopeStartG;
+                 $B = (($PositiveSlopeEndB - $PositiveSlopeStartB)/100)*$SlopeIndex+$PositiveSlopeStartB;
+                }
+               elseif ( $Slope < 0 )
+                {
+                 $SlopeIndex = (100 / abs($MinSlope)) * abs($Slope);
+                 $R = (($NegativeSlopeEndR - $NegativeSlopeStartR)/100)*$SlopeIndex+$NegativeSlopeStartR;
+                 $G = (($NegativeSlopeEndG - $NegativeSlopeStartG)/100)*$SlopeIndex+$NegativeSlopeStartG;
+                 $B = (($NegativeSlopeEndB - $NegativeSlopeStartB)/100)*$SlopeIndex+$NegativeSlopeStartB;
+                }
+
+               $Color = array("R"=>$R,"G"=>$G,"B"=>$B);
+
+               if ( $ShadedSlopeBox && $LastColor != NULL )
+                {
+                 $GradientSettings = array("StartR"=>$LastColor["R"],"StartG"=>$LastColor["G"],"StartB"=>$LastColor["B"],"EndR"=>$R,"EndG"=>$G,"EndB"=>$B);
+
+                 $this->drawGradientArea($TopX,$LastY,$BottomX,$Y,DIRECTION_VERTICAL,$GradientSettings);
+                }
+               elseif ( !$ShadedSlopeBox || $LastColor == NULL ) 
+                $this->drawFilledRectangle($TopX,floor($LastY),$BottomX,floor($Y),$Color);
+
+               $LastColor = $Color;
+              }
+
+             if ( $X == VOID )
+              { $LastX = NULL; }
+             else
+              { $LastX = $X; $LastY = $Y; }
+
+             $Y = $Y + $XStep;
+            }
+
+           $XPos = $XPos + $CaptionHeight + $SerieSpacing;
+          }
+
+         $this->Shadow = $RestoreShadow;
+        }
+      }
+    }
+
+   /* Draw the line of best fit */
+   function drawBestFit($Format="")
+    {
+     $OverrideTicks	= isset($Format["Ticks"]) ? $Format["Ticks"] : NULL;
+     $OverrideR		= isset($Format["R"]) ? $Format["R"] : VOID;
+     $OverrideG		= isset($Format["G"]) ? $Format["G"] : VOID;
+     $OverrideB		= isset($Format["B"]) ? $Format["B"] : VOID;
+     $OverrideAlpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : VOID;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     foreach($Data["Series"] as $SerieName => $Serie)
+      {
+       if ( $Serie["isDrawable"] == TRUE && $SerieName != $Data["Abscissa"] )
+        {
+         if ( $OverrideR != VOID && $OverrideG != VOID && $OverrideB != VOID ) { $R = $OverrideR; $G = $OverrideG; $B = $OverrideB; } else { $R = $Serie["Color"]["R"]; $G = $Serie["Color"]["G"]; $B = $Serie["Color"]["B"]; }
+         if ( $OverrideTicks == NULL ) { $Ticks = $Serie["Ticks"]; } else { $Ticks = $OverrideTicks; }
+         if ( $OverrideAlpha == VOID ) { $Alpha = $Serie["Color"]["Alpha"]; } else { $Alpha = $OverrideAlpha; }
+
+         $Color = array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"Ticks"=>$Ticks);
+
+         $AxisID   = $Serie["Axis"];
+         $PosArray = $this->scaleComputeY($Serie["Data"],array("AxisID"=>$Serie["Axis"]));
+
+         if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+          {
+           if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+           $X = $this->GraphAreaX1 + $XMargin;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
+           foreach($PosArray as $Key => $Y)
+            {
+             if ( $Y != VOID )
+              {
+               $Sxy = $Sxy + $X*$Y;
+               $Sx  = $Sx + $X;
+               $Sy  = $Sy + $Y;
+               $Sxx = $Sxx + $X*$X;
+              }
+
+             $X = $X + $XStep;
+            }
+           $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
+           $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
+           $B = (($Sy)-($M*$Sx))/($n);
+
+           $X1 = $this->GraphAreaX1 + $XMargin;
+           $Y1 = $M * $X1 + $B;
+           $X2 = $this->GraphAreaX2 - $XMargin;
+           $Y2 = $M * $X2 + $B;
+
+           if ( $Y1 < $this->GraphAreaY1 ) { $X1 = $X1 + ($this->GraphAreaY1-$Y1); $Y1 = $this->GraphAreaY1; }
+           if ( $Y1 > $this->GraphAreaY2 ) { $X1 = $X1 + ($Y1-$this->GraphAreaY2); $Y1 = $this->GraphAreaY2; }
+           if ( $Y2 < $this->GraphAreaY1 ) { $X2 = $X2 - ($this->GraphAreaY1-$Y2); $Y2 = $this->GraphAreaY1; }
+           if ( $Y2 > $this->GraphAreaY2 ) { $X2 = $X2 - ($Y2-$this->GraphAreaY2); $Y2 = $this->GraphAreaY2; }
+
+           $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
+          }
+         else
+          {
+           if ( $XDivs == 0 ) { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $YStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+           $Y = $this->GraphAreaY1 + $XMargin;
+
+           if ( !is_array($PosArray) ) { $Value = $PosArray; $PosArray = ""; $PosArray[0] = $Value; }
+           $Sxy = 0; $Sx = 0; $Sy = 0; $Sxx = 0;
+           foreach($PosArray as $Key => $X)
+            {
+             if ( $X != VOID )
+              {
+               $Sxy = $Sxy + $X*$Y;
+               $Sx  = $Sx + $Y;
+               $Sy  = $Sy + $X;
+               $Sxx = $Sxx + $Y*$Y;
+              }
+
+             $Y = $Y + $YStep;
+            }
+           $n = count($this->DataSet->stripVOID($PosArray)); //$n = count($PosArray);
+           $M = (($n*$Sxy)-($Sx*$Sy)) / (($n*$Sxx)-($Sx*$Sx));
+           $B = (($Sy)-($M*$Sx))/($n);
+
+           $Y1 = $this->GraphAreaY1 + $XMargin;
+           $X1 = $M * $Y1 + $B;
+           $Y2 = $this->GraphAreaY2 - $XMargin;
+           $X2 = $M * $Y2 + $B;
+
+           if ( $X1 < $this->GraphAreaX1 ) { $Y1 = $Y1 + ($this->GraphAreaX1-$X1); $X1 = $this->GraphAreaX1; }
+           if ( $X1 > $this->GraphAreaX2 ) { $Y1 = $Y1 + ($X1-$this->GraphAreaX2); $X1 = $this->GraphAreaX2; }
+           if ( $X2 < $this->GraphAreaX1 ) { $Y2 = $Y2 - ($this->GraphAreaY1-$X2); $X2 = $this->GraphAreaX1; }
+           if ( $X2 > $this->GraphAreaX2 ) { $Y2 = $Y2 - ($X2-$this->GraphAreaX2); $X2 = $this->GraphAreaX2; }
+
+           $this->drawLine($X1,$Y1,$X2,$Y2,$Color);
+          }
+        }
+      }
+    }
+
+   /* Write labels */
+   function writeLabel($SeriesName,$Indexes,$Format="")
+    {
+     $OverrideTitle	= isset($Format["OverrideTitle"]) ? $Format["OverrideTitle"] : NULL;
+     $ForceLabels	= isset($Format["ForceLabels"]) ? $Format["ForceLabels"] : NULL;
+     $DrawPoint		= isset($Format["DrawPoint"]) ? $Format["DrawPoint"] : LABEL_POINT_BOX;
+     $DrawVerticalLine	= isset($Format["DrawVerticalLine"]) ? $Format["DrawVerticalLine"] : FALSE;
+     $VerticalLineR	= isset($Format["VerticalLineR"]) ? $Format["VerticalLineR"] : 0;
+     $VerticalLineG	= isset($Format["VerticalLineG"]) ? $Format["VerticalLineG"] : 0;
+     $VerticalLineB	= isset($Format["VerticalLineB"]) ? $Format["VerticalLineB"] : 0;
+     $VerticalLineAlpha	= isset($Format["VerticalLineAlpha"]) ? $Format["VerticalLineAlpha"] : 40;
+     $VerticalLineTicks	= isset($Format["VerticalLineTicks"]) ? $Format["VerticalLineTicks"] : 2;
+
+     $Data = $this->DataSet->getData();
+     list($XMargin,$XDivs) = $this->scaleGetXSettings();
+
+     if ( !is_array($Indexes) )    { $Index = $Indexes; $Indexes = ""; $Indexes[] = $Index; }
+     if ( !is_array($SeriesName) ) { $SerieName = $SeriesName; $SeriesName = ""; $SeriesName[] = $SerieName; }
+     if ( $ForceLabels != NULL && !is_array($ForceLabels) ) { $ForceLabel = $ForceLabels; $ForceLabels = ""; $ForceLabels[] = $ForceLabel; }
+
+     foreach ($Indexes as $Key => $Index)
+      {
+       $Series = "";
+
+       if ( $Data["Orientation"] == SCALE_POS_LEFTRIGHT )
+        {
+         if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1)/4; } else { $XStep = ($this->GraphAreaX2-$this->GraphAreaX1-$XMargin*2)/$XDivs; }
+         $X = $this->GraphAreaX1 + $XMargin + $Index * $XStep;
+
+         if ( $DrawVerticalLine ) { $this->drawLine($X,$this->GraphAreaY1+$Data["YMargin"],$X,$this->GraphAreaY2-$Data["YMargin"],array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
+
+         $MinY = $this->GraphAreaY2;
+         foreach ($SeriesName as $iKey => $SerieName)
+          {
+           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
+            {
+             $AxisID      = $Data["Series"][$SerieName]["Axis"];
+
+             if ( $OverrideTitle != NULL)
+              $Description = $OverrideTitle;
+             elseif ( count($SeriesName) == 1 )
+              {
+               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+                $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+               else
+                $Description = $Data["Series"][$SerieName]["Description"];
+              }
+             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+              $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+
+             $AxisMode     = $Data["Axis"][$AxisID]["Display"];
+             $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
+             $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
+
+             $Serie = "";
+             $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
+             $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
+             $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
+             $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
+
+             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
+              $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
+             else
+              $SerieOffset = 0;
+
+             $Value = $Data["Series"][$SerieName]["Data"][$Index];
+             if ( $Value == VOID ) { $Value = "NaN"; }
+
+             if ( $ForceLabels != NULL )
+              $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
+             else
+              $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+
+             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
+              {
+               if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
+
+               $Value = 0; $Done = FALSE;
+               foreach($Data["Series"] as $Name => $SerieLookup)
+                {
+                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
+                  {
+                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
+                    {
+                     if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
+                     if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
+                     if ($Name == $SerieName ) { $Done = TRUE; }
+                    }
+                  }
+                }
+              }
+
+             $X = floor($this->GraphAreaX1 + $XMargin + $Index * $XStep + $SerieOffset);
+             $Y = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
+
+             if ($Y < $MinY) { $MinY = $Y; }
+
+             if ( $DrawPoint == LABEL_POINT_CIRCLE )
+              $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+             elseif ( $DrawPoint == LABEL_POINT_BOX )
+              $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+
+             $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
+            }
+          }
+         $this->drawLabelBox($X,$MinY-3,$Description,$Series,$Format);
+
+        }
+       else
+        {
+         if ( $XDivs == 0 ) { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1)/4; } else { $XStep = ($this->GraphAreaY2-$this->GraphAreaY1-$XMargin*2)/$XDivs; }
+         $Y = $this->GraphAreaY1 + $XMargin + $Index * $XStep;
+
+         if ( $DrawVerticalLine ) { $this->drawLine($this->GraphAreaX1+$Data["YMargin"],$Y,$this->GraphAreaX2-$Data["YMargin"],$Y,array("R"=>$VerticalLineR,"G"=>$VerticalLineG,"B"=>$VerticalLineB,"Alpha"=>$VerticalLineAlpha,"Ticks"=>$VerticalLineTicks)); }
+
+         $MinX = $this->GraphAreaX2;
+         foreach ($SeriesName as $Key => $SerieName)
+          {
+           if ( isset($Data["Series"][$SerieName]["Data"][$Index]) )
+            {
+             $AxisID      = $Data["Series"][$SerieName]["Axis"];
+
+             if ( $OverrideTitle != NULL)
+              $Description = $OverrideTitle;
+             elseif ( count($SeriesName) == 1 )
+              {
+               if ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+                $Description = $Data["Series"][$SerieName]["Description"]." - ".$Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+               else
+                $Description = $Data["Series"][$SerieName]["Description"];
+              }
+             elseif ( isset($Data["Abscissa"]) && isset($Data["Series"][$Data["Abscissa"]]["Data"][$Index]) )
+              $Description = $Data["Series"][$Data["Abscissa"]]["Data"][$Index];
+
+             $AxisMode     = $Data["Axis"][$AxisID]["Display"];
+             $AxisFormat   = $Data["Axis"][$AxisID]["Format"];
+             $AxisUnit     = $Data["Axis"][$AxisID]["Unit"];
+
+             $Serie = "";
+             if ( isset($Data["Extended"]["Palette"][$Index] ) )
+              {
+               $Serie["R"] = $Data["Extended"]["Palette"][$Index]["R"];
+               $Serie["G"] = $Data["Extended"]["Palette"][$Index]["G"];
+               $Serie["B"] = $Data["Extended"]["Palette"][$Index]["B"];
+               $Serie["Alpha"] = $Data["Extended"]["Palette"][$Index]["Alpha"];
+              }
+             else
+              {
+               $Serie["R"] = $Data["Series"][$SerieName]["Color"]["R"];
+               $Serie["G"] = $Data["Series"][$SerieName]["Color"]["G"];
+               $Serie["B"] = $Data["Series"][$SerieName]["Color"]["B"];
+               $Serie["Alpha"] = $Data["Series"][$SerieName]["Color"]["Alpha"];
+              }
+
+             if ( count($SeriesName) == 1 && isset($Data["Series"][$SerieName]["XOffset"]) )
+              $SerieOffset = $Data["Series"][$SerieName]["XOffset"];
+             else
+              $SerieOffset = 0;
+
+             $Value = $Data["Series"][$SerieName]["Data"][$Index];
+             if ( $ForceLabels != NULL )
+              $Caption = isset($ForceLabels[$Key]) ? $ForceLabels[$Key] : "Not set";
+             else
+              $Caption = $this->scaleFormat($Value,$AxisMode,$AxisFormat,$AxisUnit);
+             if ( $Value == VOID ) { $Value = "NaN"; }
+
+             if ( $this->LastChartLayout == CHART_LAST_LAYOUT_STACKED )
+              {
+               if ( $Value >=0 ) { $LookFor = "+"; } else { $LookFor = "-"; }
+
+               $Value = 0; $Done = FALSE;
+               foreach($Data["Series"] as $Name => $SerieLookup)
+                {
+                 if ( $SerieLookup["isDrawable"] == TRUE && $Name != $Data["Abscissa"] && !$Done )
+                  {
+                   if ( isset($Data["Series"][$Name]["Data"][$Index]) && $Data["Series"][$Name]["Data"][$Index] != VOID )
+                    {
+                     if ($Data["Series"][$Name]["Data"][$Index] >= 0 && $LookFor == "+" ) { $Value = $Value + $Data["Series"][$Name]["Data"][$Index]; }
+                     if ($Data["Series"][$Name]["Data"][$Index] < 0 && $LookFor == "-" )  { $Value = $Value - $Data["Series"][$Name]["Data"][$Index]; }
+                     if ($Name == $SerieName ) { $Done = TRUE; }
+                    }
+                  }
+                }
+              }
+
+             $X = floor($this->scaleComputeY($Value,array("AxisID"=>$AxisID)));
+             $Y = floor($this->GraphAreaY1 + $XMargin + $Index * $XStep + $SerieOffset);
+
+             if ($X < $MinX) { $MinX = $X; }
+
+             if ( $DrawPoint == LABEL_POINT_CIRCLE )
+              $this->drawFilledCircle($X,$Y,3,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+             elseif ( $DrawPoint == LABEL_POINT_BOX )
+              $this->drawFilledRectangle($X-2,$Y-2,$X+2,$Y+2,array("R"=>255,"G"=>255,"B"=>255,"BorderR"=>0,"BorderG"=>0,"BorderB"=>0));
+
+             $Series[] = array("Format"=>$Serie,"Caption"=>$Caption);
+            }
+          }
+         $this->drawLabelBox($MinX,$Y-3,$Description,$Series,$Format);
+
+        }
+      }
+    }
+
+   /* Draw a label box */
+   function drawLabelBox($X,$Y,$Title,$Captions,$Format="")
+    {
+     $NoTitle		= isset($Format["NoTitle"]) ? $Format["NoTitle"] : NULL;
+     $BoxWidth		= isset($Format["BoxWidth"]) ? $Format["BoxWidth"] : 50;
+     $DrawSerieColor	= isset($Format["DrawSerieColor"]) ? $Format["DrawSerieColor"] : TRUE;
+     $SerieR		= isset($Format["SerieR"]) ? $Format["SerieR"] : NULL;
+     $SerieG		= isset($Format["SerieG"]) ? $Format["SerieG"] : NULL;
+     $SerieB		= isset($Format["SerieB"]) ? $Format["SerieB"] : NULL;
+     $SerieAlpha	= isset($Format["SerieAlpha"]) ? $Format["SerieAlpha"] : NULL;
+     $SerieBoxSize	= isset($Format["SerieBoxSize"]) ? $Format["SerieBoxSize"] : 6;
+     $SerieBoxSpacing	= isset($Format["SerieBoxSpacing"]) ? $Format["SerieBoxSpacing"] : 4;
+     $VerticalMargin	= isset($Format["VerticalMargin"]) ? $Format["VerticalMargin"] : 10;
+     $HorizontalMargin	= isset($Format["HorizontalMargin"]) ? $Format["HorizontalMargin"] : 8;
+     $R			= isset($Format["R"]) ? $Format["R"] : $this->FontColorR;
+     $G			= isset($Format["G"]) ? $Format["G"] : $this->FontColorG;
+     $B			= isset($Format["B"]) ? $Format["B"] : $this->FontColorB;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : $this->FontColorA;
+     $FontName		= isset($Format["FontName"]) ? $Format["FontName"] : $this->FontName;
+     $FontSize		= isset($Format["FontSize"]) ? $Format["FontSize"] : $this->FontSize;
+     $TitleMode		= isset($Format["TitleMode"]) ? $Format["TitleMode"] : LABEL_TITLE_NOBACKGROUND;
+     $TitleR		= isset($Format["TitleR"]) ? $Format["TitleR"] : $R;
+     $TitleG		= isset($Format["TitleG"]) ? $Format["TitleG"] : $G;
+     $TitleB		= isset($Format["TitleB"]) ? $Format["TitleB"] : $B;
+     $TitleBackgroundR	= isset($Format["TitleBackgroundR"]) ? $Format["TitleBackgroundR"] : 0;
+     $TitleBackgroundG	= isset($Format["TitleBackgroundG"]) ? $Format["TitleBackgroundG"] : 0;
+     $TitleBackgroundB	= isset($Format["TitleBackgroundB"]) ? $Format["TitleBackgroundB"] : 0;
+     $GradientStartR	= isset($Format["GradientStartR"]) ? $Format["GradientStartR"] : 255;
+     $GradientStartG	= isset($Format["GradientStartG"]) ? $Format["GradientStartG"] : 255;
+     $GradientStartB	= isset($Format["GradientStartB"]) ? $Format["GradientStartB"] : 255;
+     $GradientEndR	= isset($Format["GradientEndR"]) ? $Format["GradientEndR"] : 220;
+     $GradientEndG	= isset($Format["GradientEndG"]) ? $Format["GradientEndG"] : 220;
+     $GradientEndB	= isset($Format["GradientEndB"]) ? $Format["GradientEndB"] : 220;
+
+     if ( !$DrawSerieColor ) { $SerieBoxSize = 0; $SerieBoxSpacing = 0; }
+
+     $TxtPos      = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Title);
+     $TitleWidth  = ($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2;
+     $TitleHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
+
+     if ( $NoTitle ) { $TitleWidth = 0; $TitleHeight = 0; }
+
+     $CaptionWidth = 0; $CaptionHeight = -$HorizontalMargin;
+     foreach($Captions as $Key =>$Caption)
+      {
+       $TxtPos        = $this->getTextBox($X,$Y,$FontName,$FontSize,0,$Caption["Caption"]);
+       $CaptionWidth  = max($CaptionWidth,($TxtPos[1]["X"] - $TxtPos[0]["X"])+$VerticalMargin*2);
+       $CaptionHeight = $CaptionHeight + max(($TxtPos[0]["Y"] - $TxtPos[2]["Y"]),($SerieBoxSize+2)) + $HorizontalMargin;
+      }
+
+     if ( $CaptionHeight <= 5 ) { $CaptionHeight = $CaptionHeight + $HorizontalMargin/2; }
+
+     if ( $DrawSerieColor ) { $CaptionWidth = $CaptionWidth + $SerieBoxSize + $SerieBoxSpacing; }
+
+     $BoxWidth = max($BoxWidth,$TitleWidth,$CaptionWidth);
+
+     $XMin = $X - 5 - floor(($BoxWidth-10) / 2);
+     $XMax = $X + 5 + floor(($BoxWidth-10) / 2);
+
+     $RestoreShadow = $this->Shadow;
+     if ( $this->Shadow == TRUE )
+      {
+       $this->Shadow = FALSE;
+
+       $Poly = "";
+       $Poly[] = $X+$this->ShadowX; $Poly[] = $Y+$this->ShadowX;
+       $Poly[] = $X+5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+       $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+
+       if ( $NoTitle )
+        {
+         $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
+         $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2+$this->ShadowX;
+        }
+       else
+        {
+         $Poly[] = $XMax+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
+         $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3+$this->ShadowX;
+        }
+
+       $Poly[] = $XMin+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+       $Poly[] = $X-5+$this->ShadowX; $Poly[] = $Y-5+$this->ShadowX;
+       $this->drawPolygon($Poly,array("R"=>$this->ShadowR,"G"=>$this->ShadowG,"B"=>$this->ShadowB,"Alpha"=>$this->Shadowa));
+      }
+
+     /* Draw the background */
+     $GradientSettings = array("StartR"=>$GradientStartR,"StartG"=>$GradientStartG,"StartB"=>$GradientStartB,"EndR"=>$GradientEndR,"EndG"=>$GradientEndG,"EndB"=>$GradientEndB);
+     if ( $NoTitle )
+      $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+     else
+      $this->drawGradientArea($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-6,DIRECTION_VERTICAL,$GradientSettings);
+     $Poly = ""; $Poly[] = $X; $Poly[] = $Y; $Poly[] = $X-5; $Poly[] = $Y-5; $Poly[] = $X+5; $Poly[] = $Y-5;
+     $this->drawPolygon($Poly,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB,"NoBorder"=>TRUE));
+
+     /* Outer border */
+     $OuterBorderColor = $this->allocateColor($this->Picture,100,100,100,100);
+     imageline($this->Picture,$XMin,$Y-5,$X-5,$Y-5,$OuterBorderColor);
+     imageline($this->Picture,$X,$Y,$X-5,$Y-5,$OuterBorderColor);
+     imageline($this->Picture,$X,$Y,$X+5,$Y-5,$OuterBorderColor);
+     imageline($this->Picture,$X+5,$Y-5,$XMax,$Y-5,$OuterBorderColor);
+     if ( $NoTitle )
+      {
+       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin,$Y-5,$OuterBorderColor);
+       imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5,$OuterBorderColor);
+       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$OuterBorderColor);
+      }
+     else
+      {
+       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin,$Y-5,$OuterBorderColor);
+       imageline($this->Picture,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5,$OuterBorderColor);
+       imageline($this->Picture,$XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$OuterBorderColor);
+      }
+
+     /* Inner border */
+     $InnerBorderColor = $this->allocateColor($this->Picture,255,255,255,100);
+     imageline($this->Picture,$XMin+1,$Y-6,$X-5,$Y-6,$InnerBorderColor);
+     imageline($this->Picture,$X,$Y-1,$X-5,$Y-6,$InnerBorderColor);
+     imageline($this->Picture,$X,$Y-1,$X+5,$Y-6,$InnerBorderColor);
+     imageline($this->Picture,$X+5,$Y-6,$XMax-1,$Y-6,$InnerBorderColor);
+     if ( $NoTitle )
+      {
+       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMin+1,$Y-6,$InnerBorderColor);
+       imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-6,$InnerBorderColor);
+       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*2,$InnerBorderColor);
+      }
+     else
+      {
+       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMin+1,$Y-6,$InnerBorderColor);
+       imageline($this->Picture,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-6,$InnerBorderColor);
+       imageline($this->Picture,$XMin+1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax-1,$Y-4-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$InnerBorderColor);
+      }
+
+     /* Draw the separator line */
+     if ( $TitleMode == LABEL_TITLE_NOBACKGROUND && !$NoTitle )
+      {
+       $YPos    = $Y-7-$CaptionHeight-$HorizontalMargin-$HorizontalMargin/2;
+       $XMargin = $VerticalMargin / 2;
+       $this->drawLine($XMin+$XMargin,$YPos+1,$XMax-$XMargin,$YPos+1,array("R"=>$GradientEndR,"G"=>$GradientEndG,"B"=>$GradientEndB));
+       $this->drawLine($XMin+$XMargin,$YPos,$XMax-$XMargin,$YPos,array("R"=>$GradientStartR,"G"=>$GradientStartG,"B"=>$GradientStartB));
+      }
+     elseif ( $TitleMode == LABEL_TITLE_BACKGROUND )
+      {
+       $this->drawFilledRectangle($XMin,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin*3,$XMax,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2,array("R"=>$TitleBackgroundR,"G"=>$TitleBackgroundG,"B"=>$TitleBackgroundB));
+       imageline($this->Picture,$XMin+1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$XMax-1,$Y-5-$TitleHeight-$CaptionHeight-$HorizontalMargin+$HorizontalMargin/2+1,$InnerBorderColor);
+      }
+
+     /* Write the description */
+     if ( !$NoTitle )
+      $this->drawText($XMin+$VerticalMargin,$Y-7-$CaptionHeight-$HorizontalMargin*2,$Title,array("Align"=>TEXT_ALIGN_BOTTOMLEFT,"R"=>$TitleR,"G"=>$TitleG,"B"=>$TitleB));
+
+     /* Write the value */
+     $YPos = $Y-5-$HorizontalMargin; $XPos = $XMin+$VerticalMargin+$SerieBoxSize+$SerieBoxSpacing;
+     foreach($Captions as $Key => $Caption)
+      {
+       $CaptionTxt    = $Caption["Caption"];
+       $TxtPos        = $this->getTextBox($XPos,$YPos,$FontName,$FontSize,0,$CaptionTxt);
+       $CaptionHeight = ($TxtPos[0]["Y"] - $TxtPos[2]["Y"]);
+
+       /* Write the serie color if needed */
+       if ( $DrawSerieColor )
+        {
+         $BoxSettings = array("R"=>$Caption["Format"]["R"],"G"=>$Caption["Format"]["G"],"B"=>$Caption["Format"]["B"],"Alpha"=>$Caption["Format"]["Alpha"],"BorderR"=>0,"BorderG"=>0,"BorderB"=>0);
+         $this->drawFilledRectangle($XMin+$VerticalMargin,$YPos-$SerieBoxSize,$XMin+$VerticalMargin+$SerieBoxSize,$YPos,$BoxSettings);
+        }
+
+       $this->drawText($XPos,$YPos,$CaptionTxt,array("Align"=>TEXT_ALIGN_BOTTOMLEFT));
+
+       $YPos = $YPos - $CaptionHeight - $HorizontalMargin;
+      }
+
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Draw a basic shape */
+   function drawShape($X,$Y,$Shape,$PlotSize,$PlotBorder,$BorderSize,$R,$G,$B,$Alpha,$BorderR,$BorderG,$BorderB,$BorderAlpha)
+    {
+     if ( $Shape == SERIE_SHAPE_FILLEDCIRCLE )
+      {
+       if ( $PlotBorder ) { $this->drawFilledCircle($X,$Y,$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+       $this->drawFilledCircle($X,$Y,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+      }
+     elseif ( $Shape == SERIE_SHAPE_FILLEDSQUARE )
+      {
+       if ( $PlotBorder ) { $this->drawFilledRectangle($X-$PlotSize-$BorderSize,$Y-$PlotSize-$BorderSize,$X+$PlotSize+$BorderSize,$Y+$PlotSize+$BorderSize,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha)); }
+       $this->drawFilledRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+      }
+     elseif ( $Shape == SERIE_SHAPE_FILLEDTRIANGLE )
+      {
+       if ( $PlotBorder )
+        {
+         $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y+$PlotSize+$BorderSize;
+         $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
+        }
+
+       $Pos = ""; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X-$PlotSize; $Pos[]=$Y+$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y+$PlotSize;
+       $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+      }
+     elseif ( $Shape == SERIE_SHAPE_TRIANGLE )
+      {
+       $this->drawLine($X,$Y-$PlotSize,$X-$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+       $this->drawLine($X-$PlotSize,$Y+$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+       $this->drawLine($X+$PlotSize,$Y+$PlotSize,$X,$Y-$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+      }
+     elseif ( $Shape == SERIE_SHAPE_SQUARE )
+      $this->drawRectangle($X-$PlotSize,$Y-$PlotSize,$X+$PlotSize,$Y+$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+     elseif ( $Shape == SERIE_SHAPE_CIRCLE )
+      $this->drawCircle($X,$Y,$PlotSize,$PlotSize,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+     elseif ( $Shape == SERIE_SHAPE_DIAMOND )
+      {
+       $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
+       $this->drawPolygon($Pos,array("NoFill"=>TRUE,"BorderR"=>$R,"BorderG"=>$G,"BorderB"=>$B,"BorderAlpha"=>$Alpha));
+      }      
+     elseif ( $Shape == SERIE_SHAPE_FILLEDDIAMOND )
+      {
+       if ( $PlotBorder )
+        {
+         $Pos = ""; $Pos[]=$X-$PlotSize-$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize-$BorderSize; $Pos[]=$X+$PlotSize+$BorderSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize+$BorderSize;
+         $this->drawPolygon($Pos,array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha));
+        }
+
+       $Pos = ""; $Pos[]=$X-$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y-$PlotSize; $Pos[]=$X+$PlotSize; $Pos[]=$Y; $Pos[]=$X; $Pos[]=$Y+$PlotSize;
+       $this->drawPolygon($Pos,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha));
+      }      
+    }
+
+   function drawPolygonChart($Points,$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;
+     $NoFill		= isset($Format["NoFill"]) ? $Format["NoFill"] : FALSE;
+     $NoBorder		= isset($Format["NoBorder"]) ? $Format["NoBorder"] : FALSE;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : $R;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : $G;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : $B;
+     $BorderAlpha 	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : $Alpha / 2;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Threshold         = isset($Format["Threshold"]) ? $Format["Threshold"] : NULL;
+
+     if ( $Surrounding != NULL ) { $BorderR = $R+$Surrounding; $BorderG = $G+$Surrounding; $BorderB = $B+$Surrounding; }
+
+     $RestoreShadow = $this->Shadow;
+     $this->Shadow = FALSE;
+
+     $AllIntegers = TRUE;
+     for($i=0;$i<=count($Points)-2;$i=$i+2)
+      { if ( $this->getFirstDecimal($Points[$i+1]) != 0 ) { $AllIntegers = FALSE; } }
+
+     /* Convert polygon to segments */
+     $Segments = "";
+     for($i=2;$i<=count($Points)-2;$i=$i+2)
+      { $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[$i],"Y2"=>$Points[$i+1]); }
+     $Segments[] = array("X1"=>$Points[$i-2],"Y1"=>$Points[$i-1],"X2"=>$Points[0],"Y2"=>$Points[1]);
+
+     /* Simplify straight lines */
+     $Result = ""; $inHorizon = FALSE; $LastX = VOID;
+     foreach($Segments as $Key => $Pos)
+      {
+       if ( $Pos["Y1"] != $Pos["Y2"] )
+        {
+         if ( $inHorizon ) { $inHorizon = FALSE; $Result[] = array("X1"=>$LastX,"Y1"=>$Pos["Y1"],"X2"=>$Pos["X1"],"Y2"=>$Pos["Y1"]); }
+
+         $Result[] = array("X1"=>$Pos["X1"],"Y1"=>$Pos["Y1"],"X2"=>$Pos["X2"],"Y2"=>$Pos["Y2"]);
+        }
+       else { if ( !$inHorizon ) { $inHorizon = TRUE; $LastX = $Pos["X1"];} }
+      }
+     $Segments = $Result;
+
+     /* Do we have something to draw */
+     if ( $Segments == "" ) { return(0); }
+
+     /* For segments debugging purpose */
+     //foreach($Segments as $Key => $Pos)
+     // echo $Pos["X1"].",".$Pos["Y1"].",".$Pos["X2"].",".$Pos["Y2"]."\r\n";
+
+     /* Find out the min & max Y boundaries */
+     $MinY = OUT_OF_SIGHT; $MaxY = OUT_OF_SIGHT;
+     foreach($Segments as $Key => $Coords)
+      {
+       if ( $MinY == OUT_OF_SIGHT || $MinY > min($Coords["Y1"],$Coords["Y2"]) ) { $MinY = min($Coords["Y1"],$Coords["Y2"]); }
+       if ( $MaxY == OUT_OF_SIGHT || $MaxY < max($Coords["Y1"],$Coords["Y2"]) ) { $MaxY = max($Coords["Y1"],$Coords["Y2"]); }
+      }
+
+     if ( $AllIntegers ) { $YStep = 1; } else { $YStep = .5; }
+
+     $MinY = floor($MinY); $MaxY = floor($MaxY);
+
+     /* Scan each Y lines */
+     $DefaultColor = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+     $DebugLine = 0; $DebugColor = $this->allocateColor($this->Picture,255,0,0,100);
+
+     $MinY = floor($MinY); $MaxY = floor($MaxY); $YStep = 1; 
+
+     if ( !$NoFill )
+      {
+       //if ( $DebugLine ) { $MinY = $DebugLine; $MaxY = $DebugLine; }
+       for($Y=$MinY;$Y<=$MaxY;$Y=$Y+$YStep)
+        {
+         $Intersections = ""; $LastSlope = NULL; $RestoreLast = "-";
+         foreach($Segments as $Key => $Coords)
+          {
+           $X1 = $Coords["X1"]; $X2 = $Coords["X2"]; $Y1 = $Coords["Y1"]; $Y2 = $Coords["Y2"];
+
+           if ( min($Y1,$Y2) <= $Y && max($Y1,$Y2) >= $Y )
+            {
+             if ( $Y1 == $Y2 )
+              { $X = $X1; }
+             else
+              { $X = $X1 + ( ($Y-$Y1)*$X2 - ($Y-$Y1)*$X1 ) / ($Y2-$Y1); }
+
+             $X = floor($X);
+
+             if ( $X2 == $X1 )
+              { $Slope = "!"; }
+             else
+              {
+               $SlopeC = ($Y2 - $Y1) / ($X2 - $X1);
+               if( $SlopeC == 0 )
+                { $Slope = "="; }
+               elseif( $SlopeC > 0 )
+                { $Slope = "+"; }
+               elseif ( $SlopeC < 0 )
+                { $Slope = "-"; }
+              }
+
+             if ( !is_array($Intersections) )
+              { $Intersections[] = $X; }
+             elseif( !in_array($X,$Intersections) )
+              { $Intersections[] = $X; }
+             elseif( in_array($X,$Intersections) )
+              {
+               if ($Y == $DebugLine) { echo $Slope."/".$LastSlope."(".$X.") "; }
+
+               if ( $Slope == "=" && $LastSlope == "-"  )                             { $Intersections[] = $X; }
+               if ( $Slope != $LastSlope && $LastSlope != "!" && $LastSlope != "=" )  { $Intersections[] = $X; }
+               if ( $Slope != $LastSlope && $LastSlope == "!" && $Slope == "+" )      { $Intersections[] = $X; }
+              }
+
+             if ( is_array($Intersections) && in_array($X,$Intersections) && $LastSlope == "=" && ($Slope == "-" )) { $Intersections[] = $X; }
+
+             $LastSlope = $Slope;
+            }
+          }
+         if ( $RestoreLast != "-" ) { $Intersections[] = $RestoreLast; echo "@".$Y."\r\n"; }
+
+         if ( is_array($Intersections) )
+          {
+           sort($Intersections);
+
+           if ($Y == $DebugLine) { print_r($Intersections); }
+
+           /* Remove NULL plots */
+           $Result = "";
+           for($i=0;$i<=count($Intersections)-1;$i=$i+2)
+            {
+             if ( isset($Intersections[$i+1]) )
+              { if ( $Intersections[$i] != $Intersections[$i+1] ) { $Result[] = $Intersections[$i]; $Result[] = $Intersections[$i+1]; } }
+            }
+
+           if ( is_array($Result) )
+            {
+             $Intersections = $Result;
+
+             $LastX = OUT_OF_SIGHT;
+             foreach($Intersections as $Key => $X)
+              {
+               if ( $LastX == OUT_OF_SIGHT )
+                $LastX = $X;
+               elseif ( $LastX != OUT_OF_SIGHT )
+                {
+                 if ( $this->getFirstDecimal($LastX) > 1 ) { $LastX++; }
+
+                 $Color = $DefaultColor;
+                 if ( $Threshold != NULL )
+                  {
+                   foreach($Threshold as $Key => $Parameters)
+                    {
+                     if ( $Y <= $Parameters["MinX"] && $Y >= $Parameters["MaxX"])
+                      {
+                       if ( isset($Parameters["R"]) ) { $R = $Parameters["R"]; } else { $R = 0; }
+                       if ( isset($Parameters["G"]) ) { $G = $Parameters["G"]; } else { $G = 0; }
+                       if ( isset($Parameters["B"]) ) { $B = $Parameters["B"]; } else { $B = 0; }
+                       if ( isset($Parameters["Alpha"]) ) { $Alpha = $Parameters["Alpha"]; } else { $Alpha = 100; }
+                       $Color = $this->allocateColor($this->Picture,$R,$G,$B,$Alpha);
+                      }
+                    }
+                  }
+
+                 imageline($this->Picture,$LastX,$Y,$X,$Y,$Color);
+
+                 if ( $Y == $DebugLine) { imageline($this->Picture,$LastX,$Y,$X,$Y,$DebugColor); }
+
+                 $LastX = OUT_OF_SIGHT;
+                }
+              }
+            }
+          }
+        }
+      }
+
+     /* Draw the polygon border, if required */
+     if ( !$NoBorder)
+      {
+       foreach($Segments as $Key => $Coords)
+        $this->drawLine($Coords["X1"],$Coords["Y1"],$Coords["X2"],$Coords["Y2"],array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha,"Threshold"=>$Threshold));
+      }
+
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Return the abscissa margin */
+   function getAbscissaMargin($Data)
+    {
+     foreach($Data["Axis"] as $AxisID => $Values) { if ( $Values["Identity"] == AXIS_X ) { return($Values["Margin"]); } }
+     return(0);
+    }
+
+  }
+?>
diff --git a/libs/pChart2.1.3/class/pImage.class.php b/libs/pChart2.1.3/class/pImage.class.php
new file mode 100644
index 0000000000..6c9d318ba8
--- /dev/null
+++ b/libs/pChart2.1.3/class/pImage.class.php
@@ -0,0 +1,472 @@
+<?php
+ /*
+     pDraw - pChart core class
+
+     Version     : 2.1.3
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 09/09/11
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ /* The GD extension is mandatory */
+ if (!extension_loaded('gd') && !extension_loaded('gd2'))
+  {
+   echo "GD extension must be loaded. \r\n";
+   exit();
+  }
+
+ /* Image map handling */
+ define("IMAGE_MAP_STORAGE_FILE"	, 680001);
+ define("IMAGE_MAP_STORAGE_SESSION"	, 680002);
+
+ /* Last generated chart layout */
+ define("CHART_LAST_LAYOUT_REGULAR"	, 680011);
+ define("CHART_LAST_LAYOUT_STACKED"	, 680012);
+
+ /* ImageMap string delimiter */
+ define("IMAGE_MAP_DELIMITER"		, chr(1));
+
+ class pImage extends pDraw
+  {
+   /* Image settings, size, quality, .. */
+   var $XSize		= NULL;				// Width of the picture
+   var $YSize		= NULL;				// Height of the picture
+   var $Picture		= NULL;				// GD picture object
+   var $Antialias	= TRUE;				// Turn antialias on or off
+   var $AntialiasQuality  = 0;				// Quality of the antialiasing implementation (0-1)
+   var $Mask		= "";				// Already drawn pixels mask (Filled circle implementation)
+   var $TransparentBackground = FALSE;			// Just to know if we need to flush the alpha channels when rendering
+
+   /* Graph area settings */
+   var $GraphAreaX1	= NULL;				// Graph area X origin
+   var $GraphAreaY1	= NULL;				// Graph area Y origin
+   var $GraphAreaX2	= NULL;				// Graph area bottom right X position
+   var $GraphAreaY2	= NULL;				// Graph area bottom right Y position
+
+   /* Scale settings */
+   var $ScaleMinDivHeight = 20;				// Minimum height for scame divs
+
+   /* Font properties */
+   var $FontName	= "fonts/GeosansLight.ttf";	// Default font file
+   var $FontSize	= 12;				// Default font size
+   var $FontBox		= NULL;				// Return the bounding box of the last written string
+   var $FontColorR	= 0;				// Default color settings
+   var $FontColorG	= 0;				// Default color settings
+   var $FontColorB	= 0;				// Default color settings
+   var $FontColorA	= 100;				// Default transparency
+
+   /* Shadow properties */
+   var $Shadow		= FALSE;			// Turn shadows on or off
+   var $ShadowX		= NULL;				// X Offset of the shadow
+   var $ShadowY		= NULL;				// Y Offset of the shadow
+   var $ShadowR		= NULL;				// R component of the shadow
+   var $ShadowG		= NULL;				// G component of the shadow
+   var $ShadowB		= NULL;				// B component of the shadow
+   var $Shadowa		= NULL;				// Alpha level of the shadow
+
+   /* Image map */
+   var $ImageMap	= NULL;				// Aray containing the image map
+   var $ImageMapIndex	= "pChart";			// Name of the session array
+   var $ImageMapStorageMode = NULL;			// Save the current imagemap storage mode
+   var $ImageMapAutoDelete  = TRUE;			// Automatic deletion of the image map temp files
+
+   /* Data Set */
+   var $DataSet		= NULL;				// Attached dataset
+
+   /* Last generated chart info */
+   var $LastChartLayout	= CHART_LAST_LAYOUT_REGULAR;	// Last layout : regular or stacked
+
+   /* Class constructor */
+   function pImage($XSize,$YSize,$DataSet=NULL,$TransparentBackground=FALSE)
+    {
+     $this->TransparentBackground = $TransparentBackground;
+
+     if ( $DataSet != NULL ) { $this->DataSet = $DataSet; }
+
+     $this->XSize   = $XSize;
+     $this->YSize   = $YSize;
+     $this->Picture = imagecreatetruecolor($XSize,$YSize);
+
+     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
+      {
+       $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="")
+    {
+     $X	    = isset($Format["X"]) ? $Format["X"] : 2;
+     $Y	    = isset($Format["Y"]) ? $Format["Y"] : 2;
+     $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"] : 10;
+
+     $this->Shadow  = $Enabled;
+     $this->ShadowX = $X;
+     $this->ShadowY = $Y;
+     $this->ShadowR = $R;
+     $this->ShadowG = $G;
+     $this->ShadowB = $B;
+     $this->Shadowa = $Alpha;
+    }
+
+   /* Set the graph area position */
+   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;
+     $this->GraphAreaY1 = $Y1; $this->DataSet->Data["GraphArea"]["Y1"] = $Y1;
+     $this->GraphAreaX2 = $X2; $this->DataSet->Data["GraphArea"]["X2"] = $X2;
+     $this->GraphAreaY2 = $Y2; $this->DataSet->Data["GraphArea"]["Y2"] = $Y2;
+    }
+
+   /* Return the width of the picture */
+   function getWidth()
+    { return($this->XSize); }
+
+   /* Return the heigth of the picture */
+   function getHeight()
+    { return($this->YSize); }
+
+   /* Render the picture to a file */
+   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)
+    {
+     if ( $this->TransparentBackground ) { imagealphablending($this->Picture,false); imagesavealpha($this->Picture,true); }
+
+     if ( $BrowserExpire )
+      {
+       header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+       header("Cache-Control: no-cache");
+       header("Pragma: no-cache");
+      }
+
+     header('Content-type: image/png');
+     imagepng($this->Picture);
+    }
+
+   /* Automatic output method based on the calling interface */
+   function autoOutput($FileName="output.png")
+    {
+     if (php_sapi_name() == "cli")
+      $this->Render($FileName);
+     else
+      $this->Stroke();
+    }
+
+   /* Return the length between two points */
+   function getLength($X1,$Y1,$X2,$Y2)
+    { 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)
+    {
+     $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)
+    {
+     $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;
+
+     $RealPos[0]["X"] = $X; $RealPos[0]["Y"] = $Y;
+     $RealPos[1]["X"] = cos((360-$Angle)*PI/180)*$Width + $RealPos[0]["X"]; $RealPos[1]["Y"] = sin((360-$Angle)*PI/180)*$Width + $RealPos[0]["Y"];
+     $RealPos[2]["X"] = cos((270-$Angle)*PI/180)*$Height + $RealPos[1]["X"]; $RealPos[2]["Y"] = sin((270-$Angle)*PI/180)*$Height + $RealPos[1]["Y"];
+     $RealPos[3]["X"] = cos((180-$Angle)*PI/180)*$Width + $RealPos[2]["X"]; $RealPos[3]["Y"] = sin((180-$Angle)*PI/180)*$Width + $RealPos[2]["Y"];
+
+     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"] = $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"] = $RealPos[0]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"] = $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"] = $RealPos[1]["Y"];
+
+     return($RealPos);
+    }
+
+   /* Return the surrounding box of text area */
+   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)
+      {
+       $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);
+      }
+
+     $RealPos[TEXT_ALIGN_BOTTOMLEFT]["X"]	= $RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMLEFT]["Y"]	= $RealPos[0]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMRIGHT]["X"]	= $RealPos[1]["X"];	$RealPos[TEXT_ALIGN_BOTTOMRIGHT]["Y"]	= $RealPos[1]["Y"];
+     $RealPos[TEXT_ALIGN_TOPLEFT]["X"]		= $RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPLEFT]["Y"]	= $RealPos[3]["Y"];
+     $RealPos[TEXT_ALIGN_TOPRIGHT]["X"]		= $RealPos[2]["X"];	$RealPos[TEXT_ALIGN_TOPRIGHT]["Y"]	= $RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[0]["X"])/2+$RealPos[0]["X"];	$RealPos[TEXT_ALIGN_BOTTOMMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[1]["Y"])/2+$RealPos[1]["Y"];
+     $RealPos[TEXT_ALIGN_TOPMIDDLE]["X"]	= ($RealPos[2]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_TOPMIDDLE]["Y"]	= ($RealPos[3]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLELEFT]["X"]	= ($RealPos[0]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLELEFT]["Y"]	= ($RealPos[0]["Y"]-$RealPos[3]["Y"])/2+$RealPos[3]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLERIGHT]["X"]	= ($RealPos[1]["X"]-$RealPos[2]["X"])/2+$RealPos[2]["X"];	$RealPos[TEXT_ALIGN_MIDDLERIGHT]["Y"]	= ($RealPos[1]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+     $RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["X"]	= ($RealPos[1]["X"]-$RealPos[3]["X"])/2+$RealPos[3]["X"];	$RealPos[TEXT_ALIGN_MIDDLEMIDDLE]["Y"]	= ($RealPos[0]["Y"]-$RealPos[2]["Y"])/2+$RealPos[2]["Y"];
+
+     return($RealPos);
+    }
+
+   /* Set current font properties */
+   function setFontProperties($Format="")
+    {
+     $R		= isset($Format["R"]) ? $Format["R"] : -1;
+     $G		= isset($Format["G"]) ? $Format["G"] : -1;
+     $B		= isset($Format["B"]) ? $Format["B"] : -1;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $FontName	= isset($Format["FontName"]) ? $Format["FontName"] : NULL;
+     $FontSize	= isset($Format["FontSize"]) ? $Format["FontSize"] : NULL;
+
+     if ( $R != -1)       {  $this->FontColorR = $R; }
+     if ( $G != -1)       {  $this->FontColorG = $G; }
+     if ( $B != -1)       {  $this->FontColorB = $B; }
+     if ( $Alpha != NULL) {  $this->FontColorA = $Alpha; }
+
+     if ( $FontName != NULL  )
+      $this->FontName = $FontName;
+ 
+     if ( $FontSize != NULL  )
+      $this->FontSize = $FontSize;
+    }
+
+   /* Returns the 1st decimal values (used to correct AA bugs) */
+   function getFirstDecimal($Value)
+    {
+     $Values = preg_split("/\./",$Value);
+     if ( isset($Values[1]) ) { return(substr($Values[1],0,1)); } else { return(0); }
+    }
+
+   /* Attach a dataset to your pChart Object */
+   function setDataSet(&$DataSet)
+    { $this->DataSet = $DataSet; }
+
+   /* Print attached dataset contents to STDOUT */
+   function printDataSet()
+    { print_r($this->DataSet); }
+
+   /* Initialise the image map methods */
+   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(!isset($_SESSION)) { session_start(); }
+       $_SESSION[$this->ImageMapIndex]    = NULL;
+      }
+     elseif($StorageMode == IMAGE_MAP_STORAGE_FILE)
+      {
+       $this->ImageMapFileName 		= $UniqueID;
+       $this->ImageMapStorageFolder	= $StorageFolder;
+
+       if (file_exists($StorageFolder."/".$UniqueID.".map")) { unlink($StorageFolder."/".$UniqueID.".map"); }
+      }
+    }
+
+   /* Add a zone to the image map */
+   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 )
+      {
+       $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(!isset($_SESSION)) { $this->initialiseImageMap(); }
+       $_SESSION[$this->ImageMapIndex][] = array($Type,$Plots,$Color,$Title,$Message);
+      }
+     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);
+      }
+    }
+
+   /* Remove VOID values from an imagemap custom values array */
+   function removeVOIDFromArray($SerieName, $Values)
+    {
+     if ( !isset($this->DataSet->Data["Series"][$SerieName]) ) { return(-1); }
+
+     $Result = "";
+     foreach($this->DataSet->Data["Series"][$SerieName]["Data"] as $Key => $Value)
+      { if ( $Value != VOID && isset($Values[$Key]) ) { $Result[] = $Values[$Key]; } }
+     return($Result);
+    }
+
+   /* Replace the title of one image map serie */
+   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(!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
+        { foreach($_SESSION[$this->ImageMapIndex] as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $_SESSION[$this->ImageMapIndex][$Key][3] = $NewTitle; } } }
+      }
+     elseif( $this->ImageMapStorageMode == IMAGE_MAP_STORAGE_FILE )
+      {
+       $TempArray = "";
+       $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
+       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
+          { foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $OldTitle ) { $TempArray[$Key][3] = $NewTitle; } } }
+
+         $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
+         foreach($TempArray as $Key => $Settings)
+          { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
+         fclose($Handle);
+        }
+      }
+    }
+
+   /* Replace the values of the image map contents */
+   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(!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 )
+      {
+       $TempArray = "";
+       $Handle    = @fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", "r");
+       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);
+
+         foreach($TempArray as $Key => $Settings) { if ( $Settings[3] == $Title ) { if ( isset($Values[$ID]) ) { $TempArray[$Key][4] = $Values[$ID]; } $ID++; } }
+
+         $Handle = fopen($this->ImageMapStorageFolder."/".$this->ImageMapFileName.".map", 'w');
+         foreach($TempArray as $Key => $Settings)
+          { fwrite($Handle, $Settings[0].IMAGE_MAP_DELIMITER.$Settings[1].IMAGE_MAP_DELIMITER.$Settings[2].IMAGE_MAP_DELIMITER.$Settings[3].IMAGE_MAP_DELIMITER.$Settings[4]."\r\n"); }
+         fclose($Handle);
+        }
+      }
+    }
+
+   /* Dump the image map */
+   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(!isset($_SESSION)) { session_start(); }
+       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"))
+        {
+         $Handle = @fopen($StorageFolder."/".$UniqueID.".map", "r");
+         if ($Handle) { while (($Buffer = fgets($Handle, 4096)) !== false) { echo $Buffer; } }
+         fclose($Handle);
+
+         if ( $this->ImageMapAutoDelete ) { unlink($StorageFolder."/".$UniqueID.".map"); }
+        }
+      }
+
+     /* When the image map is returned to the client, the script ends */
+     exit();
+    }
+
+   /* Return the HTML converted color from the RGB composite values */
+   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;
+     return($Color);
+    }
+
+   /* Reverse an array of points */
+   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="")
+    {
+     $StartAlpha	= isset($Format["StartAlpha"]) ? $Format["StartAlpha"] : 80;
+     $EndAlpha		= isset($Format["EndAlpha"]) ? $Format["EndAlpha"] : 0;
+
+     $AlphaStep = ($StartAlpha-$EndAlpha)/$Height;
+
+     $Picture = imagecreatetruecolor($this->XSize,$this->YSize);
+     imagecopy($Picture,$this->Picture,0,0,0,0,$this->XSize,$this->YSize);
+     
+     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); }
+      }
+
+     imagecopy($this->Picture,$Picture,0,0,0,0,$this->XSize,$this->YSize);
+    }
+  }
+?>
diff --git a/libs/pChart2.1.3/class/pPie.class.php b/libs/pChart2.1.3/class/pPie.class.php
new file mode 100644
index 0000000000..5022f13798
--- /dev/null
+++ b/libs/pChart2.1.3/class/pPie.class.php
@@ -0,0 +1,1500 @@
+<?php
+ /*
+     pPie - class to draw pie charts
+
+     Version     : 2.1.3
+     Made by     : Jean-Damien POGOLOTTI
+     Last Update : 09/09/11
+
+     This file can be distributed under the license you can find at :
+
+                       http://www.pchart.net/license
+
+     You can find the whole class documentation on the pChart web site.
+ */
+
+ /* Class return codes */
+ define("PIE_NO_ABSCISSA"	, 140001);
+ define("PIE_NO_DATASERIE"	, 140002);
+ define("PIE_SUMISNULL"		, 140003);
+ define("PIE_RENDERED"		, 140000);
+
+ define("PIE_LABEL_COLOR_AUTO"	, 140010);
+ define("PIE_LABEL_COLOR_MANUAL", 140011);
+
+ define("PIE_VALUE_NATURAL"	, 140020);
+ define("PIE_VALUE_PERCENTAGE"	, 140021);
+
+ define("PIE_VALUE_INSIDE"      , 140030);
+ define("PIE_VALUE_OUTSIDE"     , 140031);
+
+ /* pPie class definition */
+ class pPie
+  {
+   var $pChartObject;
+   var $pDataObject;
+   var $LabelPos = "" ;
+
+   /* Class creator */
+   function pPie($Object,$pDataObject)
+    {
+     /* Cache the pChart object reference */
+     $this->pChartObject = $Object;
+
+     /* Cache the pData object reference */
+     $this->pDataObject  = $pDataObject;
+    }
+
+   /* Draw a pie chart */
+   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;
+     $DataGapRadius	= isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
+     $SecondPass	= isset($Format["SecondPass"]) ? $Format["SecondPass"] : TRUE;
+     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+     $Shadow		= isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+     $DrawLabels	= isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
+     $LabelStacked	= isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+     $LabelColor	= isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
+     $LabelR		= isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
+     $LabelG		= isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
+     $LabelB		= isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
+     $LabelAlpha	= isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+     $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL;
+     $ValuePosition	= isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
+     $ValueSuffix	= isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
+     $ValueR		= isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
+     $ValueG		= isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
+     $ValueB		= isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
+     $ValueAlpha	= isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     /* Data Processing */
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     /* Do we have an abscissa serie defined? */
+     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+     /* Try to find the data serie */
+     $DataSerie = "";
+     foreach ($Data["Series"] as $SerieName => $SerieData)
+      { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+
+     /* Do we have data to compute? */
+     if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+
+     /* Remove unused data */
+     list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+
+     /* Compute the pie sum */
+     $SerieSum = $this->pDataObject->getSum($DataSerie);
+
+     /* Do we have data to draw? */
+     if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+
+     /* Dump the real number of data to draw */
+     $Values = "";
+     foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+      { if ($Value != 0) { $Values[] = $Value; } }
+
+     /* Compute the wasted angular space between series */
+     if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+
+     /* Compute the scale */
+     $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+
+     $RestoreShadow = $this->pChartObject->Shadow;
+     if ( $this->pChartObject->Shadow )
+      {
+       $this->pChartObject->Shadow = FALSE;
+
+       $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
+       $this->draw2DPie($X+$this->pChartObject->ShadowX,$Y+$this->pChartObject->ShadowY,$ShadowFormat);
+      }
+
+     /* Draw the polygon pie elements */
+     $Step = 360 / (2 * PI * $Radius);
+     $Offset = 0; $ID = 0;
+     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
+        {
+         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 ( !$Border )
+          $Settings["Surrounding"] = 10;
+         else
+          { $Settings["BorderR"] = $BorderR; $Settings["BorderG"] = $BorderG; $Settings["BorderB"] = $BorderB; }
+        }
+
+       $Plots = "";
+       $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
+
+       $Angle = ($EndAngle - $Offset)/2 + $Offset;
+       if ($DataGapAngle == 0)
+        { $X0 = $X; $Y0 = $Y; }
+       else
+        {
+         $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)
+        {
+         $Xc = cos(($i-90)*PI/180) * $Radius + $X;
+         $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
+
+         if ( $SecondPass && ( $i<90 )) { $Yc++; }
+         if ( $SecondPass && ( $i>180 && $i<270 )) { $Xc++; }
+         if ( $SecondPass && ( $i>=270 )) { $Xc++; $Yc++; }
+
+         $Plots[] = $Xc; $Plots[] = $Yc;
+        }
+
+       $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 ( $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"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+         $Angle = ($EndAngle - $Offset)/2 + $Offset;
+         $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+         $Yc = sin(($Angle-90)*PI/180) * $Radius + $Y;
+
+         $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+
+         if ( $LabelStacked )
+          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
+         else
+          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+        }
+
+       $Offset = $i + $DataGapAngle; $ID++;
+      }
+
+     /* Second pass to smooth the angles */
+     if ( $SecondPass )
+      {
+       $Step = 360 / (2 * PI * $Radius);
+       $Offset = 0; $ID = 0;
+       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
+          {
+           if ( $Border )
+            $Settings = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB);
+           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 > 360 ) { $EndAngle = 360; }
+
+         if ($DataGapAngle == 0)
+          { $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)
+          {
+           $Xc = cos(($i-90)*PI/180) * $Radius + $X;
+           $Yc = sin(($i-90)*PI/180) * $Radius + $Y;
+
+           if ( $FirstPoint ) { $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); } { $FirstPoint = FALSE; }
+  
+           $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+          }
+         $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
+
+         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"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+           $Angle = ($EndAngle - $Offset)/2 + $Offset;
+           $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+           $Yc = sin(($Angle-90)*PI/180) * $Radius + $Y;
+
+           $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+
+           if ( $LabelStacked )
+            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius);
+           else
+            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+          }
+  
+         $Offset = $i + $DataGapAngle; $ID++;
+        }
+      }
+
+     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)
+        {
+         $EndAngle = ($Value*$ScaleFactor) + $Offset; if ( $EndAngle > 360 ) { $EndAngle = 0; }
+         $Angle    = ($EndAngle - $Offset)/2 + $Offset;
+
+         if ( $ValuePosition == PIE_VALUE_OUTSIDE )
+          {
+           $Xc = cos(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $X;
+           $Yc = sin(($Angle-90)*PI/180) * ($Radius+$ValuePadding) + $Y;
+          }
+         else
+          {
+           $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
+           $Yc = sin(($Angle-90)*PI/180) * ($Radius)/2 + $Y;
+          }
+
+         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
+          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+         elseif ( $WriteValues == PIE_VALUE_NATURAL )
+          $Display = $Value.$ValueSuffix;
+
+         $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
+
+         $Offset = $EndAngle + $DataGapAngle; $ID--;
+        }
+      }
+
+     if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+
+     $this->pChartObject->Shadow = $RestoreShadow;
+
+     return(PIE_RENDERED);
+    }
+
+   /* Draw a 3D pie chart */
+   function draw3DPie($X,$Y,$Format="")
+    {
+     /* Rendering layout */
+     $Radius		= isset($Format["Radius"]) ? $Format["Radius"] : 80;
+     $Precision		= isset($Format["Precision"]) ? $Format["Precision"] : 0;
+     $SkewFactor	= isset($Format["SkewFactor"]) ? $Format["SkewFactor"] : .5;
+     $SliceHeight	= isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 20;
+     $DataGapAngle	= isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 0;
+     $DataGapRadius	= isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 0;
+     $SecondPass	= isset($Format["SecondPass"]) ? $Format["SecondPass"] : TRUE;
+     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+     $Shadow		= isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+     $DrawLabels	= isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
+     $LabelStacked	= isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+     $LabelColor	= isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
+     $LabelR		= isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
+     $LabelG		= isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
+     $LabelB		= isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
+     $LabelAlpha	= isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+     $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL; //PIE_VALUE_PERCENTAGE
+     $ValuePosition	= isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_INSIDE;
+     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 15;
+     $ValueSuffix	= isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
+     $ValueR		= isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
+     $ValueG		= isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
+     $ValueB		= isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
+     $ValueAlpha	= isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     /* Error correction for overlaying rounded corners */
+     if ( $SkewFactor < .5 ) { $SkewFactor = .5; }
+
+     /* Data Processing */
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     /* Do we have an abscissa serie defined? */
+     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+     /* Try to find the data serie */
+     $DataSerie = "";
+     foreach ($Data["Series"] as $SerieName => $SerieData)
+      { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+
+     /* Do we have data to compute? */
+     if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+
+     /* Remove unused data */
+     list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+
+     /* Compute the pie sum */
+     $SerieSum = $this->pDataObject->getSum($DataSerie);
+
+     /* Do we have data to draw? */
+     if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+
+     /* Dump the real number of data to draw */
+     $Values = "";
+     foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+      { if ($Value != 0) { $Values[] = $Value; } }
+
+     /* Compute the wasted angular space between series */
+     if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+
+     /* Compute the scale */
+     $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+
+     $RestoreShadow = $this->pChartObject->Shadow;
+     if ( $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
+
+     /* Draw the polygon pie elements */
+     $Step   = 360 / (2 * PI * $Radius);
+     $Offset = 360; $ID = count($Values)-1;
+     $Values = array_reverse($Values);
+     $Slice  = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
+     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"]);
+
+       $SliceColors[$Slice] = $Settings;
+
+       $StartAngle = $Offset;
+       $EndAngle   = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+       if ( $StartAngle > 180 ) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
+       if ( $EndAngle < 180 )   { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
+
+       if ($DataGapAngle == 0)
+        { $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)
+        {
+         $Xc = cos(($i-90)*PI/180) * $Radius + $X;
+         $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y;
+
+         if ( ($SecondPass || $RestoreShadow ) && ( $i<90 )) { $Yc++; }
+         if ( ($SecondPass || $RestoreShadow ) && ( $i>90 && $i<180 )) { $Xc++; }
+         if ( ($SecondPass || $RestoreShadow ) && ( $i>180 && $i<270 )) { $Xc++; }
+         if ( ($SecondPass || $RestoreShadow ) && ( $i>=270 )) { $Xc++; $Yc++; }
+
+         $Slices[$Slice][] = $Xc; $Slices[$Slice][] = $Yc; $SliceAngle[$Slice][] = $i;
+        }
+
+       $Offset = $i - $DataGapAngle; $ID--; $Slice++;
+      }
+
+     /* Draw the bottom shadow if needed */
+     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; }
+
+         $Settings = array("R"=>$this->pChartObject->ShadowR,"G"=>$this->pChartObject->ShadowG,"B"=>$this->pChartObject->ShadowB,"Alpha"=>$this->pChartObject->Shadowa,"NoBorder"=>TRUE);
+         $this->pChartObject->drawPolygon($ShadowPie,$Settings);
+        }
+
+       $Step = 360 / (2 * PI * $Radius);
+       $Offset = 360;
+       foreach($Values as $Key => $Value)
+        {
+         $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+         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;
+
+           $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+          }
+
+         $Offset = $i - $DataGapAngle; $ID--;
+        }
+      }
+
+     /* Draw the bottom pie splice */
+     foreach($Slices as $SliceID => $Plots)
+      {
+       $Settings = $SliceColors[$SliceID];  $Settings["NoBorder"] = TRUE;
+       $this->pChartObject->drawPolygon($Plots,$Settings);
+
+       if ( $SecondPass )
+        {
+         $Settings = $SliceColors[$SliceID];
+         if ( $Border )
+          { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30;; }
+  
+         if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
+          {
+           $Angle = $SliceAngle[$SliceID][1];
+           $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+           $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
+           $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
+
+           $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
+           $Xc = cos(($Angle-90)*PI/180) * $Radius + $X;
+           $Yc = sin(($Angle-90)*PI/180) * $Radius*$SkewFactor + $Y;
+           $this->pChartObject->drawLine($Plots[0],$Plots[1],$Xc,$Yc,$Settings);
+          }
+        }
+      }
+
+     /* Draw the two vertical edges */
+     $Slices      = array_reverse($Slices);
+     $SliceColors = array_reverse($SliceColors);
+     foreach($Slices as $SliceID => $Plots)
+      {
+       $Settings = $SliceColors[$SliceID];
+       $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
+
+       if ( $Visible[$SliceID]["Start"] && isset($Plots[2])) /* Empty error handling */
+        {
+         $this->pChartObject->drawLine($Plots[2],$Plots[3],$Plots[2],$Plots[3]- $SliceHeight,array("R"=>$Settings["R"],"G"=>$Settings["G"],"B"=>$Settings["B"]));
+         $Border = "";
+         $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
+         $Border[] = $Plots[2]; $Border[] = $Plots[3] - $SliceHeight; $Border[] = $Plots[2]; $Border[] = $Plots[3]; 
+         $this->pChartObject->drawPolygon($Border,$Settings);
+        }
+      }
+
+     $Slices      = array_reverse($Slices);
+     $SliceColors = array_reverse($SliceColors);
+     foreach($Slices as $SliceID => $Plots)
+      {
+       $Settings = $SliceColors[$SliceID];
+       $Settings["R"]+= 10; $Settings["G"]+= 10; $Settings["B"]+= 10; $Settings["NoBorder"] = TRUE;
+       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 = "";
+         $Border[] = $Plots[0]; $Border[] = $Plots[1]; $Border[] = $Plots[0]; $Border[] = $Plots[1] - $SliceHeight;
+         $Border[] = $Plots[count($Plots)-2]; $Border[] = $Plots[count($Plots)-1] - $SliceHeight; $Border[] = $Plots[count($Plots)-2]; $Border[] = $Plots[count($Plots)-1]; 
+         $this->pChartObject->drawPolygon($Border,$Settings);
+        }
+      }
+
+     /* Draw the rounded edges */
+     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)
+        {
+         $Angle = $SliceAngle[$SliceID][$j/2];
+         if ( $Angle < 270 && $Angle > 90 )
+          {
+           $Border = "";
+           $Border[] = $Plots[$j];   $Border[] = $Plots[$j+1];
+           $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3];
+           $Border[] = $Plots[$j+2]; $Border[] = $Plots[$j+3] - $SliceHeight;
+           $Border[] = $Plots[$j];   $Border[] = $Plots[$j+1] - $SliceHeight;
+           $this->pChartObject->drawPolygon($Border,$Settings);
+          }
+        }
+
+       if ( $SecondPass )
+        {
+         $Settings = $SliceColors[$SliceID];
+         if ( $Border )
+          { $Settings["R"]+= 30; $Settings["G"]+= 30; $Settings["B"]+= 30; }
+  
+         if ( isset($SliceAngle[$SliceID][1]) ) /* Empty error handling */
+          {
+           $Angle = $SliceAngle[$SliceID][1];
+           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);
+            }
+          }
+
+         $Angle = $SliceAngle[$SliceID][count($SliceAngle[$SliceID])-1];
+         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 )
+          {
+           $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 )
+          {
+           $Xc = cos((0)*PI/180) * $Radius + $X;
+           $Yc = sin((0)*PI/180) * $Radius*$SkewFactor + $Y;
+           $this->pChartObject->drawLine($Xc,$Yc,$Xc,$Yc-$SliceHeight,$Settings);
+          }
+
+        }
+      }
+
+     /* Draw the top splice */
+     foreach($Slices as $SliceID => $Plots)
+      {
+       $Settings = $SliceColors[$SliceID];
+       $Settings["R"]+= 20; $Settings["G"]+= 20; $Settings["B"]+= 20;
+
+       $Top = "";
+       for($j=0;$j<count($Plots);$j=$j+2) { $Top[] = $Plots[$j]; $Top[] = $Plots[$j+1]- $SliceHeight; }
+       $this->pChartObject->drawPolygon($Top,$Settings);
+
+       if ( $RecordImageMap && !$Shadow ) { $this->pChartObject->addToImageMap("POLY",$this->arraySerialize($Top),$this->pChartObject->toHTMLColor($Settings["R"],$Settings["G"],$Settings["B"]),$Data["Series"][$Data["Abscissa"]]["Data"][count($Slices)-$SliceID-1],$Values[$SliceID]); }
+      }
+
+
+     /* Second pass to smooth the angles */
+     if ( $SecondPass )
+      {
+       $Step = 360 / (2 * PI * $Radius);
+       $Offset = 360; $ID = count($Values)-1;
+       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
+          {
+           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"],"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
+          {
+           $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)
+          {
+           $Xc = cos(($i-90)*PI/180) * $Radius + $X;
+           $Yc = sin(($i-90)*PI/180) * $Radius*$SkewFactor + $Y - $SliceHeight;
+
+           if ( $FirstPoint ) { $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings); } { $FirstPoint = FALSE; }
+  
+           $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+           if ($i < 270 && $i > 90 ) { $this->pChartObject->drawAntialiasPixel($Xc,$Yc+$SliceHeight,$Settings); }
+          }
+         $this->pChartObject->drawLine($Xc,$Yc,$X0,$Y0,$Settings);
+
+         $Offset = $i - $DataGapAngle; $ID--;
+        }
+      }
+
+     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)
+        {
+         $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+         $Angle = ($EndAngle - $Offset)/2 + $Offset;
+
+         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
+          {
+           $Xc = cos(($Angle-90)*PI/180) * ($Radius)/2 + $X;
+           $Yc = sin(($Angle-90)*PI/180) * ($Radius*$SkewFactor)/2 + $Y - $SliceHeight;
+          }
+
+         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
+          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+         elseif ( $WriteValues == PIE_VALUE_NATURAL )
+          $Display = $Value.$ValueSuffix;
+
+         $this->pChartObject->drawText($Xc,$Yc,$Display,$Settings);
+
+         $Offset = $EndAngle - $DataGapAngle; $ID--;
+        }
+      }
+
+     if ( $DrawLabels )
+      {
+       $Step = 360 / (2 * PI * $Radius);
+       $Offset = 360; $ID = count($Values)-1;
+       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"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+         $EndAngle = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+         $Angle = ($EndAngle - $Offset)/2 + $Offset;
+         $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]) )
+          {
+           $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$ID];
+
+           if ( $LabelStacked )
+            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$Radius,TRUE);
+           else
+            $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+          }
+
+         $Offset = $EndAngle - $DataGapAngle; $ID--;
+        }
+      }
+
+     if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+
+     $this->pChartObject->Shadow = $RestoreShadow;
+
+     return(PIE_RENDERED);
+    }
+
+   /* Draw the legend of pie chart */
+   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;
+     $FontG		= isset($Format["FontG"]) ? $Format["FontG"] : $this->pChartObject->FontColorG;
+     $FontB		= isset($Format["FontB"]) ? $Format["FontB"] : $this->pChartObject->FontColorB;
+     $BoxSize		= isset($Format["BoxSize"]) ? $Format["BoxSize"] : 5;
+     $Margin		= isset($Format["Margin"]) ? $Format["Margin"] : 5;
+     $R			= isset($Format["R"]) ? $Format["R"] : 200;
+     $G			= isset($Format["G"]) ? $Format["G"] : 200;
+     $B			= isset($Format["B"]) ? $Format["B"] : 200;
+     $Alpha		= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+     $Surrounding	= isset($Format["Surrounding"]) ? $Format["Surrounding"] : NULL;
+     $Style		= isset($Format["Style"]) ? $Format["Style"] : LEGEND_ROUND;
+     $Mode		= isset($Format["Mode"]) ? $Format["Mode"] : LEGEND_VERTICAL;
+
+     if ( $Surrounding != NULL ) { $BorderR = $R + $Surrounding; $BorderG = $G + $Surrounding; $BorderB = $B + $Surrounding; }
+
+     $YStep = max($this->pChartObject->FontSize,$BoxSize) + 5;
+     $XStep = $BoxSize + 5;
+
+     /* Data Processing */
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     /* Do we have an abscissa serie defined? */
+     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)
+      {
+       $BoxArray = $this->pChartObject->getTextBox($vX+$BoxSize+4,$vY+$BoxSize/2,$FontName,$FontSize,0,$Value);
+
+       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 )
+        {
+         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; }
+         $vX=$Boundaries["R"]+$XStep;
+        }
+      }
+     $vY=$vY-$YStep; $vX=$vX-$XStep;
+
+     $TopOffset  = $Y - $Boundaries["T"];
+     if ( $Boundaries["B"]-($vY+$BoxSize) < $TopOffset ) { $Boundaries["B"] = $vY+$BoxSize+$TopOffset; }
+
+     if ( $Style == LEGEND_ROUND )
+      $this->pChartObject->drawRoundedFilledRectangle($Boundaries["L"]-$Margin,$Boundaries["T"]-$Margin,$Boundaries["R"]+$Margin,$Boundaries["B"]+$Margin,$Margin,array("R"=>$R,"G"=>$G,"B"=>$B,"Alpha"=>$Alpha,"BorderR"=>$BorderR,"BorderG"=>$BorderG,"BorderB"=>$BorderB));
+     elseif ( $Style == LEGEND_BOX )
+      $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)
+      {
+       $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 )
+        {
+         $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 )
+        {
+         $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;
+        }
+      }
+
+     $this->Shadow = $RestoreShadow;
+    }
+
+   /* Set the color of the specified slice */
+   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;
+     $Alpha	= isset($Format["Alpha"]) ? $Format["Alpha"] : 100;
+
+     $this->pDataObject->Palette[$SliceID]["R"]     = $R;
+     $this->pDataObject->Palette[$SliceID]["G"]     = $G;
+     $this->pDataObject->Palette[$SliceID]["B"]     = $B;
+     $this->pDataObject->Palette[$SliceID]["Alpha"] = $Alpha;
+    }
+
+   /* Internally used compute the label positions */
+   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 )
+      {
+       $Settings["Angle"]  = 360-$Angle;
+       $Settings["Length"] = 25;
+       $Settings["Size"]   = 8;
+
+       $this->pChartObject->drawArrowLabel($X,$Y," ".$Label." ",$Settings);
+      }
+     else
+      {
+       $X2 = cos(deg2rad($Angle-90))*20+$X;
+       $Y2 = sin(deg2rad($Angle-90))*20+$Y;
+
+       $TxtPos = $this->pChartObject->getTextBox($X,$Y,$FontName,$FontSize,0,$Label);
+       $Height = $TxtPos[0]["Y"] - $TxtPos[2]["Y"];
+       $YTop    = $Y2 - $Height/2 - 2;
+       $YBottom = $Y2 + $Height/2 + 2;
+
+       if ( $this->LabelPos != "" )
+        {
+         $Done = FALSE;
+         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"])))
+              { $this->shift(0,180,-($Height+2),$Reversed); $Done = TRUE; }
+             if ( $Angle > 180 && $Angle <= 270 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+              { $this->shift(180,360,($Height+2),$Reversed); $Done = TRUE; }
+             if ( $Angle > 270 && $Angle <= 360 && (($YTop >= $Settings["YTop"] && $YTop <= $Settings["YBottom"]) || ($YBottom >= $Settings["YTop"] && $YBottom <= $Settings["YBottom"])))
+              { $this->shift(180,360,($Height+2),$Reversed); $Done = TRUE; }
+            }
+          }
+        }
+
+       $LabelSettings = array("YTop"=>$YTop,"YBottom"=>$YBottom,"Label"=>$Label,"Angle"=>$Angle,"X1"=>$X,"Y1"=>$Y,"X2"=>$X2,"Y2"=>$Y2);
+       if ( $Angle <= 180 ) { $LabelSettings["X3"] = $Xc+$Radius+$LabelOffset; }
+       if ( $Angle > 180 )  { $LabelSettings["X3"] = $Xc-$Radius-$LabelOffset; }
+       $this->LabelPos[] = $LabelSettings;
+      }
+    }
+
+   /* Internally used to shift label positions */
+   function shift($StartAngle,$EndAngle,$Offset,$Reversed)
+    {
+     if ( $Reversed ) { $Offset = -$Offset; }
+     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()
+    {
+     if ( $this->LabelPos == "" ) { return(0); }
+     foreach($this->LabelPos as $Key => $Settings)
+      {
+       $X1 = $Settings["X1"]; $Y1 = $Settings["Y1"];
+       $X2 = $Settings["X2"]; $Y2 = $Settings["Y2"];
+       $X3 = $Settings["X3"];
+       $Angle = $Settings["Angle"];
+       $Label = $Settings["Label"];
+
+       $this->pChartObject->drawArrow($X2,$Y2,$X1,$Y1,array("Size"=>8));
+       if ( $Angle <= 180 )
+        {
+         $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
+         $this->pChartObject->drawText($X3+2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLELEFT));
+        }
+       else
+        {
+         $this->pChartObject->drawLine($X2,$Y2,$X3,$Y2);
+         $this->pChartObject->drawText($X3-2,$Y2,$Label,array("Align"=>TEXT_ALIGN_MIDDLERIGHT));
+        }
+      }
+    }
+
+   /* Draw a ring chart */
+   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;
+     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+     $BorderR		= isset($Format["BorderR"]) ? $Format["BorderR"] : 255;
+     $BorderG		= isset($Format["BorderG"]) ? $Format["BorderG"] : 255;
+     $BorderB		= isset($Format["BorderB"]) ? $Format["BorderB"] : 255;
+     $BorderAlpha	= isset($Format["BorderAlpha"]) ? $Format["BorderAlpha"] : 100;
+     $Shadow		= isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+     $DrawLabels	= isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
+     $LabelStacked	= isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+     $LabelColor	= isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
+     $LabelR		= isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
+     $LabelG		= isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
+     $LabelB		= isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
+     $LabelAlpha	= isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+     $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : NULL; //PIE_VALUE_PERCENTAGE
+     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : 5;
+     $ValuePosition	= isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+     $ValueSuffix	= isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
+     $ValueR		= isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
+     $ValueG		= isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
+     $ValueB		= isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
+     $ValueAlpha	= isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     /* Data Processing */
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     /* Do we have an abscissa serie defined? */
+     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+     /* Try to find the data serie */
+     $DataSerie = "";
+     foreach ($Data["Series"] as $SerieName => $SerieData)
+      { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+
+     /* Do we have data to compute? */
+     if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+
+     /* Remove unused data */
+     list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+
+     /* Compute the pie sum */
+     $SerieSum = $this->pDataObject->getSum($DataSerie);
+
+     /* Do we have data to draw? */
+     if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+
+     /* Dump the real number of data to draw */
+     $Values = "";
+     foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+      { if ($Value != 0) { $Values[] = $Value; } }
+
+     /* Compute the wasted angular space between series */
+     if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = 0; } // count($Values)
+
+     /* Compute the scale */
+     $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+
+     $RestoreShadow = $this->pChartObject->Shadow;
+     if ( $this->pChartObject->Shadow )
+      {
+       $this->pChartObject->Shadow = FALSE;
+
+       $ShadowFormat = $Format; $ShadowFormat["Shadow"] = TRUE;
+       $this->draw2DRing($X+$this->pChartObject->ShadowX,$Y+$this->pChartObject->ShadowY,$ShadowFormat);
+      }
+
+     /* Draw the polygon pie elements */
+     $Step = 360 / (2 * PI * $OuterRadius);
+     $Offset = 0; $ID = 0;
+     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
+        {
+         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 ( $Border )
+          $BorderColor = array("R"=>$BorderR,"G"=>$BorderG,"B"=>$BorderB,"Alpha"=>$BorderAlpha);
+         else
+          $BorderColor = $Settings;
+        }
+
+       $Plots = ""; $Boundaries = ""; $AAPixels = "";
+       $EndAngle = $Offset+($Value*$ScaleFactor); if ( $EndAngle > 360 ) { $EndAngle = 360; }
+       for($i=$Offset;$i<=$EndAngle;$i=$i+$Step)
+        {
+         $Xc = cos(($i-90)*PI/180) * $OuterRadius + $X;
+         $Yc = sin(($i-90)*PI/180) * $OuterRadius + $Y;
+
+         if ( !isset($Boundaries[0]["X1"]) ) { $Boundaries[0]["X1"] = $Xc; $Boundaries[0]["Y1"] = $Yc; }
+         $AAPixels[] = array($Xc,$Yc);
+
+         if ( $i<90 ) { $Yc++; }
+         if ( $i>180 && $i<270 ) { $Xc++; }
+         if ( $i>=270 ) { $Xc++; $Yc++; }
+
+         $Plots[] = $Xc; $Plots[] = $Yc;
+        }
+       $Boundaries[1]["X1"] = $Xc; $Boundaries[1]["Y1"] = $Yc;
+       $Lasti = $EndAngle;
+
+       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;
+
+         if ( !isset($Boundaries[1]["X2"]) ) { $Boundaries[1]["X2"] = $Xc; $Boundaries[1]["Y2"] = $Yc; }
+         $AAPixels[] = array($Xc,$Yc);
+
+         $Xc = cos(($i-90)*PI/180) * $InnerRadius + $X;
+         $Yc = sin(($i-90)*PI/180) * $InnerRadius + $Y;
+
+         if ( $i<90 ) { $Yc++; }
+         if ( $i>180 && $i<270 ) { $Xc++; }
+         if ( $i>=270 ) { $Xc++; $Yc++; }
+
+         $Plots[] = $Xc; $Plots[] = $Yc;
+        }
+       $Boundaries[0]["X2"] = $Xc; $Boundaries[0]["Y2"] = $Yc;
+
+       /* Draw the polygon */
+       $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); }
+
+       /* Smooth the edges using AA */
+       foreach($AAPixels as $iKey => $Pos ) { $this->pChartObject->drawAntialiasPixel($Pos[0],$Pos[1],$BorderColor); }
+       $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 ( $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"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+         $Angle = ($EndAngle - $Offset)/2 + $Offset;
+         $Xc = cos(($Angle-90)*PI/180) * $OuterRadius + $X;
+         $Yc = sin(($Angle-90)*PI/180) * $OuterRadius + $Y;
+
+         $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+
+         if ( $LabelStacked )
+          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
+         else
+          $this->writePieLabel($Xc,$Yc,$Label,$Angle,$Settings,FALSE);
+        }
+
+       $Offset = $Lasti; $ID++;
+      }
+
+     if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+
+     if ( $WriteValues && !$Shadow )
+      {
+       $Step = 360 / (2 * PI * $OuterRadius);
+       $Offset = 0;
+       foreach($Values as $Key => $Value)
+        {
+         $EndAngle = $Offset+($Value*$ScaleFactor);
+         if ( $EndAngle > 360 ) { $EndAngle = 360; }
+
+         $Angle = $Offset+($Value*$ScaleFactor)/2;
+         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
+          {
+           $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;
+          }
+
+         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
+          $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+         elseif ( $WriteValues == PIE_VALUE_NATURAL )
+          $Display = $Value.$ValueSuffix;
+         else
+          $Label = "";
+
+         $this->pChartObject->drawText($Xc,$Yc,$Display,array("Align"=>$Align,"R"=>$ValueR,"G"=>$ValueG,"B"=>$ValueB));
+         $Offset = $EndAngle;
+        }
+      }
+
+     $this->pChartObject->Shadow = $RestoreShadow;
+
+     return(PIE_RENDERED);
+    }
+
+   /* Draw a 3D ring chart */
+   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;
+     $SkewFactor	= isset($Format["SkewFactor"]) ? $Format["SkewFactor"] : .6;
+     $SliceHeight	= isset($Format["SliceHeight"]) ? $Format["SliceHeight"] : 10;
+     $DataGapAngle	= isset($Format["DataGapAngle"]) ? $Format["DataGapAngle"] : 10;
+     $DataGapRadius	= isset($Format["DataGapRadius"]) ? $Format["DataGapRadius"] : 10;
+     $Border		= isset($Format["Border"]) ? $Format["Border"] : FALSE;
+     $Shadow		= isset($Format["Shadow"]) ? $Format["Shadow"] : FALSE;
+     $DrawLabels	= isset($Format["DrawLabels"]) ? $Format["DrawLabels"] : FALSE;
+     $LabelStacked	= isset($Format["LabelStacked"]) ? $Format["LabelStacked"] : FALSE;
+     $LabelColor	= isset($Format["LabelColor"]) ? $Format["LabelColor"] : PIE_LABEL_COLOR_MANUAL;
+     $LabelR		= isset($Format["LabelR"]) ? $Format["LabelR"] : 0;
+     $LabelG		= isset($Format["LabelG"]) ? $Format["LabelG"] : 0;
+     $LabelB		= isset($Format["LabelB"]) ? $Format["LabelB"] : 0;
+     $LabelAlpha	= isset($Format["LabelAlpha"]) ? $Format["LabelAlpha"] : 100;
+     $Cf		= isset($Format["Cf"]) ? $Format["Cf"] : 20;
+     $WriteValues	= isset($Format["WriteValues"]) ? $Format["WriteValues"] : PIE_VALUE_NATURAL;
+     $ValuePadding	= isset($Format["ValuePadding"]) ? $Format["ValuePadding"] : $SliceHeight + 15;
+     $ValuePosition	= isset($Format["ValuePosition"]) ? $Format["ValuePosition"] : PIE_VALUE_OUTSIDE;
+     $ValueSuffix	= isset($Format["ValueSuffix"]) ? $Format["ValueSuffix"] : "";
+     $ValueR		= isset($Format["ValueR"]) ? $Format["ValueR"] : 255;
+     $ValueG		= isset($Format["ValueG"]) ? $Format["ValueG"] : 255;
+     $ValueB		= isset($Format["ValueB"]) ? $Format["ValueB"] : 255;
+     $ValueAlpha	= isset($Format["ValueAlpha"]) ? $Format["ValueAlpha"] : 100;
+     $RecordImageMap	= isset($Format["RecordImageMap"]) ? $Format["RecordImageMap"] : FALSE;
+
+     /* Error correction for overlaying rounded corners */
+     if ( $SkewFactor < .5 ) { $SkewFactor = .5; }
+
+     /* Data Processing */
+     $Data    = $this->pDataObject->getData();
+     $Palette = $this->pDataObject->getPalette();
+
+     /* Do we have an abscissa serie defined? */
+     if ( $Data["Abscissa"] == "" ) { return(PIE_NO_ABSCISSA); }
+
+     /* Try to find the data serie */
+     $DataSerie = "";
+     foreach ($Data["Series"] as $SerieName => $SerieData)
+      { if ( $SerieName != $Data["Abscissa"]) { $DataSerie = $SerieName; } }
+
+     /* Do we have data to compute? */
+     if ( $DataSerie == "" ) { return(PIE_NO_DATASERIE); }
+
+     /* Remove unused data */
+     list($Data,$Palette) = $this->clean0Values($Data,$Palette,$DataSerie,$Data["Abscissa"]);
+
+     /* Compute the pie sum */
+     $SerieSum = $this->pDataObject->getSum($DataSerie);
+
+     /* Do we have data to draw? */
+     if ( $SerieSum == 0 ) { return(PIE_SUMISNULL); }
+
+     /* Dump the real number of data to draw */
+     $Values = "";
+     foreach ($Data["Series"][$DataSerie]["Data"] as $Key => $Value)
+      { if ($Value != 0) { $Values[] = $Value; } }
+
+     /* Compute the wasted angular space between series */
+     if (count($Values)==1) { $WastedAngular = 0; } else { $WastedAngular = count($Values) * $DataGapAngle; }
+
+     /* Compute the scale */
+     $ScaleFactor = (360 - $WastedAngular) / $SerieSum;
+
+     $RestoreShadow = $this->pChartObject->Shadow;
+     if ( $this->pChartObject->Shadow ) { $this->pChartObject->Shadow = FALSE; }
+
+     /* Draw the polygon ring elements */
+     $Offset = 360; $ID = count($Values)-1;
+     $Values = array_reverse($Values);
+     $Slice  = 0; $Slices = ""; $SliceColors = ""; $Visible = ""; $SliceAngle = "";
+     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"]);
+
+       $SliceColors[$Slice] = $Settings;
+
+       $StartAngle = $Offset;
+       $EndAngle   = $Offset-($Value*$ScaleFactor); if ( $EndAngle < 0 ) { $EndAngle = 0; }
+
+       if ( $StartAngle > 180 ) { $Visible[$Slice]["Start"] = TRUE; } else { $Visible[$Slice]["Start"] = TRUE; }
+       if ( $EndAngle < 180 )   { $Visible[$Slice]["End"] = FALSE; } else { $Visible[$Slice]["End"] = TRUE; }
+
+       $Step   = (360 / (2 * PI * $OuterRadius))/2;
+       $OutX1 = VOID; $OutY1 = VOID;
+       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);
+
+         $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-1) + $X;
+         $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius-1)*$SkewFactor + $Y;
+         $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+
+         $Xc = cos(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
+         $Yc = sin(($i-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
+         $this->pChartObject->drawAntialiasPixel($Xc,$Yc,$Settings);
+
+         if ( $OutX1 == VOID ) { $OutX1 = $Xc; $OutY1 = $Yc; }
+
+         if ( $i<90 ) { $Yc++; }
+         if ( $i>90 && $i<180 ) { $Xc++; }
+         if ( $i>180 && $i<270 ) { $Xc++; }
+         if ( $i>=270 ) { $Xc++; $Yc++; }
+
+         $Slices[$Slice]["BottomPoly"][] = floor($Xc); $Slices[$Slice]["BottomPoly"][] = floor($Yc);
+         $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc)-$SliceHeight;
+         $Slices[$Slice]["Angle"][] = $i;
+        }
+       $OutX2 = $Xc; $OutY2 = $Yc;
+
+       $Slices[$Slice]["Angle"][] = VOID;
+       $Lasti = $i;
+
+       $Step   = (360 / (2 * PI * $InnerRadius))/2;
+       $InX1 = VOID; $InY1 = VOID;
+       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);
+
+         $Xc = cos(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius) + $X;
+         $Yc = sin(($i-90)*PI/180) * ($InnerRadius+$DataGapRadius)*$SkewFactor + $Y;
+         $Slices[$Slice]["AA"][] = array($Xc,$Yc);
+
+         if ( $InX1 == VOID ) { $InX1 = $Xc; $InY1 = $Yc; }
+
+         if ( $i<90 ) { $Yc++; }
+         if ( $i>90 && $i<180 ) { $Xc++; }
+         if ( $i>180 && $i<270 ) { $Xc++; }
+         if ( $i>=270 ) { $Xc++; $Yc++; }
+
+         $Slices[$Slice]["BottomPoly"][] = floor($Xc); $Slices[$Slice]["BottomPoly"][] = floor($Yc);
+         $Slices[$Slice]["TopPoly"][] = floor($Xc); $Slices[$Slice]["TopPoly"][] = floor($Yc)-$SliceHeight;
+         $Slices[$Slice]["Angle"][] = $i;
+        }
+       $InX2 = $Xc; $InY2 = $Yc;
+
+       $Slices[$Slice]["InX1"] = $InX1;   $Slices[$Slice]["InY1"] = $InY1;
+       $Slices[$Slice]["InX2"] = $InX2;   $Slices[$Slice]["InY2"] = $InY2;
+       $Slices[$Slice]["OutX1"] = $OutX1; $Slices[$Slice]["OutY1"] = $OutY1;
+       $Slices[$Slice]["OutX2"] = $OutX2; $Slices[$Slice]["OutY2"] = $OutY2;
+
+       $Offset = $Lasti - $DataGapAngle; $ID--; $Slice++;
+      }
+
+     /* Draw the bottom pie splice */
+     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);
+
+       $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["OutX2"],$Plots["OutY2"],$Settings);
+       $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["OutX1"],$Plots["OutY1"],$Settings);
+      }
+
+     $Slices      = array_reverse($Slices);
+     $SliceColors = array_reverse($SliceColors);
+
+     /* Draw the vertical edges (semi-visible) */
+     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;
+
+       $StartAngle = $Plots["Angle"][0];
+       foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
+
+       if ( $StartAngle >= 270 || $StartAngle <= 90 )
+        $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
+       if ( $StartAngle >= 270 || $StartAngle <= 90 )
+        $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+
+        $this->pChartObject->drawLine($Plots["InX1"],$Plots["InY1"],$Plots["InX1"],$Plots["InY1"]-$SliceHeight,$Settings);
+        $this->pChartObject->drawLine($Plots["InX2"],$Plots["InY2"],$Plots["InX2"],$Plots["InY2"]-$SliceHeight,$Settings);
+      }
+
+     /* Draw the inner vertical slices */
+     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)
+        {
+         if ( $Angle == VOID )
+          { $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];
+
+             $InnerPlotsA[] = $Xo; $InnerPlotsA[] = $Yo;
+             $InnerPlotsB[] = $Xo; $InnerPlotsB[] = $Yo-$SliceHeight;
+            }
+          }
+        }
+
+       if ( $InnerPlotsA != "" )
+        { $InnerPlots = array_merge($InnerPlotsA,$this->arrayReverse($InnerPlotsB)); $this->pChartObject->drawPolygon($InnerPlots,$Settings); }
+      }
+
+     /* Draw the splice top and left poly */
+     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 )
+        {
+         $Points = "";
+         $Points[] = $Plots["InX2"];
+         $Points[] = $Plots["InY2"];
+         $Points[] = $Plots["InX2"];
+         $Points[] = $Plots["InY2"]-$SliceHeight;
+         $Points[] = $Plots["OutX1"];
+         $Points[] = $Plots["OutY1"]-$SliceHeight;
+         $Points[] = $Plots["OutX1"];
+         $Points[] = $Plots["OutY1"];
+
+         $this->pChartObject->drawPolygon($Points,$Settings);
+        }
+
+       if ( $EndAngle > 180 )
+        {
+         $Points = "";
+         $Points[] = $Plots["InX1"];
+         $Points[] = $Plots["InY1"];
+         $Points[] = $Plots["InX1"];
+         $Points[] = $Plots["InY1"]-$SliceHeight;
+         $Points[] = $Plots["OutX2"];
+         $Points[] = $Plots["OutY2"]-$SliceHeight;
+         $Points[] = $Plots["OutX2"];
+         $Points[] = $Plots["OutY2"];
+
+         $this->pChartObject->drawPolygon($Points,$Settings);
+        }
+      }
+
+
+     /* Draw the vertical edges (visible) */
+     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;
+
+       $StartAngle = $Plots["Angle"][0];
+       foreach($Plots["Angle"] as $Key =>$Angle) { if ($Angle == VOID) { $EndAngle = $Plots["Angle"][$Key-1]; } }
+
+       if ( $StartAngle <= 270 && $StartAngle >= 90 )
+        $this->pChartObject->drawLine($Plots["OutX1"],$Plots["OutY1"],$Plots["OutX1"],$Plots["OutY1"]-$SliceHeight,$Settings);
+       if ( $EndAngle <= 270 && $EndAngle >= 90 )
+        $this->pChartObject->drawLine($Plots["OutX2"],$Plots["OutY2"],$Plots["OutX2"],$Plots["OutY2"]-$SliceHeight,$Settings);
+      }
+
+
+     /* Draw the outer vertical slices */
+     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)
+        {
+         if ( $Angle == VOID )
+          { $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];
+
+             $OuterPlotsA[] = $Xo; $OuterPlotsA[] = $Yo;
+             $OuterPlotsB[] = $Xo; $OuterPlotsB[] = $Yo-$SliceHeight;
+            }
+          }
+        }
+       if ( $OuterPlotsA != "" )
+        { $OuterPlots = array_merge($OuterPlotsA,$this->arrayReverse($OuterPlotsB)); $this->pChartObject->drawPolygon($OuterPlots,$Settings); }
+      }
+
+     $Slices      = array_reverse($Slices);
+     $SliceColors = array_reverse($SliceColors);
+
+
+     /* Draw the top pie splice */
+     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;
+ 
+       $this->pChartObject->drawPolygon($Plots["TopPoly"],$Settings);
+
+       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);
+
+       $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 )
+      {
+       $Offset = 360;
+       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"=>$LabelR,"FillG"=>$LabelG,"FillB"=>$LabelB,"Alpha"=>$LabelAlpha); }
+
+         $Angle = ($EndAngle - $Offset)/2 + $Offset;
+         $Xc = cos(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius) + $X;
+         $Yc = sin(($Angle-90)*PI/180) * ($OuterRadius+$DataGapRadius)*$SkewFactor + $Y;
+
+         if ( $WriteValues == PIE_VALUE_PERCENTAGE )
+          $Label = $Display = round(( 100 / $SerieSum ) * $Value,$Precision)."%";
+         elseif ( $WriteValues == PIE_VALUE_NATURAL )
+          $Label = $Data["Series"][$Data["Abscissa"]]["Data"][$Key];
+         else
+          $Label = "";
+
+         if ( $LabelStacked )
+          $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,TRUE,$X,$Y,$OuterRadius);
+         else
+          $this->writePieLabel($Xc,$Yc-$SliceHeight,$Label,$Angle,$Settings,FALSE);
+
+         $Offset = $EndAngle - $DataGapAngle; $ID--; $Slice++;
+        }
+      }
+     if ( $DrawLabels && $LabelStacked ) { $this->writeShiftedLabels(); }
+
+     $this->pChartObject->Shadow = $RestoreShadow;
+
+     return(PIE_RENDERED);
+    }
+
+  /* Serialize an array */
+  function arraySerialize($Data)
+   {
+    $Result = "";
+    foreach($Data as $Key => $Value)
+     { if ($Result == "") { $Result = floor($Value); } else { $Result = $Result.",".floor($Value); } }
+
+    return($Result);
+   }
+
+  /* Reverse an array */
+  function arrayReverse($Plots)
+   {
+    $Result = "";
+
+    for($i=count($Plots)-1;$i>=0;$i=$i-2)
+     { $Result[] = $Plots[$i-1]; $Result[] = $Plots[$i]; }
+
+    return($Result);
+   }
+
+  /* Remove unused series & values */
+  function clean0Values($Data,$Palette,$DataSerie,$AbscissaSerie)
+   {
+    $NewPalette = ""; $NewData = ""; $NewAbscissa = "";
+
+    /* Remove unused series */
+    foreach($Data["Series"] as $SerieName => $SerieSettings)
+     { if ( $SerieName != $DataSerie && $SerieName != $AbscissaSerie ) { unset($Data["Series"][$SerieName]); } }
+
+    /* Remove NULL values */
+    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]; }
+       }
+     }
+    $Data["Series"][$DataSerie]["Data"]     = $NewData;
+    $Data["Series"][$AbscissaSerie]["Data"] = $NewAbscissa;
+
+    return(array($Data,$NewPalette));
+   }
+  }
+?>
diff --git a/libs/pChart2.1.3/index.php b/libs/pChart2.1.3/index.php
new file mode 100644
index 0000000000..546ede2757
--- /dev/null
+++ b/libs/pChart2.1.3/index.php
@@ -0,0 +1,6 @@
+<?php
+ /* If you crawl here, you may want to see the examples */
+
+ header('Location: examples/');
+ exit();
+?>
diff --git a/libs/pChart2.1.3/readme.txt b/libs/pChart2.1.3/readme.txt
new file mode 100644
index 0000000000..4ae6ba1bf1
--- /dev/null
+++ b/libs/pChart2.1.3/readme.txt
@@ -0,0 +1,140 @@
+
+ ??????????????????????????????????????????????????????????????????????????????
+ ?                                                                            ?
+ ?   pChart - a PHP Charting library                                          ?
+ ?                                                                            ?
+ ?   Version     : 2.1.3                                                      ?
+ ?   Made by     : Jean-Damien POGOLOTTI                                      ?
+ ?   Last Update : 09/09/2011                                                 ?
+ ?                                                                            ?
+ ??????????????????????????????????????????????????????????????????????????????
+
+ ? WHAT CAN pCHART DO FOR YOU? ????????????????????????????????????????????????
+
+  pChart is a PHP framework that will help you to create anti-aliased charts or
+  pictures directly  from your web  server. You can  then display the result in
+  the client browser, sent it by mail or insert it into PDFs. 
+
+  This library  has now reached  an important  point  in its  development cycle
+  going out of the beta step. pChart 2.0 is a completly rewritten library based
+  on what I've learned doing the first version. 
+
+
+ ? PACKAGE CONTENTS ???????????????????????????????????????????????????????????
+ 
+ ?
+ ?
+ ?? /cache			This folder is used by the pCache module.
+ ?
+ ?? /class			This folder contains the library core classes.
+ ?   ?
+ ?   ?? pBarcode39.class	Class to draw Code 39 barcodes.
+ ?   ?? pBarcode128.class	Class to draw Code 128 barcodes.
+ ?   ?? pBubble.class		Class to draw bubble charts.
+ ?   ?? pCache.class		Class enable chart caching functionalities.
+ ?   ?? pData.class		Class to manipulate chart data.
+ ?   ?? pDraw.class		Extended drawing functions.
+ ?   ?? pIndicator.class	Class to draw indicators.
+ ?   ?? pImage.class		Core drawing functions.
+ ?   ?? pPie.class		Class to draw pie charts.
+ ?   ?? pSplit.class		Class to draw split path charts.
+ ?   ?? pSpring.class		Class to draw spring charts.
+ ?   ?? pScatter.class		Class to draw scatter charts.
+ ?   ?? pStock.class		Class to draw stock charts.
+ ?   ?? pSurface.class		Class to draw surface charts.
+ ?
+ ?? /data			This folder contains extended data.
+ ?   ?
+ ?   ?? 39.db			Code 39 barcodes static database.
+ ?   ?? 128.db			Code 128 barcodes static database.
+ ?
+ ?? /examples			This folder contains some PHP examples.
+ ?   ?
+ ?   ?? delayedLoader		Delayed loader script example.
+ ?   ?? imageMap		Image map script example.
+ ?   ?? sandbox			Powerful dev. tool to design your charts.
+ ?
+ ?? /fonts			This folder contains a bunch of TTF fonts.
+ ?
+ ?? /palettes			Sample palettes files.
+ ?
+ ?? change.log			History of all the changes since the 2.0
+ ?? GPLv3.txt			GPLv3 official text.
+ ?? readme.txt			This file.
+
+
+ ? PREREQUiSiTES ??????????????????????????????????????????????????????????????
+
+  This library has been written to work with PHP 5+ versions. It will also work
+  with PHP 4 but the rendering quality maybe downgraded and the rendering speed
+  seriously impacted.
+
+  pChart require the GD and FreeType PHP extensions to be installed on your
+  web server. This is an important prerequiste that can't be overrided.  
+
+
+ ? RUNNiNG THE EXAMPLES ???????????????????????????????????????????????????????
+
+  pChart is  shipped with  examples (located  in the /examples folder) that you
+  can either render from a web page using your http and pointing to this folder
+  or from the command line invoking the php interpreter.
+
+  On windows OS,  assuming that  your PHP binaries  are correctly configured in
+  the PATH  environment variable  you can  also execute  the BuildAll.cmd batch
+  file.
+
+
+ ? LiCENSE ????????????????????????????????????????????????????????????????????
+
+  The  pChart library  is  released  under  two  different  licenses.  If  your
+  application is not a  commercial one (eg: you make no money by redistributing
+  it) then the GNU GPLv3 license (General Public License) applies. This license
+  allows you to  freely integrate this library in your applications, modify the
+  code and redistribute it  in bundled packages  as long as your application is
+  also distributed with the GPL license. 
+
+  The GPLv3 license description can be found in GPLv3.txt.
+
+  If your  application can't  meet the GPL  license or is a commercial one (eg:
+  the library is  integrated in a software or an appliance you're selling) then
+  you'll have to buy a commercial  license. With this license you don't need to
+  make publicly available your application code under the GPL license terms.
+
+  Commercial license price are depending of your needs.
+
+  Please consult the web page : http://www.pchart.net/license
+
+
+ ? EXTERNAL COPYRiGHTS ????????????????????????????????????????????????????????
+
+  Famfamfam icons has been made by Mark James, Rounded corners lite has been
+  coded by Cameron Cooke and Tim Hutchison, Javascript Color Picker has been
+  written by Honza Odvarko.
+
+  The provided font files are licensed under their own terms :
+
+   ?
+   ?? dvent_light.ttf	Copyright Andreas K. inde
+   ?? Bedizen.ttf	Copyright Tepid Monkey Fonts
+   ?? calibri.ttf	Copyright Microsoft
+   ?? Forgotte.ttf	Copyright Ray Larabie
+   ?? GeosansLight.ttf	Copyright Manfred Klein
+   ?? MankSans.ttf	Copyright Manfred  Klein
+   ?? pf_arma_five.ttf	Copyright Yusuke Kamiyamane
+   ?? Silkscreen.ttf	Copyright Jason Aleksandr Kottke
+   ?? verdana.ttf	Copyright Microsoft
+
+
+ ? SUPPORT ????????????????????????????????????????????????????????????????????
+
+  Since  the  beginning, pChart  is a community  driven project. You're missing
+  feature then ask! We'll  try to  get it implemented  in the future version or
+  you'll be guided to create a class extension for your own needs. 
+
+  pChart portal      : http://www.pchart.net
+  Documentation wiki : http://wiki.pchart.net
+  Support forum      : http://wiki.pchart.net/forum
+
+
+ ---
+ (c)2011 Jean-Damien POGOLOTTI - 13k lines of codes
diff --git a/plugins/ImageGraph/API.php b/plugins/ImageGraph/API.php
index 3015338172..0807a48017 100644
--- a/plugins/ImageGraph/API.php
+++ b/plugins/ImageGraph/API.php
@@ -11,52 +11,71 @@
  */
 
 /**
- * The ImageGraph.get API call lets you generate a beautiful static PNG Graph for any existing Piwik report (supported graphs types are: line plot, pie chart, vertical bar chart).
+ * The ImageGraph.get API call lets you generate beautiful static PNG Graphs for any existing Piwik report.
+ * Supported graph types are: line plot, 2D/3D pie chart and vertical bar chart.
  * 
  * A few notes about some of the parameters available:<br/>
- * - $graphType defines the type of graph plotted, accepted values are: 'evolution', 'verticalBar', 'pie'<br/>
+ * - $graphType defines the type of graph plotted, accepted values are: 'evolution', 'verticalBar', 'pie' and '3dPie'<br/>
  * - $colors accepts a comma delimited list of colors that will overwrite the default Piwik colors <br/>
- * - You can also customize the width, height, font size, metric being plotted (in case the data contains multiple columns/metrics).
+ * - you can also customize the width, height, font size, metric being plotted (in case the data contains multiple columns/metrics).
  * 
  * @package Piwik_ImageGraph
  */ 
 class Piwik_ImageGraph_API
 {
+	const FILENAME_KEY = 'filename';
+	const TRUNCATE_KEY = 'truncate';
+	const WIDTH_KEY = 'width';
+	const HEIGHT_KEY = 'height';
+
+	static private $DEFAULT_PARAMETERS = array(
+		Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_BASIC_LINE => array(
+			self::FILENAME_KEY => 'BasicLine',
+			self::TRUNCATE_KEY => 6,
+			self::WIDTH_KEY => 1044,
+			self::HEIGHT_KEY => 290,
+		),
+		Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_VERTICAL_BAR => array(
+			self::FILENAME_KEY => 'BasicBar',
+			self::TRUNCATE_KEY => 6,
+			self::WIDTH_KEY => 1044,
+			self::HEIGHT_KEY => 290,
+		),
+		Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_HORIZONTAL_BAR => array(
+			self::FILENAME_KEY => 'HorizontalBar',
+			self::TRUNCATE_KEY => null, // horizontal bar graphs are dynamically truncated
+			self::WIDTH_KEY => 800,
+			self::HEIGHT_KEY => 290,
+		),
+		Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_3D_PIE => array(
+			self::FILENAME_KEY => '3DPie',
+			self::TRUNCATE_KEY => 5,
+			self::WIDTH_KEY => 1044,
+			self::HEIGHT_KEY => 290,
+		),
+		Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_BASIC_PIE => array(
+			self::FILENAME_KEY => 'BasicPie',
+			self::TRUNCATE_KEY => 5,
+			self::WIDTH_KEY => 1044,
+			self::HEIGHT_KEY => 290,
+		),
+	);
+
+	static private $DEFAULT_GRAPH_TYPE_OVERRIDE = array(
+		'UserSettings_getPlugin' => Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_HORIZONTAL_BAR,
+	);
+
+	const GRAPH_OUTPUT_INLINE = 0;
+	const GRAPH_OUTPUT_FILE = 1;
+	const GRAPH_OUTPUT_PHP = 2;
+
+	const DEFAULT_ORDINATE_METRIC = 'nb_visits';
+	const FONT_DIR = '/plugins/ImageGraph/fonts/';
+	const DEFAULT_FONT = 'tahoma.ttf';
+	const UNICODE_FONT = 'unifont.ttf';
+	const DEFAULT_FONT_SIZE = 9;
+
 	static private $instance = null;
-	
-	const GRAPH_TYPE_BASIC_LINE		= "evolution";
-	const GRAPH_TYPE_BASIC_BAR		= "verticalBar";
-	const GRAPH_TYPE_3D_PIE			= "3dPie";
-	const GRAPH_TYPE_BASIC_PIE		= "pie";
-	
-	const GRAPH_OUTPUT_INLINE		= 0;
-	const GRAPH_OUTPUT_FILE			= 1;
-	const GRAPH_OUTPUT_PHP			= 2;
-
-	private $GRAPH_COLOR_PIE_0			= "3C5A69";
-	private $GRAPH_COLOR_PIE_1			= "679BB5";
-	private $GRAPH_COLOR_PIE_2			= "695A3C";
-	private $GRAPH_COLOR_PIE_3			= "B58E67";
-	private $GRAPH_COLOR_PIE_4			= "8AA68A";
-	private $GRAPH_COLOR_PIE_5			= "A4D2A6";
-	private $GRAPH_COLOR_PIE_6			= "EEEEEE";
-	private $GRAPH_COLOR_BAR_0			= "3B5AA9";
-	private $GRAPH_COLOR_BAR_1			= "063E7E";
-	private $GRAPH_COLOR_LINE			= "063E7E";
-	const GRAPH_COLOR_PIE_0			= "3C5A69";
-	const GRAPH_COLOR_PIE_1			= "679BB5";
-	const GRAPH_COLOR_PIE_2			= "695A3C";
-	const GRAPH_COLOR_PIE_3			= "B58E67";
-	const GRAPH_COLOR_PIE_4			= "8AA68A";
-	const GRAPH_COLOR_PIE_5			= "A4D2A6";
-	const GRAPH_COLOR_PIE_6			= "EEEEEE";
-	const GRAPH_COLOR_BAR_0			= "3B5AA9";
-	const GRAPH_COLOR_BAR_1			= "063E7E";
-	const GRAPH_COLOR_LINE			= "063E7E";
-	
-	const GRAPH_FONT_SIZE			= 9;
-	const GRAPH_WIDTH				= 1044;
-	const GRAPH_HEIGHT				= 290;
 
 	/**
 	 * @return Piwik_ImageGraph_API
@@ -64,367 +83,354 @@ class Piwik_ImageGraph_API
 	static public function getInstance()
 	{
 		if (self::$instance == null)
-		{            
+		{
 			$c = __CLASS__;
 			self::$instance = new $c();
 		}
 		return self::$instance;
 	}
 	
-	public function get(	$idSite, $period, $date,
-							$apiModule, $apiAction,
-							$graphType = false, $outputType = false, $column = false, $showMetricTitle = true,
-							$width = false, $height = false, $fontSize = false, $aliasedGraph = true, $colors = false
-	)
+	public function get($idSite, $period, $date, $apiModule, $apiAction, $graphType = false,
+						$outputType = self::GRAPH_OUTPUT_INLINE, $column = false, $showMetricTitle = true,
+						$width = false, $height = false, $fontSize = self::DEFAULT_FONT_SIZE, $aliasedGraph = true,
+						$colors = false)
 	{
 		Piwik::checkUserHasViewAccess($idSite);
 
 		// Health check - should we also test for GD2 only?
 		if(!Piwik::isGdExtensionEnabled())
 		{
-			throw new Exception("Error: To create graphs in Piwik, please enable GD php extension (with Freetype support) in php.ini, and restart your web server.");
-		}
-		
-		// Parameters init
-		if(empty($width))
-		{
-			$width = self::GRAPH_WIDTH;
-		}
-		if(empty($height))
-		{
-			$height = self::GRAPH_HEIGHT;
-		}
-		if(empty($fontSize))
-		{
-			$fontSize = self::GRAPH_FONT_SIZE;
-		}
-		if(empty($graphType))
-		{
-			$graphType = self::GRAPH_TYPE_BASIC_LINE;
-		}
-		if(empty($outputType))
-		{
-			$outputType = self::GRAPH_OUTPUT_INLINE;
-		}
-		$colors = explode(",", $colors);
-		if(!is_array($colors))
-		{
-			$colors = array();
-		}
-		if(empty($showMetricTitle))
-		{
-			$showMetricTitle = false;
-		}
-		if(empty($aliasedGraph))
-		{
-			$aliasedGraph = false;
+			throw new Exception('Error: To create graphs in Piwik, please enable GD php extension (with Freetype support) in php.ini, and restart your web server.');
 		}
-		
+
+		$unicodeFontPath = self::getFontPath(self::UNICODE_FONT);
+		$font = file_exists($unicodeFontPath) ? $unicodeFontPath : self::getFontPath(self::DEFAULT_FONT);
+
+		// save original GET to reset after processing. Important for API-in-API-call
+		$savedGET = $_GET;
+
 		try
 		{
-			Piwik::checkUserHasViewAccess($idSite);
-			
-			//Set default colors if needed
-			$count = -1;
-			$needCount = 0;
-			$constNameBase = "";
-			switch($graphType)
+			//Fetch the metadata for given api-action
+			$metadata = Piwik_API_API::getInstance()->getMetadata($idSite, $apiModule, $apiAction, $apiParameters = array(), $language = false, $period, $date);
+
+			if(!$metadata)
 			{
-				case self::GRAPH_TYPE_3D_PIE:
-				case self::GRAPH_TYPE_BASIC_PIE:
-					$needCount = 7;
-					$constNameBase = "GRAPH_COLOR_PIE_";
-					break;
-				case self::GRAPH_TYPE_BASIC_BAR:
-					$needCount = 2;
-					$constNameBase = "GRAPH_COLOR_BAR_";
-					break;
-				case self::GRAPH_TYPE_BASIC_LINE:
-				default:
-					$needCount = 1;
-					$constNameBase = "GRAPH_COLOR_LINE";
-					break;
+				throw new Exception('Invalid API Module and/or API Action');
 			}
-			while(++$count < $needCount)
+
+			$metadata = $metadata[0];
+			$reportHasDimension = !empty($metadata['dimension']);
+			$constantRowsCount = !empty($metadata['constantRowsCount']);
+
+			if(empty($graphType))
 			{
-				if(!isset($colors[$count]))
+				if($reportHasDimension)
 				{
-					if($needCount == 1)
+					if($constantRowsCount)
 					{
-						$colors[$count] = $this->{$constNameBase};
+						$graphType = Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_VERTICAL_BAR;
 					}
 					else
 					{
-						$colors[$count] = $this->{$constNameBase.$count};
+						$graphType = Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_HORIZONTAL_BAR;
 					}
 				}
+				else
+				{
+					$graphType = Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_BASIC_LINE;
+				}
+
+				$reportUniqueId = $metadata['uniqueId'];
+				if(isset(self::$DEFAULT_GRAPH_TYPE_OVERRIDE[$reportUniqueId]))
+				{
+					$graphType = self::$DEFAULT_GRAPH_TYPE_OVERRIDE[$reportUniqueId];
+				}
 			}
-			
-			//Fetch the metadata for given api-action
-			$metadata = Piwik_API_API::getInstance()->getMetadata($idSite, $apiModule, $apiAction, $apiParameters = array(), $language = false, $period, $date);
-			
-			//If the metadata doesn´t provide any information about the dimension,
-			//the $abscissaColumn could only be the date-index
-			if(empty($metadata[0]["dimension"]))
+			else
 			{
-				$abscissaColumn = "date";
-				$abscissaVal = Piwik_Translate("Piwik_Date");
+				$availableGraphTypes = Piwik_ImageGraph_StaticGraph::getAvailableStaticGraphTypes();
+				if (!in_array($graphType, $availableGraphTypes))
+				{
+					throw new Exception(
+						Piwik_TranslateException(
+							'General_ExceptionInvalidStaticGraphType',
+							array($graphType, implode(', ', $availableGraphTypes))
+						)
+					);
+				}
 			}
-			else
+
+			if(empty($width))
 			{
-				$abscissaColumn = "label";
-				$abscissaVal = $metadata[0]["dimension"];
+				$width = self::$DEFAULT_PARAMETERS[$graphType][self::WIDTH_KEY];
 			}
-			
-			$availableColumns = array_merge(array($abscissaColumn => $abscissaVal),
-											!empty($metadata[0]["metrics"]) ? $metadata[0]["metrics"] : array(),
-											!empty($metadata[0]["processedMetrics"]) ? $metadata[0]["processedMetrics"] : array(),
-											!empty($metadata[0]["metricsGoal"]) ? $metadata[0]["metricsGoal"] : array(),
-											!empty($metadata[0]["processedMetricsGoal"]) ? $metadata[0]["processedMetricsGoal"] : array()
-			);
-		
-			if(empty($column))
+
+			if(empty($height))
 			{
-				$column = 'nb_visits';
-				if(empty($availableColumns[$column]))
-				{
-					$column = key($metadata[0]["metrics"]);
-				}
+				$height = self::$DEFAULT_PARAMETERS[$graphType][self::HEIGHT_KEY];
 			}
-			
-			//If the desired $ordinateColumn is not present, we have to throw an exception
-			if(empty($column) || empty($availableColumns[$column]))
+
+			if($reportHasDimension)
 			{
-				throw new Exception(Piwik_Translate("ImageGraph_ColumnOrdinateMissing", $column));
+				$abscissaColumn = 'label';
 			}
-			$metricTitle = $showMetricTitle ? $availableColumns[$column] : false;
-			
-			//Save original GET to reset after processing. Important for API-in-API-call
-			$this->origGET = $_GET;
-			
-	    	//If a pie should be drawn the report should always be sorted and truncated,
-			if(	$graphType == self::GRAPH_TYPE_3D_PIE ||
-				$graphType == self::GRAPH_TYPE_BASIC_PIE
-			)
+			else
 			{
-				$_GET["filter_sort_column"] = $column;
-				//if filter_truncate is less-equal than 5, we don´t have to set it
-				if(empty($_GET["filter_truncate"]) || $_GET["filter_truncate"] > 5)
-					$_GET["filter_truncate"] = 5;
+				// if it's a dimension-less report, the abscissa column can only be the date-index
+				$abscissaColumn = 'date';
 			}
-			//else if a bar- or line chart should be drawn and the report has a dimension,
-			//we should truncate if the dimension is unlimited 
-			//We mustn´t sort the report, because this brakes the readability of the reports with limited dimension.
-			else if(($graphType == self::GRAPH_TYPE_BASIC_BAR ||
-					$graphType == self::GRAPH_TYPE_BASIC_LINE) &&
-					!empty($metadata[0]['dimension']) &&
-					empty($metadata[0]['constantRowsCount'])
-			)
+			
+			$reportColumns = array_merge(
+				!empty($metadata['metrics']) ? $metadata['metrics'] : array(),
+				!empty($metadata['processedMetrics']) ? $metadata['processedMetrics'] : array(),
+				!empty($metadata['metricsGoal']) ? $metadata['metricsGoal'] : array(),
+				!empty($metadata['processedMetricsGoal']) ? $metadata['processedMetricsGoal'] : array()
+			);
+
+			$ordinateColumn = $column;
+			if(empty($ordinateColumn))
 			{
-				$filterTruncateGET = Piwik_Common::getRequestVar('filter_truncate', false, 'int');
-				if($filterTruncateGET <= 0)
+				$ordinateColumn = self::DEFAULT_ORDINATE_METRIC;
+
+				// if default ordinate metric not available for this report
+				if(empty($reportColumns[$ordinateColumn]))
 				{
-					//if filter_truncate is less-equal than 24, we don´t have to set it
-					if(empty($_GET["filter_truncate"]) || $_GET["filter_truncate"] > 24)
-						$_GET["filter_truncate"] = 6;
+					// take the first metric returned in the metadata
+					$ordinateColumn = key($metadata['metrics']);
 				}
 			}
 			
-			try {
-				//Fetch the report for given site, date, period and api-action
-				$report = Piwik_API_API::getInstance()->getProcessedReport(	
-								$idSite, $period, $date, $apiModule, $apiAction 
-				);
-			} catch(Exception $e) {
-				$this->restoreGET();
-				throw $e;
+			// if we still don't have an ordinate column or the one provided by the API caller is invalid
+			if(empty($ordinateColumn) || empty($reportColumns[$ordinateColumn]))
+			{
+				throw new Exception(Piwik_Translate('ImageGraph_ColumnOrdinateMissing', $ordinateColumn));
 			}
-			
-			//Copy the required data into arrays
-			$abscissaSerie = $ordinateSerie = array();
-			$count = 0;
-			//If the report has no dimension we have one or many reports each with only one row within the reportdata.
-			if(	empty($metadata[0]['dimension']) &&
-				($graphType == self::GRAPH_TYPE_BASIC_BAR ||
-				$graphType == self::GRAPH_TYPE_BASIC_LINE)
-			)
+
+			$ordinateLabel = $reportColumns[$ordinateColumn];
+
+			// sort and truncate filters
+			$defaultFilterTruncate = self::$DEFAULT_PARAMETERS[$graphType][self::TRUNCATE_KEY];
+			switch($graphType)
 			{
-				//We get one report with one row for any reports called with 'period=range',
-				//or all reports called with 'period!=range' and a non-dimensional date like 'date=yesterday'
-				if(get_class($report["reportData"]) == "Piwik_DataTable_Simple")
+				case Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_3D_PIE:
+				case Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_BASIC_PIE:
+
+					$_GET['filter_sort_column'] = $ordinateColumn;
+					$this->setFilterTruncate($defaultFilterTruncate);
+					break;
+
+				case Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_VERTICAL_BAR:
+				case Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_BASIC_LINE:
+
+					if($reportHasDimension && !$constantRowsCount)
+					{
+						$this->setFilterTruncate($defaultFilterTruncate);
+					}
+					break;
+			}
+
+			$processedReport = Piwik_API_API::getInstance()->getProcessedReport(
+				$idSite,
+				$period,
+				$date,
+				$apiModule,
+				$apiAction
+			);
+
+			// prepare abscissa and ordinate series
+			$abscissaSerie = array();
+			$ordinateSerie = array();
+			$ordinateLogos = array();
+			$reportData = $processedReport['reportData'];
+			$isMultiplePeriod = Piwik_Archive::isMultiplePeriod($date, $period);
+
+			if($reportHasDimension)
+			{
+				if($isMultiplePeriod)
 				{
-					$row = $report["reportData"]->getRows();
-					$row = $row[0]->getColumns();
-					
-					$this->setDataFromRowHelper($report, $column, $row, $count, $abscissaSerie, false, $ordinateSerie);
+					throw new Exception('Reports with a dimension can not be drawn over multiple periods.');
 				}
-				//We get many reports with one row if the request is called with 'period!=range' and a dimensional date like 'date=lastX'
-				else
+
+				$reportMetadata = $processedReport['reportMetadata']->getRows();
+
+				// $reportData instanceof Piwik_DataTable
+				$i = 0;
+				foreach($reportData->getRows() as $row) // Piwik_DataTable_Row[]
 				{
-					$rowData = array();
-					$countTemp = 0;
-					foreach($report["reportData"]->metadata as $dateVal)
-					{
-						$rowData[$countTemp++] = array('rowId' => $dateVal['period']->getLocalizedShortString());
-					}
-					$countTemp = 0;
-					foreach($report["reportData"]->getArray() as $row)
-					{
-						$rowData[$countTemp++]['row'] = $row;
-					}
-					foreach($rowData as $rowD)
+					// $row instanceof Piwik_DataTable_Row
+					$rowData = $row->getColumns(); // Associative Array
+					$abscissaSerie[] = Piwik_Common::unsanitizeInputValue($rowData[$abscissaColumn]);
+					$ordinateSerie[] = $this->parseOrdinateValue($rowData[$ordinateColumn]);
+
+					if(isset($reportMetadata[$i]))
 					{
-						$row = $rowD['row']->getRows();
-						if(!array_key_exists(0, $row))
+						$rowMetadata = $reportMetadata[$i]->getColumns();
+						if(isset($rowMetadata['logo']))
 						{
-							continue;
+							$ordinateLogos[$i] = $rowMetadata['logo'];
 						}
-						$row = $row[0]->getColumns();
-						
-						$this->setDataFromRowHelper($report, $column, $row, $count, $abscissaSerie, array('rowId' => $rowD['rowId']), $ordinateSerie);
 					}
+					$i++;
 				}
 			}
-			//Otherwise we have rows
-			else if(!empty($metadata[0]['dimension']))
+			else
 			{
-				if(!($report["reportData"] instanceof Piwik_DataTable))
-				{
-					$this->restoreGET();
-					throw new Exception("The graph cannot be drawn with the request 'date' and 'period' parameters.");
-				}
-				foreach($report["reportData"]->getRows() as $rowId => $row)
+				// if the report has no dimension we have one or many reports each with only one row within the reportData.
+				switch($graphType)
 				{
-					$row = $row->getColumns();
-					
-					$this->setDataFromRowHelper($report, $column, $row, $count, $abscissaSerie, array('abscissaColumn' => $abscissaColumn), $ordinateSerie);
+					case Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_VERTICAL_BAR:
+					case Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_HORIZONTAL_BAR:
+					case Piwik_ImageGraph_StaticGraph::GRAPH_TYPE_BASIC_LINE:
+
+						// we get many reports with one row when Piwik_Archive::isMultiplePeriod($date, $period) == true
+						if($isMultiplePeriod)
+						{
+							// $reportData instanceof Piwik_DataTable_Array
+							$periodsMetadata = array_values($reportData->metadata);
+							// $periodsData instanceof Piwik_DataTable_Simple[]
+							$periodsData = array_values($reportData->getArray());
+							$periodsCount = count($periodsMetadata);
+
+							for ($i = 0 ; $i < $periodsCount ; $i++)
+							{
+								// $periodsData[$i] instanceof Piwik_DataTable_Simple
+								// $rows instanceof Piwik_DataTable_Row[]
+								$rows = $periodsData[$i]->getRows();
+
+								if(array_key_exists(0, $rows))
+								{
+									$rowData = $rows[0]->getColumns(); // associative Array
+									$ordinateValue = $rowData[$ordinateColumn];
+								}
+								else
+								{
+									$ordinateValue = 0;
+								}
+
+								$rowId = $periodsMetadata[$i]['period']->getLocalizedShortString();
+
+								$abscissaSerie[] = Piwik_Common::unsanitizeInputValue($rowId);
+								$ordinateSerie[] = $this->parseOrdinateValue($ordinateValue);
+							}
+						}
+						else
+						// we get one report with one row when Piwik_Archive::isMultiplePeriod($date, $period) == false
+						{
+							// $reportData instanceof Piwik_DataTable_Simple
+							// $rows instanceof Piwik_DataTable_Row[]
+							$rows = $reportData->getRows();
+
+							if(array_key_exists(0, $rows))
+							{
+								$rowData = $rows[0]->getColumns(); // associative Array
+								$ordinateValue = $rowData[$ordinateColumn];
+							}
+							else
+							{
+								$ordinateValue = 0;
+							}
+
+							$abscissaSerie[] = $processedReport['prettyDate'];
+							$ordinateSerie[] = $this->parseOrdinateValue($ordinateValue);
+						}
+						break;
+
+					default:
+						throw new Exception('Invalid $graphType for this API function.');
 				}
 			}
-			else
-			{
-				$this->restoreGET();
-				throw new Exception('Invalid $graphType for this API function.');
-			}
-			
-			if($count == 0)
+
+			if(count($abscissaSerie) == 0)
 			{
-				$this->restoreGET();
-				throw new Exception(Piwik_Translate("General_NoDataForGraph"));
+				throw new Exception(Piwik_Translate('General_NoDataForGraph'));
 			}
 			
-			//Reset GET to original values
-			$this->restoreGET();
-			
 			//Setup the graph
-			$graph = new Piwik_ImageGraph_ImageGraphObject($width, $height, $fontSize);
-			$graph->setData($abscissaSerie, $ordinateSerie, $availableColumns[$abscissaColumn], $availableColumns[$column], "", $metricTitle, $aliasedGraph);
-			
-			switch($graphType)
-			{
-				case self::GRAPH_TYPE_BASIC_PIE:
-					$graph->printBasicPieGraph($colors[0], $colors[1], $colors[2], $colors[3], $colors[4], $colors[5], $colors[6]);
-					break;
-				case self::GRAPH_TYPE_3D_PIE:
-					$graph->print3dPieGraph($colors[0], $colors[1], $colors[2], $colors[3], $colors[4], $colors[5], $colors[6]);
-					break;
-				case self::GRAPH_TYPE_BASIC_BAR:
-					$graph->printBasicBarGraph($colors[0], $colors[1]);
-					break;
-				case self::GRAPH_TYPE_BASIC_LINE:
-				default:
-					$graph->printBasicLineGraph($colors[0]);
-					break;
-			}
+			$graph = Piwik_ImageGraph_StaticGraph::factory($graphType);
+			$graph->setWidth($width);
+			$graph->setHeight($height);
+			$graph->setFont($font);
+			$graph->setFontSize($fontSize);
+			$graph->setMetricTitle($ordinateLabel);
+			$graph->setShowMetricTitle($showMetricTitle);
+			$graph->setAliasedGraph($aliasedGraph);
+			$graph->setAbscissaSerie($abscissaSerie);
+			$graph->setOrdinateSerie($ordinateSerie);
+			$graph->setOrdinateLogos($ordinateLogos);
+			$graph->setColors(!empty($colors) ? explode(',', $colors) : array());
+
+			// render graph
+			$graph->renderGraph();
 			
 		} catch (Exception $e) {
-			$graph = new Piwik_ImageGraph_ImageGraphObject($width, $height, $fontSize);
-			$graph->printException($e);
+
+			$graph = new Piwik_ImageGraph_StaticGraph_Exception();
+			$graph->setHeight($height);
+			$graph->setWidth($width);
+			$graph->setFont($font);
+			$graph->setFontSize($fontSize);
+			$graph->setException($e);
+			$graph->renderGraph();
 		}
-			
-		//Decide, whether the img is saved temporarily or displayed in the browser
+
+		// restoring get parameters
+		$_GET = $savedGET;
+
 		switch($outputType)
 		{
 			case self::GRAPH_OUTPUT_FILE:
-				switch($graphType)
-				{
-					case self::GRAPH_TYPE_BASIC_PIE:
-						$typeName = "BasicPie";
-						break;
-					case self::GRAPH_TYPE_3D_PIE:
-						$typeName = "3DPie";
-						break;
-					case self::GRAPH_TYPE_BASIC_BAR:
-						$typeName = "BasicBar";
-						break;
-					case self::GRAPH_TYPE_BASIC_LINE:
-					default:
-						$typeName = "BasicLine";
-						break;
-				}
 
-				// Adding the idGoal to the filename
+				// adding the idGoal to the filename
 				$idGoal = Piwik_Common::getRequestVar('idGoal', '', 'string');
 				if($idGoal != '')
 				{
 					$idGoal = '_' . $idGoal;
 				}
-				$fileName = $typeName."_".$apiModule."_".$apiAction.$idGoal." ".str_replace(',', '-', $date)." $idSite.png";
-				$fileName = str_replace(array(" ","/"), "_", $fileName);
+				$fileName = self::$DEFAULT_PARAMETERS[$graphType][self::FILENAME_KEY] . '_' . $apiModule . '_' . $apiAction . $idGoal . ' ' . str_replace(',', '-', $date) . ' $idSite.png';
+				$fileName = str_replace(array(' ','/'), '_', $fileName);
+
 				if(!Piwik_Common::isValidFilename($fileName))
 				{
-					throw new Exception("Error: Image graph filename '$fileName' is not valid."); 
+					throw new Exception('Error: Image graph filename ' . $fileName . ' is not valid.');
 				}
-				$path = PIWIK_INCLUDE_PATH."/tmp/".$fileName;
-				$graph->Render($path);
-				return $path;
+
+				return $graph->sendToDisk($fileName);
 
 			case self::GRAPH_OUTPUT_PHP:
-				return $graph->Picture;
+				return $graph->getRenderedImage();
 
 			case self::GRAPH_OUTPUT_INLINE:
 			default:
-				$graph->Stroke();
+				$graph->sendToBrowser();
 				exit;
-			break;
 		}
 	}
-	
-	/**
-	 * Ensures that the _GET array of parameters is restored 
-	 * to its original state removing ImageGraph.API filter_truncate etc.
-	 * This is important in case other APIs are called after this one (in the same php process) 
-	 */
-	private function restoreGET()
+
+	private function setFilterTruncate($default)
 	{
-		$_GET = $this->origGET;
+		$_GET['filter_truncate'] = Piwik_Common::getRequestVar('filter_truncate', $default, 'int');
 	}
 	
-	private function setDataFromRowHelper($report, $column, $rowData, &$count, &$abscissaSerie, $abscissaOptions, &$ordinateSerie)
+	private static function parseOrdinateValue($ordinateValue)
 	{
-		if(!empty($abscissaOptions['rowId']))
-		{
-			$afterDay = stripos($abscissaOptions['rowId'], " ");
-			if(is_numeric($afterDay) && $afterDay > 0)
-			{
-				$afterDay = substr($abscissaOptions['rowId'], 0, $afterDay);
-			}
-			$abscissaSerie[$count] = Piwik_Common::unsanitizeInputValue($abscissaOptions['rowId']);
-		}
-		else if(!empty($abscissaOptions['abscissaColumn']))
-		{
-			$abscissaSerie[$count] = Piwik_Common::unsanitizeInputValue($rowData[$abscissaOptions['abscissaColumn']]);
-		}
-		else
-		{
-			$abscissaSerie[$count] = $report["prettyDate"];
-		}
-		
-		$ordinateSerie[$count] = @str_replace("%", "", @str_replace(",", ".", $rowData[$column]));
-		if(@sscanf($ordinateSerie[$count], "%02d:%02d:%02d", $hour, $min, $sec) === 3)
+		$ordinateValue = @str_replace(',', '.', $ordinateValue);
+
+		// convert hh:mm:ss formatted time values to number of seconds
+		if(preg_match('/([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})/', $ordinateValue, $matches))
 		{
-			$ordinateSerie[$count] = ((($hour*60) + $min) * 60) + $sec;
+			$hour = $matches[1];
+			$min = $matches[2];
+			$sec = $matches[3];
+
+			$ordinateValue = ($hour * 3600) + ($min * 60) + $sec;
 		}
-		$count++;
+
+		return $ordinateValue;
 	}
-	
-}
+
+	private static function getFontPath($font)
+	{
+		return PIWIK_INCLUDE_PATH . self::FONT_DIR . $font;
+	}
+}
+\ No newline at end of file
diff --git a/plugins/ImageGraph/Controller.php b/plugins/ImageGraph/Controller.php
index b939029ae0..5b1353ec8e 100644
--- a/plugins/ImageGraph/Controller.php
+++ b/plugins/ImageGraph/Controller.php
@@ -30,7 +30,7 @@ class Piwik_ImageGraph_Controller extends Piwik_Controller
 					// Title
 					$report['category'] . ' › ' . $report['name'],
 					//URL
-					Piwik::getPiwikUrl() . $report['imageGraphUrl'] . '&height=150&width=460'
+					Piwik::getPiwikUrl() . $report['imageGraphUrl']
 				);
 			}
 		}
@@ -46,25 +46,30 @@ class Piwik_ImageGraph_Controller extends Piwik_Controller
 		
 		$view = Piwik_View::factory('debug_graphs_all_sizes');
 		$this->setGeneralVariablesView($view);
-		
-		$availableReports = Piwik_API_API::getInstance()->getReportMetadata($this->idSite);
+
+		$period = Piwik_Common::getRequestVar('period', 'day', 'string');
+		$date = Piwik_Common::getRequestVar('date', 'today', 'string');
+
+		$_GET['token_auth'] = Piwik::getCurrentUserTokenAuth();
+		$availableReports = Piwik_API_API::getInstance()->getReportMetadata($this->idSite, $period, $date);
 		$view->availableReports = $availableReports;
 		$view->graphTypes = array(
-			'evolution',
-			'verticalBar',
-			'pie',
-			'3dPie'
+			'', // default graph type
+//			'evolution',
+//			'verticalBar',
+//			'horizontalBar',
+//			'pie',
+//			'3dPie',
 		);
 		$view->graphSizes = array(
-			array(600, 250), // standard graph size
+			array(null, null), // default graph size
 			array(460, 150), // standard phone
 			array(300, 150), // standard phone 2
 			array(240, 150), // smallest mobile display
 			array(800, 150), // landscape mode
 			array(600, 300, $fontSize = 18, 300, 150), // iphone requires bigger font, then it will be scaled down by ios
-		
 		);
 		echo $view->render();
 	}
 
-}
-\ No newline at end of file
+}
diff --git a/plugins/ImageGraph/ImageGraph.php b/plugins/ImageGraph/ImageGraph.php
index 796c2acaf5..96a6c368f3 100644
--- a/plugins/ImageGraph/ImageGraph.php
+++ b/plugins/ImageGraph/ImageGraph.php
@@ -42,6 +42,7 @@ class Piwik_ImageGraph extends Piwik_Plugin
 		$info = $notification->getNotificationInfo();
 		$reports = &$notification->getNotificationObject();
 		$idSites = $info['idSites'];
+
 		// If only one website is selected, we add the Graph URL
 		if(count($idSites) != 1)
 		{
@@ -58,25 +59,39 @@ class Piwik_ImageGraph extends Piwik_Plugin
 		{
 			$info['date'] = 'today';
 		}
-		// process the date parameter that will allow to plot the Evolution graph over multiple periods 
-		// rather than for just 1 day
-		$lastN = 'last' . self::GRAPH_EVOLUTION_LAST_PERIODS;
-		$dateLastN = $info['date'];
-		
-		// If the date is not already a range, then we process the range to plot on Graph
-		if($info['period'] != 'range')
+
+		// need two sets of period & date, one for single period graphs, one for multiple periods graphs
+		if(Piwik_Archive::isMultiplePeriod($info['date'], $info['period']))
 		{
-			if(!Piwik_Archive::isMultiplePeriod($info['date'], $info['period']))
+			$periodForMultiplePeriodGraph = $info['period'];
+			$dateForMultiplePeriodGraph = $info['date'];
+
+			$periodForSinglePeriodGraph = 'range';
+			$dateForSinglePeriodGraph = $info['date'];
+		}
+		else
+		{
+			$periodForSinglePeriodGraph = $info['period'];
+			$dateForSinglePeriodGraph = $info['date'];
+
+			$piwikSite = new Piwik_Site($idSite);
+			if($periodForSinglePeriodGraph == 'range')
 			{
-				$dateLastN = Piwik_Controller::getDateRangeRelativeToEndDate($info['period'], $lastN, $info['date'], new Piwik_Site($idSite));
+				$periodForMultiplePeriodGraph = Zend_Registry::get('config')->General->graphs_default_period_to_plot_when_period_range;
+				$dateForMultiplePeriodGraph = $dateForSinglePeriodGraph;
 			}
-			// Period is not range, but date is already date1,date2 format
-			// so we draw the graph over the requested range
 			else
 			{
-				$info['period'] = 'range';
+				$periodForMultiplePeriodGraph = $periodForSinglePeriodGraph;
+				$dateForMultiplePeriodGraph = Piwik_Controller::getDateRangeRelativeToEndDate(
+					$periodForSinglePeriodGraph,
+					'last' . self::GRAPH_EVOLUTION_LAST_PERIODS,
+					$dateForSinglePeriodGraph,
+					$piwikSite
+				);
 			}
 		}
+
 		$token_auth = Piwik_Common::getRequestVar('token_auth', false);
 		
 		$urlPrefix = "index.php?";
@@ -92,10 +107,7 @@ class Piwik_ImageGraph extends Piwik_Plugin
 			{
 				$parameters['token_auth'] = $token_auth;
 			}
-			$parameters['graphType'] = 'verticalBar';
-			$parameters['period'] = $info['period'];
-			$parameters['date'] = $info['date'];
-			
+
 			// Forward custom Report parameters to the graph URL 
 			if(!empty($report['parameters']))
 			{
@@ -103,17 +115,17 @@ class Piwik_ImageGraph extends Piwik_Plugin
 			}
 			if(empty($report['dimension']))
 			{
-				$parameters['graphType'] = 'evolution';
-				
-				// If period == range, then date is already a date range
-				if($info['period'] != 'range')
-				{
-					$parameters['date'] = $dateLastN;
-				}
+				$parameters['period'] = $periodForMultiplePeriodGraph;
+				$parameters['date'] = $dateForMultiplePeriodGraph;
+			}
+			else
+			{
+				$parameters['period'] = $periodForSinglePeriodGraph;
+				$parameters['date'] = $dateForSinglePeriodGraph;
 			}
 			
 			$report['imageGraphUrl'] = $urlPrefix . Piwik_Url::getQueryStringFromParameters($parameters);
 		}
 			
 	}
-}
-\ No newline at end of file
+}
diff --git a/plugins/ImageGraph/ImageGraphObject.php b/plugins/ImageGraph/ImageGraphObject.php
deleted file mode 100644
index b94f93ea30..0000000000
--- a/plugins/ImageGraph/ImageGraphObject.php
+++ /dev/null
@@ -1,1079 +0,0 @@
-<?php
-/**
- * Piwik - Open source web analytics
- * 
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- * @version $Id$
- * 
- * @category Piwik_Plugins
- * @package Piwik_ImageGraph
- */
-
-require_once PIWIK_INCLUDE_PATH."/libs/pChart.1.27d/pChart/pData.php";
-require_once PIWIK_INCLUDE_PATH."/libs/pChart.1.27d/pChart/pChart.php";
-
-class Piwik_ImageGraph_ImageGraphObject extends pChart
-{
-	private $data = null;
-	private $abscissaSerie = null;
-	private $ordinateSerie = null;
-	private $abscissaName = null;
-	private $ordinateName = null;
-	private $widthImg;
-	private $heightImg;
-	private $fontSize;
-	private $title;
-	private $metricTitle;
-	private $imageFontHeight;
-	private $imageOrdinateLabelMaxWidth;
-	private $aliasedGraph;
-	
-	public function __construct(
-						$width = Piwik_ImageGraph_API::GRAPH_WIDTH, 
-						$height = Piwik_ImageGraph_API::GRAPH_HEIGHT, 
-						$fontSize = Piwik_ImageGraph_API::GRAPH_FONT_SIZE)
-	{
-		//validate $width and $height
-		$minWidth = 150;
-		$maxWidth = 1500;
-		if(	!is_numeric($width) ||
-			$width < $minWidth ||
-			$width > $maxWidth
-		)
-		{
-			throw new Exception(Piwik_Translate("General_ParameterMustIntegerBetween", array('$width', $minWidth, $maxWidth)));
-		}
-		$minHeight = 150;
-		$maxHeight = 1500;
-		if(	!is_numeric($height) ||
-			$height < $minHeight ||
-			$height > $maxHeight
-		)
-		{
-			throw new Exception(Piwik_Translate("General_ParameterMustIntegerBetween", array('$height', $minHeight, $maxHeight)));
-		}
-		$minFontSize = 3;
-		$maxFontSize = 25; 
-		if(	!is_numeric($fontSize) ||
-			$fontSize < $minFontSize ||
-			$fontSize > $maxFontSize
-		)
-		{
-			throw new Exception(Piwik_Translate("General_ParameterMustIntegerBetween", array('$fontSize', $minFontSize, $maxFontSize)));
-		}
-		$this->widthImg = $width;
-		$this->heightImg = $height;
-		
-		//Contruct the inherited pChart
-		//parent::__construct($this->widthImg, $this->heightImg);
-		//Workaround for white background
-		$this->XSize   = $this->widthImg;
-		$this->YSize   = $this->heightImg;
-		$this->Picture = imagecreatetruecolor($this->widthImg,$this->heightImg);
-		$C_White =$this->AllocateColor($this->Picture,255,255,255);
-		imagefilledrectangle($this->Picture,0,0,$this->widthImg,$this->heightImg,$C_White);
-		
-		//Set font and properties
-		$this->fontSize = $fontSize;
-		$this->setFontProperties(PIWIK_INCLUDE_PATH."/libs/pChart.1.27d/Fonts/tahoma.ttf", $fontSize);
-		$Position = imageftbbox($this->FontSize, 0, $this->FontName, "Test");
-		$this->imageFontHeight = $Position[1]-$Position[7];
-	}
-	
-	public function setData($abscissaSerie, $ordinateSerie, $abscissaName, $ordinateName, $title = false, $metricTitle = false, $aliasedGraph = false)
-	{
-		$sum = 0;
-		foreach($ordinateSerie as $osVal)
-		{
-			$sum += $osVal;
-		}
-		if($sum == 0)
-		{
-			//throw new Exception(Piwik_Translate("General_NoDataForGraph"));
-		}
-		
-		$this->abscissaSerie = $abscissaSerie;
-		$this->ordinateSerie = $ordinateSerie;
-		$this->abscissaName = $abscissaName;
-		$this->ordinateName = $ordinateName;
-		$this->title = "";
-		$this->metricTitle = "";
-		$this->aliasedGraph = false;
-		if(!empty($title) && is_string($title))
-			$this->title = $title;
-		if(!empty($metricTitle) && is_string($metricTitle))
-			$this->metricTitle = $metricTitle;
-		if(!empty($aliasedGraph) && $aliasedGraph)
-			$this->aliasedGraph = true;
-		
-		$this->imageOrdinateLabelMaxWidth = 0;
-		foreach($ordinateSerie as $oName)
-		{
-			$Position = imageftbbox($this->FontSize, 0, $this->FontName, $oName);
-			$oTemp = $Position[2] - $Position[0];
-			$this->imageOrdinateLabelMaxWidth = $oTemp > $this->imageOrdinateLabelMaxWidth ? $oTemp : $this->imageOrdinateLabelMaxWidth;
-		}
-	}
-	
-	private function _getDataObj()
-	{
-		//Setup the pData - Object (pChart Framework at http://pchart.sourceforge.net/) to feed the graph
-		$data = new pData;
-		$data->AddPoint($this->ordinateSerie, "ORDINATE");
-		$data->AddSerie("ORDINATE");
-		$data->SetYAxisName($this->ordinateName);
-		$data->SetSerieName($this->metricTitle, "ORDINATE");
-		$data->AddPoint($this->abscissaSerie, "ABSCISSA");
-		$data->SetAbsciseLabelSerie("ABSCISSA");
-		$data->SetXAxisName($this->abscissaName);
-		return $data;
-	}
-	
-	public function print3dPieGraph(	$hexColor0 = false,
-										$hexColor1 = false,
-										$hexColor2 = false,
-										$hexColor3 = false,
-										$hexColor4 = false,
-										$hexColor5 = false,
-										$hexColor6 = false
-	)
-	{
-		$this->_truncateSmallValues();
-		$this->data = $this->_getDataObj();
-		
-		$rgbColor = $this->_hex2rgb($hexColor0, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_0);
-		$this->setColorPalette(0, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor1, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_1);
-		$this->setColorPalette(1, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor2, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_2);
-		$this->setColorPalette(2, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor3, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_3);
-		$this->setColorPalette(3, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor4, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_4);
-		$this->setColorPalette(4, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor5, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_5);
-		$this->setColorPalette(5, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		
-		$radius = $this->heightImg < ($this->widthImg - 100) ? $this->heightImg/1.75 : ($this->widthImg - 100)/2.5;
-		
-		$this->drawPieGraph($this->data->GetData(), $this->data->GetDataDescription(), $this->widthImg/2, $this->heightImg/2 , $radius, PIE_PERCENTAGE, true, 40, 20, 10);
-		$rgbColor = $this->_hex2rgb($hexColor6, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_6);
-		$this->drawPieLegend(5, 25, $this->data->GetData(), $this->data->GetDataDescription(), $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-	}
-	
-	public function printBasicPieGraph(	$hexColor0 = false,
-										$hexColor1 = false,
-										$hexColor2 = false,
-										$hexColor3 = false,
-										$hexColor4 = false,
-										$hexColor5 = false,
-										$hexColor6 = false
-	)
-	{
-		$this->_truncateSmallValues();
-		$this->data = $this->_getDataObj();
-		
-		$rgbColor = $this->_hex2rgb($hexColor0, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_0);
-		$this->setColorPalette(0, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor1, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_1);
-		$this->setColorPalette(1, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor2, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_2);
-		$this->setColorPalette(2, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor3, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_3);
-		$this->setColorPalette(3, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor4, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_4);
-		$this->setColorPalette(4, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor5, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_5);
-		$this->setColorPalette(5, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		
-		$radius = $this->heightImg < ($this->widthImg - 100) ? $this->heightImg/2.5 : ($this->widthImg - 100)/2.5;
-		
-		$rgbColor = $this->_hex2rgb($hexColor6, Piwik_ImageGraph_API::GRAPH_COLOR_PIE_6);
-		$this->drawBasicPieGraph($this->data->GetData(), $this->data->GetDataDescription(), $this->widthImg/2, $this->heightImg/2 , $radius, PIE_LABELS, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-	}
-	
-	public function printBasicBarGraph(	$hexColor0 = false,
-										$hexColor1 = false
-	)
-	{
-		$this->_computeAndApplyAbscissaModVal();
-		$this->data = $this->_getDataObj();
-		
-		$rgbColor = $this->_hex2rgb($hexColor0, Piwik_ImageGraph_API::GRAPH_COLOR_BAR_0, 0.5);
-		$this->setColorPalette(0, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		$rgbColor = $this->_hex2rgb($hexColor1, Piwik_ImageGraph_API::GRAPH_COLOR_BAR_1, 0.5);
-		$this->setColorPalette(1, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		
-		$maxMarginTop = $this->imageFontHeight/2;
-		$maxMarginTop = $maxMarginTop > 5 ? $maxMarginTop : 5;
-		if(!empty($this->metricTitle))
-			$this->setGraphArea(5 + $this->imageOrdinateLabelMaxWidth, $maxMarginTop + (3 + $this->imageFontHeight), $this->widthImg, $this->heightImg - (11 + $this->imageFontHeight));
-		else
-			$this->setGraphArea(5 + $this->imageOrdinateLabelMaxWidth, $maxMarginTop, $this->widthImg, $this->heightImg - (11 + $this->imageFontHeight));
-		$this->drawGraphArea(255, 255, 255);
-		$this->drawScale($this->data->GetData(), $this->data->GetDataDescription(), SCALE_START0, 0, 0, 0, true, 0, 2, true);
-		$this->DivisionCount = 2;
-		$this->drawGrid(4, false);
-		$this->drawBarGraph($this->data->GetData(), $this->data->GetDataDescription(), true);
-		if(!empty($this->metricTitle))
-			$this->drawLegend(10 + $this->imageOrdinateLabelMaxWidth,0, $this->data->GetDataDescription(), 255,255,255, -1,-1,-1, 0,0,0, false);
-	}
-	
-	public function printBasicLineGraph($hexColor = false)
-	{
-		$this->_computeAndApplyAbscissaModVal();
-		$this->data = $this->_getDataObj();
-		
-		$rgbColor = $this->_hex2rgb($hexColor, Piwik_ImageGraph_API::GRAPH_COLOR_LINE);
-		$this->setColorPalette(0, $rgbColor['r'], $rgbColor['g'], $rgbColor['b']);
-		
-		$maxMarginTop = $this->imageFontHeight/2;
-		$maxMarginTop = $maxMarginTop > 5 ? $maxMarginTop : 5;
-		if(!empty($this->metricTitle))
-			$this->setGraphArea(5 + $this->imageOrdinateLabelMaxWidth, $maxMarginTop + (3 + $this->imageFontHeight), $this->widthImg, $this->heightImg - (11 + $this->imageFontHeight));
-		else
-			$this->setGraphArea(5 + $this->imageOrdinateLabelMaxWidth, $maxMarginTop, $this->widthImg, $this->heightImg - (11 + $this->imageFontHeight));
-		$this->drawGraphArea(255, 255, 255);
-		$this->drawScale($this->data->GetData(), $this->data->GetDataDescription(), SCALE_START0, 0, 0, 0, true, 0, 2, true);
-		$this->DivisionCount = 2;
-		$this->drawGrid(4, false);
-		$this->drawLineGraph($this->data->GetData(), $this->data->GetDataDescription(), true);
-		$this->drawPlotGraph($this->data->GetData(), $this->data->GetDataDescription(), 3, 2, 255, 255, 255);
-		if(!empty($this->metricTitle))
-			$this->drawLegend(10 + $this->imageOrdinateLabelMaxWidth,0, $this->data->GetDataDescription(), 255,255,255, -1,-1,-1, 0,0,0, false);
-	}
-	
-	public function printException($e)
-	{
-		$C_TextColor = $this->AllocateColor($this->Picture,0,0,0);
-		imagettftext($this->Picture,$this->FontSize,0,5,$this->FontSize+5,$C_TextColor,$this->FontName,$e->getMessage());
-	}
-	
-	private function _truncateSmallValues()
-	{
-		$others = 0;
-		$currCount = count($this->ordinateSerie);
-		
-		$newOrdinateSerie = array();
-		$newAbscissaSerie = array();
-		$tmpCount = 0;
-		$tmpTmpCount = 0;
-		$sum = 0;
-		foreach($this->ordinateSerie as $osVal)
-		{
-			$sum += $osVal;
-		}
-		foreach($this->ordinateSerie as $osVal)
-		{
-			if($tmpCount == ($currCount-1))
-			{
-				break;
-			}
-			
-			if(($osVal / $sum) > 0.01)
-			{
-				$newOrdinateSerie[$tmpTmpCount] = $osVal;
-				$newAbscissaSerie[$tmpTmpCount] = $this->abscissaSerie[$tmpCount];
-				$tmpTmpCount++;
-			}
-			else
-			{
-				$others += $osVal;
-			}
-			$tmpCount++;
-		}
-		$others += $this->ordinateSerie[$currCount-1];
-		if(($others / $sum) > 0.01)
-		{
-			$newOrdinateSerie[$tmpTmpCount] = $others;
-			$newAbscissaSerie[$tmpTmpCount] = $this->abscissaSerie[$currCount-1];
-		}
-		$this->ordinateSerie = $newOrdinateSerie;
-		$this->abscissaSerie = $newAbscissaSerie;
-	}
-	
-	private function _computeAndApplyAbscissaModVal()
-	{
-		//Compute and apply the $abscissaModVal to $abscissaSerie
-		//if the graphType is bar or line
-		$maxL = 0;
-		$abscissaModVal = 1;
-		$rowCount = @count($this->abscissaSerie);
-		foreach($this->abscissaSerie as $val)
-		{
-			$temp = strlen($val);
-			$maxL = $temp > $maxL ? $temp : $maxL;
-		}
-		$abscissaModVal = round(($maxL*$this->fontSize)/(($this->widthImg*0.85)/$rowCount));
-		if($abscissaModVal <= 0)
-		{
-			$abscissaModVal = 1;
-		}
-		foreach($this->abscissaSerie as $idx => &$val)
-		{
-			$val = ($idx % $abscissaModVal == 0) ? substr($val, 0, 22).(strlen($val) > 22 ? "..." : "") : "";
-		}
-	}
-	
-	private function _hex2rgb($hexColor, $default, $alpha = 1.0, $backGrey = 255)
-	{
-		if(	!is_string($hexColor) ||
-			strlen($hexColor) != 6
-		)
-		{
-			$hexColor = $default;
-		}
-		$hexColor = strtolower($hexColor);
-		if(strspn($hexColor, '0123456789abcdef') != 6)
-		{
-			return false;
-		}
-		
-		$hexR = substr($hexColor, 0, 2);
-		$hexG = substr($hexColor, 2, 2);
-		$hexB = substr($hexColor, 4, 2);
-		
-		$r = hexdec($hexR);
-		$g = hexdec($hexG);
-		$b = hexdec($hexB);
-		
-		if(	is_numeric($alpha) &&
-			$alpha < 1.0 &&
-			$alpha > 0.0 &&
-			is_numeric($backGrey) &&
-			$backGrey < 256 &&
-			$backGrey >= 0
-		)
-		{
-			$r *= $alpha; $r += ((1.0-$alpha)*$backGrey);
-			$g *= $alpha; $g += ((1.0-$alpha)*$backGrey);
-			$b *= $alpha; $b += ((1.0-$alpha)*$backGrey);
-		}
-		
-		return array("r" => $r, "g" => $g, "b" => $b);
-	}
-	
-	/*
-	 * Override
-	 */
-	function drawGrid($LineWidth,$Mosaic=TRUE,$R=220,$G=220,$B=220,$Alpha=100)
-    {
-     //Draw mosaic
-     if ( $Mosaic )
-      {
-       $LayerWidth  = $this->GArea_X2-$this->GArea_X1;
-       $LayerHeight = $this->GArea_Y2-$this->GArea_Y1;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         =$this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $C_Rectangle =$this->AllocateColor($this->Layers[0],250,250,250);
-
-       $YPos  = $LayerHeight; //$this->GArea_Y2-1;
-       $LastY = $YPos;
-       for($i=0;$i<=$this->DivisionCount;$i++)
-        {
-         $LastY = $YPos;
-         $YPos  = $YPos - $this->DivisionHeight;
-
-         if ( $YPos <= 0 ) { $YPos = 1; }
-
-         if ( $i % 2 == 0 )
-          {
-           imagefilledrectangle($this->Layers[0],1,$YPos,$LayerWidth-1,$LastY,$C_Rectangle);
-          }
-        }
-       imagecopymerge($this->Picture,$this->Layers[0],$this->GArea_X1,$this->GArea_Y1,0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-      }
-
-     //Horizontal lines
-     $YPos = $this->GArea_Y2 - $this->DivisionHeight;
-     for($i=1;$i<=($this->DivisionCount+1);$i++)
-      {
-       if ( $YPos >= $this->GArea_Y1 && $YPos <= $this->GArea_Y2 )
-        $this->drawLine($this->GArea_X1,$YPos,$this->GArea_X2,$YPos,$R,$G,$B);//$this->drawDottedLine($this->GArea_X1,$YPos,$this->GArea_X2,$YPos,$LineWidth,$R,$G,$B);
-        
-       $YPos = $YPos - $this->DivisionHeight;
-      }
-
-     /* Vertical lines */
-     if ( $this->GAreaXOffset == 0 )
-      { $XPos = $this->GArea_X1 + $this->DivisionWidth + $this->GAreaXOffset; $ColCount = $this->DataCount-2; }
-     else
-      { $XPos = $this->GArea_X1 + $this->GAreaXOffset; $ColCount = floor( ($this->GArea_X2 - $this->GArea_X1) / $this->DivisionWidth ); }
-
-      
-      $dataTmp = $this->data->getData();
-     for($i=1;$i<=$ColCount;$i++)
-      {
-      	if ( $XPos > $this->GArea_X1 && $XPos < $this->GArea_X2 )
-	       if(strlen($dataTmp[$i-1]['ABSCISSA']) > 0)
-	       		$this->drawLine(floor($XPos),$this->GArea_Y1,floor($XPos),$this->GArea_Y2,$R,$G,$B);//$this->drawDottedLine(floor($XPos),$this->GArea_Y1,floor($XPos),$this->GArea_Y2,$LineWidth,$R,$G,$B);
-	    $XPos = $XPos + $this->DivisionWidth;
-      }
-    }
-    
-    /*
-     * Override
-     */
-	function drawScale($Data,$DataDescription,$ScaleMode,$R,$G,$B,$DrawTicks=TRUE,$Angle=0,$Decimals=1,$WithMargin=FALSE,$SkipLabels=1,$RightScale=FALSE)
-    {
-     //Validate the Data and DataDescription array
-     $this->validateData("drawScale",$Data);
-
-     $C_TextColor         =$this->AllocateColor($this->Picture,$R,$G,$B);
-
-     //$this->drawLine($this->GArea_X1,$this->GArea_Y1,$this->GArea_X1,$this->GArea_Y2,$R,$G,$B);
-     $this->drawLine($this->GArea_X1,$this->GArea_Y2,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B);
-
-     if ( $this->VMin == NULL && $this->VMax == NULL)
-      {
-       if (isset($DataDescription["Values"][0]))
-        {
-         $this->VMin = $Data[0][$DataDescription["Values"][0]];
-         $this->VMax = $Data[0][$DataDescription["Values"][0]];
-        }
-       else { $this->VMin = 2147483647; $this->VMax = -2147483647; }
-
-       //Compute Min and Max values
-       if ( $ScaleMode == SCALE_NORMAL || $ScaleMode == SCALE_START0 )
-        {
-         if ( $ScaleMode == SCALE_START0 ) { $this->VMin = 0; }
-
-         foreach ( $Data as $Key => $Values )
-          {
-           foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-            {
-             if (isset($Data[$Key][$ColName]))
-              {
-               $Value = $Data[$Key][$ColName];
-
-               if ( is_numeric($Value) )
-                {
-                 if ( $this->VMax < $Value) { $this->VMax = $Value; }
-                 if ( $this->VMin > $Value) { $this->VMin = $Value; }
-                }
-              }
-            }
-          }
-        }
-       elseif ( $ScaleMode == SCALE_ADDALL || $ScaleMode == SCALE_ADDALLSTART0 ) //Experimental
-        {
-         if ( $ScaleMode == SCALE_ADDALLSTART0 ) { $this->VMin = 0; }
-
-         foreach ( $Data as $Key => $Values )
-          {
-           $Sum = 0;
-           foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-            {
-             if (isset($Data[$Key][$ColName]))
-              {
-               $Value = $Data[$Key][$ColName];
-               if ( is_numeric($Value) )
-                $Sum  += $Value;
-              }
-            }
-           if ( $this->VMax < $Sum) { $this->VMax = $Sum; }
-           if ( $this->VMin > $Sum) { $this->VMin = $Sum; }
-          }
-        }
-
-       if ( $this->VMax > preg_replace('/\.[0-9]+/','',$this->VMax) )
-        $this->VMax = preg_replace('/\.[0-9]+/','',$this->VMax)+1;
-
-       //If all values are the same
-       if ( $this->VMax == $this->VMin )
-        {
-         if ( $this->VMax >= 0 ) { $this->VMax++; }
-         else { $this->VMin--; }
-        }
-
-       $DataRange = $this->VMax - $this->VMin;
-       if ( $DataRange == 0 ) { $DataRange = .1; }
-
-       //Compute automatic scaling
-       $ScaleOk = FALSE; $Factor = 1;
-       $MinDivHeight = 25; $MaxDivs = ($this->GArea_Y2 - $this->GArea_Y1) / $MinDivHeight;
-
-       if ( $this->VMin == 0 && $this->VMax == 0 )
-        { $this->VMin = 0; $this->VMax = 2; $Scale = 1; $Divisions = 2;}
-       elseif ($MaxDivs > 1)
-        {
-         while(!$ScaleOk)
-          {
-           $Scale1 = ( $this->VMax - $this->VMin ) / $Factor;
-           $Scale2 = ( $this->VMax - $this->VMin ) / $Factor / 2;
-           $Scale4 = ( $this->VMax - $this->VMin ) / $Factor / 4;
-
-           if ( $Scale1 > 1 && $Scale1 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale1); $Scale = 1;}
-           if ( $Scale2 > 1 && $Scale2 <= $MaxDivs && !$ScaleOk) { $ScaleOk = TRUE; $Divisions = floor($Scale2); $Scale = 2;}
-           if (!$ScaleOk)
-            {
-             if ( $Scale2 > 1 ) { $Factor = $Factor * 10; }
-             if ( $Scale2 < 1 ) { $Factor = $Factor / 10; }
-            }
-            
-            if($Factor == 10)
-            {
-            	$Divisions = 2;
-            	$Scale = 1;
-            	break;
-            }
-          }
-
-         if ( floor($this->VMax / $Scale / $Factor) != $this->VMax / $Scale / $Factor)
-          {
-           $GridID     = floor ( $this->VMax / $Scale / $Factor) + 1;
-           $this->VMax = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-
-         if ( floor($this->VMin / $Scale / $Factor) != $this->VMin / $Scale / $Factor)
-          {
-           $GridID     = floor( $this->VMin / $Scale / $Factor);
-           $this->VMin = $GridID * $Scale * $Factor;
-           $Divisions++;
-          }
-        }
-       else //Can occurs for small graphs
-        $Scale = 1;
-
-       if ( !isset($Divisions) )
-        $Divisions = 2;
-
-       if ($Scale == 1 && $Divisions%2 == 1)
-        $Divisions--;
-      }
-     else
-      $Divisions = $this->Divisions;
-
-     $this->DivisionCount = 2;
-     $Divisions = 2;
-
-     $DataRange = $this->VMax - $this->VMin;
-     if ( $DataRange == 0 ) { $DataRange = .1; }
-
-     $this->DivisionHeight = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $Divisions;
-     $this->DivisionRatio  = ( $this->GArea_Y2 - $this->GArea_Y1 ) / $DataRange;
-
-     $this->GAreaXOffset  = 0;
-     if ( count($Data) > 1 )
-      {
-       if ( $WithMargin == FALSE )
-        $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data)-1);
-       else
-        {
-         $this->DivisionWidth = ( $this->GArea_X2 - $this->GArea_X1 ) / (count($Data));
-         $this->GAreaXOffset  = $this->DivisionWidth / 2;
-        }
-      }
-     else
-      {
-       $this->DivisionWidth = $this->GArea_X2 - $this->GArea_X1;
-       $this->GAreaXOffset  = $this->DivisionWidth / 2;
-      }
-
-     $this->DataCount = count($Data);
-
-     if ( $DrawTicks == FALSE )
-      return(0);
-
-     $YPos = $this->GArea_Y2; $XMin = NULL;
-     for($i=1;$i<=$Divisions+1;$i++)
-      {
-       if ( $RightScale )
-        $this->drawLine($this->GArea_X2,$YPos,$this->GArea_X2+5,$YPos,$R,$G,$B);
-       else
-        //$this->drawLine($this->GArea_X1,$YPos,$this->GArea_X1-5,$YPos,$R,$G,$B);
-
-       $Value     = $this->VMin + ($i-1) * (( $this->VMax - $this->VMin ) / $Divisions);
-       $Value     = round($Value * pow(10,$Decimals)) / pow(10,$Decimals);
-       if ( $DataDescription["Format"]["Y"] == "number" )
-        $Value = $Value.$DataDescription["Unit"]["Y"];
-       if ( $DataDescription["Format"]["Y"] == "time" )
-        $Value = $this->ToTime($Value);        
-       if ( $DataDescription["Format"]["Y"] == "date" )
-        $Value = $this->ToDate($Value);        
-       if ( $DataDescription["Format"]["Y"] == "metric" )
-        $Value = $this->ToMetric($Value);        
-       if ( $DataDescription["Format"]["Y"] == "currency" )
-        $Value = $this->ToCurrency($Value);        
-
-       $Position  = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth = $Position[2]-$Position[0];
-
-       if ( $RightScale )
-        {
-         imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X2+5,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
-         if ( $XMin < $this->GArea_X2+5+$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X2+5+$TextWidth; }
-        }
-       else
-        {
-         imagettftext($this->Picture,$this->FontSize,0,$this->GArea_X1-5-$TextWidth,$YPos+($this->FontSize/2),$C_TextColor,$this->FontName,$Value);
-         if ( $XMin > $this->GArea_X1-5-$TextWidth || $XMin == NULL ) { $XMin = $this->GArea_X1-5-$TextWidth; }
-        }
-
-       $YPos = $YPos - $this->DivisionHeight;
-      }
-
-     //Write the Y Axis caption if set 
-     if ( isset($DataDescription["Axis"]["Y"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["Y"]);
-       $TextHeight = abs($Position[1])+abs($Position[3]);
-       $TextTop    = (($this->GArea_Y2 - $this->GArea_Y1) / 2) + $this->GArea_Y1 + ($TextHeight/2);
-
-       if ( $RightScale )
-        imagettftext($this->Picture,$this->FontSize,90,$XMin+$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-       else
-        ;//imagettftext($this->Picture,$this->FontSize,90,$XMin-$this->FontSize,$TextTop,$C_TextColor,$this->FontName,$DataDescription["Axis"]["Y"]);
-      }
-
-     //Horizontal Axis
-     $XPos = $this->GArea_X1 + $this->GAreaXOffset;
-     $ID = 1; $YMax = NULL;
-     foreach ( $Data as $Key => $Values )
-      {
-       if ( $ID % $SkipLabels == 0 )
-        {
-         $this->drawLine(floor($XPos),$this->GArea_Y2,floor($XPos),$this->GArea_Y2+5,$R,$G,$B);
-         $Value      = $Data[$Key][$DataDescription["Position"]];
-         if ( $DataDescription["Format"]["X"] == "number" )
-          $Value = $Value.$DataDescription["Unit"]["X"];
-         if ( $DataDescription["Format"]["X"] == "time" )
-          $Value = $this->ToTime($Value);        
-         if ( $DataDescription["Format"]["X"] == "date" )
-          $Value = $this->ToDate($Value);        
-         if ( $DataDescription["Format"]["X"] == "metric" )
-          $Value = $this->ToMetric($Value);        
-         if ( $DataDescription["Format"]["X"] == "currency" )
-          $Value = $this->ToCurrency($Value);        
-
-         $Position   = imageftbbox($this->FontSize,$Angle,$this->FontName,$Value);
-         $TextWidth  = abs($Position[2])+abs($Position[0]);
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         if ( $Angle == 0 )
-          {
-           //$YPos = $this->GArea_Y2+18;
-           $YPos = $this->GArea_Y2 + $this->imageFontHeight + 9;
-           imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-floor($TextWidth/2),$YPos,$C_TextColor,$this->FontName,$Value);
-          }
-         else
-          {
-           $YPos = $this->GArea_Y2+10+$TextHeight;
-           if ( $Angle <= 90 )
-            imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)-$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
-           else
-            imagettftext($this->Picture,$this->FontSize,$Angle,floor($XPos)+$TextWidth+5,$YPos,$C_TextColor,$this->FontName,$Value);
-          }
-         if ( $YMax < $YPos || $YMax == NULL ) { $YMax = $YPos; }
-        }
-
-       $XPos = $XPos + $this->DivisionWidth;
-       $ID++;
-      }
-
-    //Write the X Axis caption if set 
-    if ( isset($DataDescription["Axis"]["X"]) )
-      {
-       $Position   = imageftbbox($this->FontSize,90,$this->FontName,$DataDescription["Axis"]["X"]);
-       $TextWidth  = abs($Position[2])+abs($Position[0]);
-       $TextLeft   = (($this->GArea_X2 - $this->GArea_X1) / 2) + $this->GArea_X1 + ($TextWidth/2);
-       //imagettftext($this->Picture,$this->FontSize,0,$TextLeft,$YMax+$this->FontSize+5,$C_TextColor,$this->FontName,$DataDescription["Axis"]["X"]);
-      }
-    }
-    
-    /*
-     * Override
-     */
-	function drawGraphArea($R,$G,$B,$Stripe=FALSE)
-    {
-     $this->drawFilledRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R,$G,$B,FALSE);
-     //$this->drawRectangle($this->GArea_X1,$this->GArea_Y1,$this->GArea_X2,$this->GArea_Y2,$R-40,$G-40,$B-40);
-
-     if ( $Stripe )
-      {
-       $R2 = $R-15; if ( $R2 < 0 ) { $R2 = 0; }
-       $G2 = $R-15; if ( $G2 < 0 ) { $G2 = 0; }
-       $B2 = $R-15; if ( $B2 < 0 ) { $B2 = 0; }
-
-       $LineColor =$this->AllocateColor($this->Picture,$R2,$G2,$B2);
-       $SkewWidth = $this->GArea_Y2-$this->GArea_Y1-1;
-
-       for($i=$this->GArea_X1-$SkewWidth;$i<=$this->GArea_X2;$i=$i+4)
-        {
-         $X1 = $i;            $Y1 = $this->GArea_Y2;
-         $X2 = $i+$SkewWidth; $Y2 = $this->GArea_Y1;
-
-
-         if ( $X1 < $this->GArea_X1 )
-          { $X1 = $this->GArea_X1; $Y1 = $this->GArea_Y1 + $X2 - $this->GArea_X1 + 1; }
-
-         if ( $X2 >= $this->GArea_X2 )
-          { $Y2 = $this->GArea_Y1 + $X2 - $this->GArea_X2 +1; $X2 = $this->GArea_X2 - 1; }
-		// * Fixed in 1.27 *         { $X2 = $this->GArea_X2 - 1; $Y2 = $this->GArea_Y2 - ($this->GArea_X2 - $X1); }
-
-         imageline($this->Picture,$X1,$Y1,$X2,$Y2+1,$LineColor);
-        }
-      }
-    }
-    
-    /*
-     * Override
-     */
-	function drawBarGraph($Data,$DataDescription,$Shadow=FALSE,$Alpha=100)
-    {
-     //Validate the Data and DataDescription array
-     $this->validateDataDescription("drawBarGraph",$DataDescription);
-     $this->validateData("drawBarGraph",$Data);
-
-     $GraphID      = 0;
-     $Series       = count($DataDescription["Values"]);
-     $SeriesWidth  = $this->DivisionWidth / ($Series+1);
-     $SeriesWidth *= 1.7;
-     $SerieXOffset = $this->DivisionWidth*1.7 / 2 - $SeriesWidth / 2;
-     $SeriesWidth = round($SeriesWidth); //EDIT
-     $SerieXOffset = round($SerieXOffset); //EDIT
-     
-     $YZero  = $this->GArea_Y2 - ((0-$this->VMin) * $this->DivisionRatio);
-     if ( $YZero > $this->GArea_Y2 ) { $YZero = $this->GArea_Y2; }
-
-     $SerieID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       $XPos  = $this->GArea_X1 + $this->GAreaXOffset - $SerieXOffset + $SeriesWidth * $SerieID;
-       $XPos = round($XPos); //EDIT
-       $XLast = -1;
-       foreach ( $Data as $Key => $Values )
-        {
-         if ( isset($Data[$Key][$ColName]))
-          {
-           if ( is_numeric($Data[$Key][$ColName]) )
-            {
-             $Value = $Data[$Key][$ColName];
-             $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-             $YPos = round($YPos); //EDIT
-
-             //Save point into the image map if option activated
-             if ( $this->BuildMap )
-              {
-               $this->addToImageMap($XPos+1,min($YZero,$YPos),$XPos+$SeriesWidth-1,max($YZero,$YPos),$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Bar");
-              }
-           
-             $this->drawRectangle($XPos,$YZero,$XPos+$SeriesWidth,$YPos-1,25,25,25,$this->Palette[$ColorID+1]["R"],$this->Palette[$ColorID+1]["G"],$this->Palette[$ColorID+1]["B"],TRUE,$Alpha);
-             $this->drawFilledRectangle($XPos+1,$YZero-1,$XPos+$SeriesWidth-1,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE,$Alpha);
-            }
-          }
-         $XPos = $XPos + $this->DivisionWidth;
-        }
-       $SerieID++;
-      }
-    }
-    
-function drawBasicPieGraph($Data,$DataDescription,$XPos,$YPos,$Radius=100,$DrawLabels=PIE_NOLABEL,$R=255,$G=255,$B=255,$Decimals=0)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawBasicPieGraph",$DataDescription,FALSE);
-     $this->validateData("drawBasicPieGraph",$Data);
-
-     /* Determine pie sum */
-     $Series = 0; $PieSum = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       if ( $ColName != $DataDescription["Position"] )
-        {
-         $Series++;
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            $PieSum = $PieSum + $Data[$Key][$ColName]; $iValues[] = $Data[$Key][$ColName]; $iLabels[] = $Data[$Key][$DataDescription["Position"]];
-          }
-        }
-      }
-
-     /* Validate serie */
-     if ( $Series != 1 )
-      RaiseFatal("Pie chart can only accept one serie of data.");
-
-     $SpliceRatio         = 360 / $PieSum;
-     $SplicePercent       = 100 / $PieSum;
-
-     /* Calculate all polygons */
-     $Angle    = 35; $TopPlots = "";
-     foreach($iValues as $Key => $Value)
-      {
-       $TopPlots[$Key][] = $XPos;
-       $TopPlots[$Key][] = $YPos;
-
-       /* Process labels position & size */
-       $Caption = "";
-       if ( !($DrawLabels == PIE_NOLABEL) )
-        {
-         $TAngle   = $Angle+($Value*$SpliceRatio/2);
-         if ($DrawLabels == PIE_PERCENTAGE)
-          $Caption  = (round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_LABELS)
-          $Caption  = $iLabels[$Key];
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-         elseif ($DrawLabels == PIE_PERCENTAGE_LABEL)
-          $Caption  = $iLabels[$Key]."\r\n".(round($Value * pow(10,$Decimals) * $SplicePercent)/pow(10,$Decimals))."%";
-
-         $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Caption);
-         $TextWidth  = $Position[2]-$Position[0];
-         $TextHeight = abs($Position[1])+abs($Position[3]);
-
-         $TX = cos(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $XPos;
-
-         if ( $TAngle > 0 && $TAngle < 180 )
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+10) + $YPos + 4;
-         else
-          $TY = sin(($TAngle) * 3.1418 / 180 ) * ($Radius+4) + $YPos - ($TextHeight/2);
-
-         if ( $TAngle > 90 && $TAngle < 270 )
-          $TX = $TX - $TextWidth;
-
-         $C_TextColor = $this->AllocateColor($this->Picture,0,0,0);
-         imagettftext($this->Picture,$this->FontSize,0,$TX,$TY,$C_TextColor,$this->FontName,$Caption);
-        }
-
-       /* Process pie slices */
-       for($iAngle=$Angle;$iAngle<=$Angle+$Value*$SpliceRatio;$iAngle=$iAngle+.5)
-        {
-         $TopX = cos($iAngle * 3.1418 / 180 ) * $Radius + $XPos;
-         $TopY = sin($iAngle * 3.1418 / 180 ) * $Radius + $YPos;
-
-         $TopPlots[$Key][] = $TopX; 
-         $TopPlots[$Key][] = $TopY;
-        }
-
-       $TopPlots[$Key][] = $XPos;
-       $TopPlots[$Key][] = $YPos;
-
-       $Angle = $iAngle;
-      }
-     $PolyPlots = $TopPlots;
-
-     /* Set array values type to float --- PHP Bug with imagefilledpolygon casting to integer */
-     foreach ($TopPlots as $Key => $Value)
-      { foreach ($TopPlots[$Key] as $Key2 => $Value2) { settype($TopPlots[$Key][$Key2],"float"); } }
-
-     /* Draw Top polygons */
-     foreach ($PolyPlots as $Key => $Value)
-      { 
-       $C_GraphLo = $this->AllocateColor($this->Picture,$this->Palette[$Key]["R"],$this->Palette[$Key]["G"],$this->Palette[$Key]["B"]);
-       imagefilledpolygon($this->Picture,$PolyPlots[$Key],(count($PolyPlots[$Key])+1)/2,$C_GraphLo);
-      }
-
-     $this->drawCircle($XPos-.5,$YPos-.5,$Radius,$R,$G,$B);
-     $this->drawCircle($XPos-.5,$YPos-.5,$Radius+.5,$R,$G,$B);
-
-     /* Draw Top polygons */
-     foreach ($TopPlots as $Key => $Value)
-      { 
-       for($j=0;$j<=count($TopPlots[$Key])-4;$j=$j+2)
-        $this->drawLine($TopPlots[$Key][$j],$TopPlots[$Key][$j+1],$TopPlots[$Key][$j+2],$TopPlots[$Key][$j+3],$R,$G,$B);
-      }
-    }
-
-   /* This function draw a line graph */
-   function drawLineGraph($Data,$DataDescription,$SerieName="")
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawLineGraph",$DataDescription);
-     $this->validateData("drawLineGraph",$Data);
-
-     $GraphID = 0;
-     foreach ( $DataDescription["Values"] as $Key2 => $ColName )
-      {
-       $ID = 0;
-       foreach ( $DataDescription["Description"] as $keyI => $ValueI )
-        { if ( $keyI == $ColName ) { $ColorID = $ID; }; $ID++; }
-
-       if ( $SerieName == "" || $SerieName == $ColName )
-        {
-         $XPos  = $this->GArea_X1 + $this->GAreaXOffset;
-         $XLast = -1;
-         foreach ( $Data as $Key => $Values )
-          {
-           if ( isset($Data[$Key][$ColName]))
-            {
-             $Value = $Data[$Key][$ColName];
-             $YPos = $this->GArea_Y2 - (($Value-$this->VMin) * $this->DivisionRatio);
-
-             /* Save point into the image map if option activated */
-             if ( $this->BuildMap )
-              $this->addToImageMap($XPos-3,$YPos-3,$XPos+3,$YPos+3,$DataDescription["Description"][$ColName],$Data[$Key][$ColName].$DataDescription["Unit"]["Y"],"Line");
-
-             if (!is_numeric($Value)) { $XLast = -1; }
-             if ( $XLast != -1 )
-             {
-              /*if(abs(($YPos-$YLast) / ($XPos-$XLast)) > 1)
-              {
-              	$this->drawLine($XLast-1,$YLast,$XPos-1,$YPos,($this->Palette[$ColorID]["R"]*0.15)+216,($this->Palette[$ColorID]["G"]*0.15)+216,($this->Palette[$ColorID]["B"]*0.15)+216,TRUE);
-              	$this->drawLine($XLast+1,$YLast,$XPos+1,$YPos,($this->Palette[$ColorID]["R"]*0.15)+216,($this->Palette[$ColorID]["G"]*0.15)+216,($this->Palette[$ColorID]["B"]*0.15)+216,TRUE);
-              }
-              else
-              {
-              	$this->drawLine($XLast,$YLast-1,$XPos,$YPos-1,($this->Palette[$ColorID]["R"]*0.15)+216,($this->Palette[$ColorID]["G"]*0.15)+216,($this->Palette[$ColorID]["B"]*0.15)+216,TRUE);
-              	$this->drawLine($XLast,$YLast+1,$XPos,$YPos+1,($this->Palette[$ColorID]["R"]*0.15)+216,($this->Palette[$ColorID]["G"]*0.15)+216,($this->Palette[$ColorID]["B"]*0.15)+216,TRUE);
-              }*/
-              $this->drawLine($XLast,$YLast,$XPos,$YPos,$this->Palette[$ColorID]["R"],$this->Palette[$ColorID]["G"],$this->Palette[$ColorID]["B"],TRUE);
-             }
-
-             $XLast = $XPos;
-             $YLast = $YPos;
-             if (!is_numeric($Value)) { $XLast = -1; }
-            }
-           $XPos = $XPos + $this->DivisionWidth;
-          }
-         $GraphID++;
-        }
-      }
-    }
-    
-	function drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction=FALSE)
-    {
-    	if(!$this->aliasedGraph)
-    	{
-    		imageline($this->Picture, $X1, $Y1, $X2, $Y2, imagecolorallocate($this->Picture, $R, $G, $B));
-    		return;
-    	}
-    	
-    	parent::drawLine($X1,$Y1,$X2,$Y2,$R,$G,$B,$GraphFunction);
-    }
-    
-    function drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B)
-    {
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-     
-     imagerectangle($this->Picture, $X1,$Y1,$X2,$Y2, $C_Rectangle);
-
-     /*$X1=$X1-.2;$Y1=$Y1-.2;
-     $X2=$X2+.2;$Y2=$Y2+.2;
-     $this->drawLine($X1,$Y1,$X2,$Y1,$R,$G,$B);
-     $this->drawLine($X2,$Y1,$X2,$Y2,$R,$G,$B);
-     $this->drawLine($X2,$Y2,$X1,$Y2,$R,$G,$B);
-     $this->drawLine($X1,$Y2,$X1,$Y1,$R,$G,$B);*/
-    }
-
-   /* This function create a filled rectangle with antialias */
-   function drawFilledRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B,$DrawBorder=TRUE,$Alpha=100,$NoFallBack=FALSE)
-    {
-     if ( $X2 < $X1 ) { list($X1, $X2) = array($X2, $X1); }
-     if ( $Y2 < $Y1 ) { list($Y1, $Y2) = array($Y2, $Y1); }
-
-     if ( $R < 0 ) { $R = 0; } if ( $R > 255 ) { $R = 255; }
-     if ( $G < 0 ) { $G = 0; } if ( $G > 255 ) { $G = 255; }
-     if ( $B < 0 ) { $B = 0; } if ( $B > 255 ) { $B = 255; }
-
-     $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-     
-     imagefilledrectangle($this->Picture, $X1,$Y1,$X2,$Y2, $C_Rectangle);
-
-     /*if ( $Alpha == 100 )
-      {
-       if ( $this->ShadowActive && !$NoFallBack )
-        {
-         $this->drawFilledRectangle($X1+$this->ShadowXDistance,$Y1+$this->ShadowYDistance,$X2+$this->ShadowXDistance,$Y2+$this->ShadowYDistance,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha,TRUE);
-         if ( $this->ShadowBlur != 0 )
-          {
-           $AlphaDecay = ($this->ShadowAlpha / $this->ShadowBlur);
-
-           for($i=1; $i<=$this->ShadowBlur; $i++)
-            $this->drawFilledRectangle($X1+$this->ShadowXDistance-$i/2,$Y1+$this->ShadowYDistance-$i/2,$X2+$this->ShadowXDistance-$i/2,$Y2+$this->ShadowYDistance-$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-           for($i=1; $i<=$this->ShadowBlur; $i++)
-            $this->drawFilledRectangle($X1+$this->ShadowXDistance+$i/2,$Y1+$this->ShadowYDistance+$i/2,$X2+$this->ShadowXDistance+$i/2,$Y2+$this->ShadowYDistance+$i/2,$this->ShadowRColor,$this->ShadowGColor,$this->ShadowBColor,FALSE,$this->ShadowAlpha-$AlphaDecay*$i,TRUE);
-          }
-        }
-
-       $C_Rectangle = $this->AllocateColor($this->Picture,$R,$G,$B);
-       imagefilledrectangle($this->Picture,round($X1),round($Y1),round($X2),round($Y2),$C_Rectangle);
-      }
-     else
-      {
-       $LayerWidth  = abs($X2-$X1)+2;
-       $LayerHeight = abs($Y2-$Y1)+2;
-
-       $this->Layers[0] = imagecreatetruecolor($LayerWidth,$LayerHeight);
-       $C_White         = $this->AllocateColor($this->Layers[0],255,255,255);
-       imagefilledrectangle($this->Layers[0],0,0,$LayerWidth,$LayerHeight,$C_White);
-       imagecolortransparent($this->Layers[0],$C_White);
-
-       $C_Rectangle = $this->AllocateColor($this->Layers[0],$R,$G,$B);
-       imagefilledrectangle($this->Layers[0],round(1),round(1),round($LayerWidth-1),round($LayerHeight-1),$C_Rectangle);
-
-       imagecopymerge($this->Picture,$this->Layers[0],round(min($X1,$X2)-1),round(min($Y1,$Y2)-1),0,0,$LayerWidth,$LayerHeight,$Alpha);
-       imagedestroy($this->Layers[0]);
-      }
-
-     if ( $DrawBorder )
-      {
-       $ShadowSettings = $this->ShadowActive; $this->ShadowActive = FALSE;
-       $this->drawRectangle($X1,$Y1,$X2,$Y2,$R,$G,$B);
-       $this->ShadowActive = $ShadowSettings;
-      }*/
-    }
-
-   /* Draw the data legends */
-   function drawLegend($XPos,$YPos,$DataDescription,$R,$G,$B,$Rs=-1,$Gs=-1,$Bs=-1,$Rt=0,$Gt=0,$Bt=0,$Border=TRUE)
-    {
-     /* Validate the Data and DataDescription array */
-     $this->validateDataDescription("drawLegend",$DataDescription);
-
-     if ( !isset($DataDescription["Description"]) )
-      return(-1);
-
-     $C_TextColor =$this->AllocateColor($this->Picture,$Rt,$Gt,$Bt);
-
-     /* <-10->[8]<-4->Text<-10-> */
-     $MaxWidth = 0; $MaxHeight = 8;
-     foreach($DataDescription["Description"] as $Key => $Value)
-      {
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextWidth  = $Position[2]-$Position[0];
-       $TextHeight = $Position[1]-$Position[7];
-       if ( $TextWidth > $MaxWidth) { $MaxWidth = $TextWidth; }
-       $MaxHeight = $MaxHeight + $TextHeight + 4;
-      }
-     $MaxHeight = $MaxHeight - 5;
-     $MaxWidth  = $MaxWidth + 32;
-
-     if ( $Rs == -1 || $Gs == -1 || $Bs == -1 )
-      { $Rs = $R-30; $Gs = $G-30; $Bs = $B-30; }
-
-     if ( $Border )
-      {
-       $this->drawFilledRoundedRectangle($XPos+1,$YPos+1,$XPos+$MaxWidth+1,$YPos+$MaxHeight+1,5,$Rs,$Gs,$Bs);
-       $this->drawFilledRoundedRectangle($XPos,$YPos,$XPos+$MaxWidth,$YPos+$MaxHeight,5,$R,$G,$B);
-      }
-
-     $YOffset = $this->FontSize; $ID = 0;
-     foreach($DataDescription["Description"] as $Key => $Value)
-      {
-       $Position   = imageftbbox($this->FontSize,0,$this->FontName,$Value);
-       $TextHeight = $Position[1]-$Position[7];
-
-       $this->drawFilledRectangle($XPos,$YPos+$YOffset-($TextHeight/2)+1,$XPos+8,$YPos+$YOffset-($TextHeight/2),$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
-       //$this->drawFilledRoundedRectangle($XPos+10,$YPos+$YOffset-4,$XPos+14,$YPos+$YOffset-4,2,$this->Palette[$ID]["R"],$this->Palette[$ID]["G"],$this->Palette[$ID]["B"]);
-       imagettftext($this->Picture,$this->FontSize,0,$XPos+12,$YPos+$YOffset,$C_TextColor,$this->FontName,$Value);
-
-       $YOffset = $YOffset + $TextHeight + 4;
-       $ID++;
-      }
-    }
-	
-}
-\ No newline at end of file
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
new file mode 100644
index 0000000000..084ccda5c0
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph.php
@@ -0,0 +1,283 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ * 
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ * 
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pDraw.class.php";
+require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pImage.class.php";
+require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pData.class.php";
+
+/**
+ * The Piwik_ImageGraph_StaticGraph abstract class is used as a base class for different types of static graphs.
+ *
+ * @package Piwik_ImageGraph
+ * @subpackage Piwik_ImageGraph_StaticGraph
+ */
+abstract class Piwik_ImageGraph_StaticGraph
+{
+	const GRAPH_TYPE_BASIC_LINE = "evolution";
+	const GRAPH_TYPE_VERTICAL_BAR = "verticalBar";
+	const GRAPH_TYPE_HORIZONTAL_BAR = "horizontalBar";
+	const GRAPH_TYPE_3D_PIE = "3dPie";
+	const GRAPH_TYPE_BASIC_PIE = "pie";
+
+	static private $availableStaticGraphTypes = array(
+		self::GRAPH_TYPE_BASIC_LINE => 'Piwik_ImageGraph_StaticGraph_Evolution',
+		self::GRAPH_TYPE_VERTICAL_BAR => 'Piwik_ImageGraph_StaticGraph_VerticalBar',
+		self::GRAPH_TYPE_HORIZONTAL_BAR => 'Piwik_ImageGraph_StaticGraph_HorizontalBar',
+		self::GRAPH_TYPE_BASIC_PIE => 'Piwik_ImageGraph_StaticGraph_Pie',
+		self::GRAPH_TYPE_3D_PIE => 'Piwik_ImageGraph_StaticGraph_3DPie',
+	);
+
+	const ABSCISSA_SERIE_NAME = 'ABSCISSA';
+	const WIDTH_KEY = 'WIDTH';
+	const HEIGHT_KEY = 'HEIGHT';
+
+	private $aliasedGraph;
+
+	protected $pImage;
+	protected $pData;
+	protected $metricTitle;
+	protected $showMetricTitle;
+	protected $abscissaSerie;
+	protected $ordinateSerie;
+	protected $ordinateLogos;
+	protected $colors;
+	protected $font;
+	protected $fontSize;
+	protected $width;
+	protected $height;
+
+	abstract protected function getDefaultColors();
+
+	abstract public function renderGraph();
+
+	/**
+	 * Return the StaticGraph according to the static graph type $graphType
+	 *
+	 * @throws exception If the static graph type is unknown
+	 * @param string $graphType
+	 * @return Piwik_ImageGraph_StaticGraph
+	 */
+	public static function factory($graphType)
+	{
+		if (isset(self::$availableStaticGraphTypes[$graphType]))
+		{
+
+			$className = self::$availableStaticGraphTypes[$graphType];
+			Piwik_Loader::loadClass($className);
+			return new $className;
+		}
+		else
+		{
+			throw new Exception(
+				Piwik_TranslateException(
+					'General_ExceptionInvalidStaticGraphType',
+					array($graphType, implode(', ', self::getAvailableStaticGraphTypes()))
+				)
+			);
+		}
+	}
+
+	public static function getAvailableStaticGraphTypes()
+	{
+		return array_keys(self::$availableStaticGraphTypes);
+	}
+
+	/**
+	 * Save rendering to disk
+	 *
+	 * @param string $filename without path
+	 * @return string path of file
+	 */
+	public function sendToDisk($filename)
+	{
+		$filePath = self::getOutputPath($filename);
+		$this->pImage->Render($filePath);
+		return $filePath;
+	}
+
+	/**
+	 * @return rendered static graph
+	 */
+	public function getRenderedImage()
+	{
+		return $this->pImage->Picture;
+	}
+
+	/**
+	 * Output rendering to browser
+	 */
+	public function sendToBrowser()
+	{
+		$this->pImage->stroke();
+	}
+
+	public function setWidth($width)
+	{
+		$this->width = $width;
+	}
+
+	public function setHeight($height)
+	{
+		$this->height = $height;
+	}
+
+	public function setFontSize($fontSize)
+	{
+		$this->fontSize = $fontSize;
+	}
+
+	public function setFont($font)
+	{
+		$this->font = $font;
+	}
+
+	public function setOrdinateSerie($ordinateSerie)
+	{
+		$this->ordinateSerie = $ordinateSerie;
+	}
+
+	public function setOrdinateLogos($ordinateLogos)
+	{
+		$this->ordinateLogos = $ordinateLogos;
+	}
+
+	public function setAbscissaSerie($abscissaSerie)
+	{
+		$this->abscissaSerie = $abscissaSerie;
+	}
+
+	public function setShowMetricTitle($showMetricTitle)
+	{
+		$this->showMetricTitle = $showMetricTitle;
+	}
+
+	public function setMetricTitle($metricTitle)
+	{
+		$this->metricTitle = $metricTitle;
+	}
+
+	public function setAliasedGraph($aliasedGraph)
+	{
+		$this->aliasedGraph = $aliasedGraph;
+	}
+
+	public function setColors($colors)
+	{
+		$i = 0;
+		foreach($this->getDefaultColors() as $colorKey => $defaultColor)
+		{
+			if(isset($colors[$i]) && $this->hex2rgb($colors[$i]))
+			{
+				$hexColor = $colors[$i];
+			}
+			else
+			{
+				$hexColor = $defaultColor;
+			}
+
+			$this->colors[$colorKey] = $this->hex2rgb($hexColor);
+			$i++;
+		}
+	}
+
+	/**
+	 * Return $filename with temp directory and delete file
+	 *
+	 * @static
+	 * @param  $filename
+	 * @return string path of file in temp directory
+	 */
+	protected static function getOutputPath($filename)
+	{
+		$outputFilename = PIWIK_USER_PATH . '/tmp/assets/' . $filename;
+		@chmod($outputFilename, 0600);
+		@unlink($outputFilename);
+		return $outputFilename;
+	}
+
+	protected function initpData()
+	{
+		$this->pData = new pData();
+
+		$this->pData->addPoints($this->ordinateSerie, $this->metricTitle);
+		$this->pData->setAxisName(0, '', $this->metricTitle);
+
+		$this->pData->addPoints($this->abscissaSerie, self::ABSCISSA_SERIE_NAME);
+		$this->pData->setAbscissa(self::ABSCISSA_SERIE_NAME);
+	}
+
+	protected function initpImage()
+	{
+		$this->pImage = new pImage($this->width, $this->height, $this->pData);
+		$this->pImage->Antialias = $this->aliasedGraph;
+
+		$this->pImage->setFontProperties(
+			array(
+				 "FontName" => $this->font,
+				 "FontSize" => $this->fontSize
+			)
+		);
+	}
+
+	protected function getTextWidthHeight($text)
+	{
+		$position = imageftbbox($this->fontSize, 0, $this->font, $text);
+
+		return array(
+			self::WIDTH_KEY => ($position[0]) + abs($position[2]),
+			self::HEIGHT_KEY => ($position[1]) + abs($position[5])
+		);
+	}
+
+	protected function maxWidthHeight($values)
+	{
+		$maxWidth = 0;
+		$maxHeight = 0;
+		foreach($values as $value)
+		{
+			$valueWidthHeight = $this->getTextWidthHeight($value);
+			$valueWidth= $valueWidthHeight[self::WIDTH_KEY];
+			$valueHeight= $valueWidthHeight[self::HEIGHT_KEY];
+
+			if($valueWidth > $maxWidth)
+			{
+				$maxWidth = $valueWidth;
+			}
+
+			if($valueHeight > $maxHeight)
+			{
+				$maxHeight = $valueHeight;
+			}
+		}
+
+		return array(
+			self::WIDTH_KEY => $maxWidth,
+			self::HEIGHT_KEY => $maxHeight
+		);
+	}
+
+	private static function hex2rgb($hexColor)
+	{
+		if(preg_match('/([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/', $hexColor, $matches))
+		{
+			return array(
+				'R' => hexdec($matches[1]),
+				'G' => hexdec($matches[2]),
+				'B' => hexdec($matches[3])
+			);
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
+\ No newline at end of file
diff --git a/plugins/ImageGraph/StaticGraph/3DPie.php b/plugins/ImageGraph/StaticGraph/3DPie.php
new file mode 100644
index 0000000000..7f946e872d
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph/3DPie.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ *
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+/**
+ *
+ * @package Piwik_ImageGraph
+ */
+class Piwik_ImageGraph_StaticGraph_3DPie extends Piwik_ImageGraph_StaticGraph_PieGraph
+{
+	public function renderGraph()
+	{
+		$this->initPieGraph(true);
+
+		$this->pieChart->draw3DPie(
+			$this->xPosition,
+			$this->yPosition,
+			$this->pieConfig
+		);
+	}
+}
diff --git a/plugins/ImageGraph/StaticGraph/Evolution.php b/plugins/ImageGraph/StaticGraph/Evolution.php
new file mode 100644
index 0000000000..618a74e542
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph/Evolution.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ *
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+
+/**
+ *
+ * @package Piwik_ImageGraph
+ */
+class Piwik_ImageGraph_StaticGraph_Evolution extends Piwik_ImageGraph_StaticGraph_GridGraph
+{
+
+	public function renderGraph()
+	{
+		$this->initGridChart(
+			$displayVerticalGridLines = true,
+			$drawCircles = true,
+			$horizontalGraph = false,
+			$showTicks = true
+		);
+
+		$this->pImage->drawLineChart();
+	}
+}
diff --git a/plugins/ImageGraph/StaticGraph/Exception.php b/plugins/ImageGraph/StaticGraph/Exception.php
new file mode 100644
index 0000000000..1cb47212a1
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph/Exception.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ *
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+
+/**
+ *
+ * @package Piwik_ImageGraph
+ */
+class Piwik_ImageGraph_StaticGraph_Exception extends Piwik_ImageGraph_StaticGraph
+{
+	private $exception;
+
+	public function setException($exception)
+	{
+		$this->exception = $exception;
+	}
+
+	protected function getDefaultColors()
+	{
+		return array();
+	}
+
+	public function renderGraph()
+	{
+		$this->pData = new pData();
+		$this->initpImage();
+
+		$message = $this->exception->getMessage();
+		$messageWidthHeight = $this->getTextWidthHeight($message, false);
+
+		$this->pImage->drawText(
+			0,
+			$messageWidthHeight[self::HEIGHT_KEY],
+			$message
+		);
+	}
+}
diff --git a/plugins/ImageGraph/StaticGraph/GridGraph.php b/plugins/ImageGraph/StaticGraph/GridGraph.php
new file mode 100644
index 0000000000..2bf59394b7
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph/GridGraph.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ *
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+
+/**
+ *
+ * @package Piwik_ImageGraph
+ */
+abstract class Piwik_ImageGraph_StaticGraph_GridGraph extends Piwik_ImageGraph_StaticGraph
+{
+	const GRAPHIC_COLOR_KEY = 'GRAPHIC_COLOR';
+	const DEFAULT_GRAPHIC_COLOR = '5170AE';
+	const VALUE_COLOR_KEY = 'VALUE_COLOR';
+	const DEFAULT_VALUE_COLOR = '444444';
+	const GRID_COLOR_KEY = 'GRID_COLOR';
+	const DEFAULT_GRID_COLOR = 'CCCCCC';
+
+	const LEFT_GRID_MARGIN = 4;
+	const BOTTOM_GRID_MARGIN = 10;
+	const DEFAULT_TICK_ALPHA = 20;
+	const DEFAULT_SERIE_WEIGHT = 0.5;
+	const TOP_GRID_MARGIN_HORIZONTAL_GRAPH = 1;
+	const RIGHT_GRID_MARGIN_HORIZONTAL_GRAPH = 5;
+	const LEGEND_LEFT_MARGIN = 15;
+	const LEGEND_TOP_MARGIN = 3;
+	const OUTER_TICK_WIDTH = 5;
+	const INNER_TICK_WIDTH = 0;
+	const LABEL_SPACE_VERTICAL_GRAPH = 10;
+
+	protected function getDefaultColors()
+	{
+		return array(
+			self::GRAPHIC_COLOR_KEY => self::DEFAULT_GRAPHIC_COLOR,
+			self::VALUE_COLOR_KEY => self::DEFAULT_VALUE_COLOR,
+			self::GRID_COLOR_KEY => self::DEFAULT_GRID_COLOR,
+		);
+	}
+
+	protected function initGridChart(
+		$displayVerticalGridLines,
+		$drawCircles,
+		$horizontalGraph,
+		$showTicks
+	)
+	{
+		$this->initpData();
+
+		$this->pData->setSerieWeight($this->metricTitle, self::DEFAULT_SERIE_WEIGHT);
+		$graphicColor = $this->colors[self::GRAPHIC_COLOR_KEY];
+		$this->pData->setPalette($this->metricTitle, $graphicColor);
+
+		$this->initpImage();
+
+		// graph area coordinates
+		$topLeftXValue = $this->getGridLeftMargin($horizontalGraph, $withLabel = true);
+		$topLeftYValue = $this->getGridTopMargin($horizontalGraph);
+		$bottomRightXValue = $this->width - $this->getGridRightMargin($horizontalGraph);
+		$bottomRightYValue = $this->getGraphBottom();
+
+		$this->pImage->setGraphArea(
+			$topLeftXValue,
+			$topLeftYValue,
+			$bottomRightXValue,
+			$bottomRightYValue
+		);
+
+		// determine how many labels need to be skipped
+		$skippedLabels = 0;
+		if(!$horizontalGraph)
+		{
+			$abscissaMaxWidthHeight = $this->maxWidthHeight($this->abscissaSerie);
+			$abscissaMaxWidth = $abscissaMaxWidthHeight[self::WIDTH_KEY];
+			$graphWidth = $bottomRightXValue - $topLeftXValue;
+			$maxNumOfLabels = floor($graphWidth / ($abscissaMaxWidth + self::LABEL_SPACE_VERTICAL_GRAPH));
+
+			$abscissaSerieCount = count($this->abscissaSerie);
+			if($maxNumOfLabels < $abscissaSerieCount)
+			{
+				for($candidateSkippedLabels = 1 ; $candidateSkippedLabels < $abscissaSerieCount; $candidateSkippedLabels++)
+				{
+					$numberOfSegments = $abscissaSerieCount / ($candidateSkippedLabels + 1);
+					$numberOfCompleteSegments = floor($numberOfSegments);
+
+					$numberOfLabels = $numberOfCompleteSegments;
+					if($numberOfSegments > $numberOfCompleteSegments)
+					{
+						$numberOfLabels++;
+					}
+
+					if($numberOfLabels <= $maxNumOfLabels )
+					{
+						$skippedLabels = $candidateSkippedLabels;
+						break;
+					}
+				}
+			}
+		}
+
+		$ordinateAxisLength = $horizontalGraph ? $bottomRightXValue - $topLeftXValue : $this->getGraphHeight($horizontalGraph);
+
+		$maxOrdinateValue = $this->pData->getMax($this->metricTitle);
+
+		$gridColor = $this->colors[self::GRID_COLOR_KEY];
+
+		$this->pImage->drawScale(
+			array(
+				 'Mode' => SCALE_MODE_MANUAL,
+				 'GridTicks' => 0,
+				 'LabelSkip' => $skippedLabels,
+				 'DrawXLines' => $displayVerticalGridLines,
+				 'Factors' => array(ceil($maxOrdinateValue / 2)),
+				 'MinDivHeight' => $ordinateAxisLength / 2,
+				 'AxisAlpha' => 0,
+				 'SkippedAxisAlpha' => 0,
+				 'TickAlpha' => $showTicks ? self::DEFAULT_TICK_ALPHA : 0,
+				 'InnerTickWidth' => self::INNER_TICK_WIDTH,
+				 'OuterTickWidth' => self::OUTER_TICK_WIDTH,
+				 'GridR' => $gridColor['R'],
+				 'GridG' => $gridColor['G'],
+				 'GridB' => $gridColor['B'],
+				 'GridAlpha' => 100,
+				 'ManualScale' => array(
+					 0 => array(
+						 'Min' => 0,
+						 'Max' => $maxOrdinateValue
+					 )
+				 ),
+				 'Pos' => $horizontalGraph ? SCALE_POS_TOPBOTTOM : SCALE_POS_LEFTRIGHT,
+			)
+		);
+
+		if($this->showMetricTitle)
+		{
+			$this->pImage->drawLegend(
+				$topLeftXValue + self::LEGEND_LEFT_MARGIN,
+				self::LEGEND_TOP_MARGIN,
+				array(
+					 'Style' => LEGEND_NOBORDER,
+					 'FontR' => $graphicColor['R'],
+					 'FontG' => $graphicColor['G'],
+					 'FontB' => $graphicColor['B'],
+				)
+			);
+		}
+
+		if($drawCircles)
+		{
+			$this->pImage->drawPlotChart();
+		}
+	}
+
+	protected function getGridLeftMargin($horizontalGraph, $withLabel)
+	{
+		$gridLeftMargin = self::LEFT_GRID_MARGIN + self::OUTER_TICK_WIDTH;
+
+		if($withLabel)
+		{
+			$maxWidthHeight = $this->maxWidthHeight($horizontalGraph ? $this->abscissaSerie : $this->ordinateSerie);
+			$gridLeftMargin += $maxWidthHeight[self::WIDTH_KEY];
+		}
+
+		return $gridLeftMargin;
+	}
+
+	protected function getGridTopMargin($horizontalGraph)
+	{
+		$ordinateMaxWidthHeight = $this->maxWidthHeight($this->ordinateSerie);
+		$ordinateMaxHeight = $ordinateMaxWidthHeight[self::HEIGHT_KEY];
+
+		if($horizontalGraph)
+		{
+			$topMargin = $ordinateMaxHeight + self::TOP_GRID_MARGIN_HORIZONTAL_GRAPH + self::OUTER_TICK_WIDTH;
+		}
+		else
+		{
+			$topMargin = $ordinateMaxHeight / 2;
+		}
+
+		if($this->showMetricTitle)
+		{
+			$metricTitleWidthHeight = $this->getTextWidthHeight($this->metricTitle);
+			$topMargin += $metricTitleWidthHeight[self::HEIGHT_KEY];
+		}
+
+		return $topMargin;
+	}
+
+	protected function getGraphHeight($horizontalGraph)
+	{
+		return $this->getGraphBottom() - $this->getGridTopMargin($horizontalGraph);
+	}
+
+	private function getGridBottomMargin()
+	{
+		$abscissaMaxWidthHeight = $this->maxWidthHeight($this->abscissaSerie);
+		return $abscissaMaxWidthHeight[self::HEIGHT_KEY] + self::BOTTOM_GRID_MARGIN;
+	}
+
+	protected function getGridRightMargin($horizontalGraph)
+	{
+		if($horizontalGraph)
+		{
+			$ordinateMaxWidthHeight = $this->maxWidthHeight($this->ordinateSerie);
+			return self::RIGHT_GRID_MARGIN_HORIZONTAL_GRAPH + $ordinateMaxWidthHeight[self::WIDTH_KEY];
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	protected function getGraphBottom()
+	{
+		return $this->height - $this->getGridBottomMargin();
+	}
+}
+\ No newline at end of file
diff --git a/plugins/ImageGraph/StaticGraph/HorizontalBar.php b/plugins/ImageGraph/StaticGraph/HorizontalBar.php
new file mode 100644
index 0000000000..2f7dc01a72
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph/HorizontalBar.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ *
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+
+/**
+ *
+ * @package Piwik_ImageGraph
+ */
+class Piwik_ImageGraph_StaticGraph_HorizontalBar extends Piwik_ImageGraph_StaticGraph_GridGraph
+{
+	const INTERLEAVE = 0.30;
+	const MIN_GRAPH_SIZE = 80;
+	const TRUNCATION_TEXT = '...';
+	const PADDING_CHARS = '  ';
+	const LEGEND_SQUARE_WIDTH = 11;
+
+	public function renderGraph()
+	{
+		// determine the maximum logo width & height
+		$maxLogoWidth = 0;
+		$maxLogoHeight = 0;
+		foreach($this->ordinateLogos as $logoPath)
+		{
+			$absoluteLogoPath = self::getAbsoluteLogoPath($logoPath);
+			$logoWidthHeight = self::getLogoWidthHeight($absoluteLogoPath);
+			$logoWidth = $logoWidthHeight[self::WIDTH_KEY];
+			$logoHeight = $logoWidthHeight[self::HEIGHT_KEY];
+
+			if($logoWidth > $maxLogoWidth)
+			{
+				$maxLogoWidth = $logoWidth;
+			}
+
+			if($logoHeight > $maxLogoHeight)
+			{
+				$maxLogoHeight = $logoHeight;
+			}
+		}
+
+		// truncate report
+		$graphHeight = $this->getGraphBottom() - $this->getGridTopMargin($horizontalGraph = true);
+		$abscissaMaxWidthHeight = $this->maxWidthHeight($this->abscissaSerie);
+		$abscissaMaxHeight = $abscissaMaxWidthHeight[self::HEIGHT_KEY];
+		$maxLineWidth = $abscissaMaxHeight > $maxLogoHeight ? $abscissaMaxHeight : $maxLogoHeight;
+		$maxNumOfValues = floor($graphHeight / $maxLineWidth);
+		$abscissaSerieCount = count($this->abscissaSerie);
+		
+		if($maxNumOfValues < $abscissaSerieCount - 1)
+		{
+			$truncatedOrdinateSerie = array();
+			$truncatedOrdinateLogos = array();
+			$truncatedAbscissaSerie = array();
+
+			$i = 0;
+			for(; $i < $maxNumOfValues; $i++)
+			{
+				$truncatedOrdinateSerie[] = $this->ordinateSerie[$i];
+				$truncatedOrdinateLogos[] = isset($this->ordinateLogos[$i]) ? $this->ordinateLogos[$i] : null;
+				$truncatedAbscissaSerie[] = $this->abscissaSerie[$i];
+			}
+
+			$sumOfOthers = 0;
+			for(; $i < $abscissaSerieCount; $i++)
+			{
+				$sumOfOthers += $this->ordinateSerie[$i];
+			}
+			$truncatedOrdinateSerie[] = $sumOfOthers;
+			$truncatedAbscissaSerie[] = Piwik_Translate('General_Others');
+			$this->ordinateSerie = $truncatedOrdinateSerie;
+			$this->ordinateLogos = $truncatedOrdinateLogos;
+			$this->abscissaSerie = $truncatedAbscissaSerie;
+		}
+
+		// blank characters are used to pad labels so the logo can be displayed
+		$blankCharWidthHeight = $this->getTextWidthHeight(self::PADDING_CHARS);
+		$blankCharWidth = $blankCharWidthHeight[self::WIDTH_KEY];
+		$numOfPaddingBlankChar = ceil($maxLogoWidth / $blankCharWidth);
+
+		$paddingText = '';
+		for($i = 0 ; $i < $numOfPaddingBlankChar ; $i++)
+		{
+			$paddingText .= self::PADDING_CHARS;
+		}
+
+		$paddingWidth = 0;
+		if($numOfPaddingBlankChar > 0)
+		{
+			$paddingWidthHeight = $this->getTextWidthHeight($paddingText);
+			$paddingWidth = $paddingWidthHeight[self::WIDTH_KEY];
+		}
+
+		// determine the maximum label width according to the minimum comfortable graph size
+		$minGraphSize = self::MIN_GRAPH_SIZE;
+		
+		$metricTitleWidthHeight = $this->getTextWidthHeight($this->metricTitle);
+		$legendWidth = $metricTitleWidthHeight[self::WIDTH_KEY] + self::LEGEND_LEFT_MARGIN + self::LEGEND_SQUARE_WIDTH;
+		if($this->showMetricTitle)
+		{
+			if($legendWidth > $minGraphSize)
+			{
+				$minGraphSize = $legendWidth;
+			}
+		}
+
+		$gridLeftMarginWithoutLabels = $this->getGridLeftMargin($horizontalGraph = true, $withLabel = false);
+		$gridRightMargin = $this->getGridRightMargin($horizontalGraph = true);
+		$labelWidthLimit =
+				$this->width
+				- $gridLeftMarginWithoutLabels
+				- $gridRightMargin
+				- $paddingWidth
+				- $minGraphSize;
+
+		// truncate labels if needed
+		$truncationTextWidthHeight = $this->getTextWidthHeight(self::TRUNCATION_TEXT);
+		$truncationTextWidth = $truncationTextWidthHeight[self::WIDTH_KEY];
+		foreach($this->abscissaSerie as &$label)
+		{
+			$labelWidthHeight = $this->getTextWidthHeight($label);
+			$labelWidth = $labelWidthHeight[self::WIDTH_KEY];
+			if($labelWidth > $labelWidthLimit)
+			{
+				$averageCharWidth = $labelWidth / strlen($label);
+				$charsToKeep = floor(($labelWidthLimit - $truncationTextWidth) / $averageCharWidth);
+				$label = substr($label, 0, $charsToKeep) . self::TRUNCATION_TEXT;
+			}
+		}
+
+		$gridLeftMarginBeforePadding = $this->getGridLeftMargin($horizontalGraph = true, $withLabel = true);
+
+		// pad labels for logo space
+		foreach($this->abscissaSerie as &$label)
+		{
+			$label .= $paddingText;
+		}
+
+		$this->initGridChart(
+			$displayVerticalGridLines = false,
+			$drawCircles = false,
+			$horizontalGraph = true,
+			$showTicks = false
+		);
+
+		$valueColor = $this->colors[self::VALUE_COLOR_KEY];
+		$this->pImage->drawBarChart(
+			array(
+				'DisplayValues' => true,
+				'Interleave' => self::INTERLEAVE,
+				'DisplayR' => $valueColor['R'],
+				'DisplayG' => $valueColor['G'],
+				'DisplayB' => $valueColor['B'],
+			)
+		);
+
+		// display icons
+		$graphData = $this->pData->getData();
+		$sizeOfOrdinateSerie = sizeof($this->ordinateSerie);
+		$logoInterleave = $this->getGraphHeight(true) / $sizeOfOrdinateSerie;
+		for($i = 0; $i < $sizeOfOrdinateSerie; $i++)
+		{
+			if(isset($this->ordinateLogos[$i]))
+			{
+				$logoPath = $this->ordinateLogos[$i];
+				$absoluteLogoPath = self::getAbsoluteLogoPath($logoPath);
+
+				$logoWidthHeight = self::getLogoWidthHeight($absoluteLogoPath);
+
+				$pathInfo = pathinfo($logoPath);
+				$logoExtension = strtoupper($pathInfo['extension']);
+				$drawingFunction = 'drawFrom' . $logoExtension;
+
+				$logoYPosition =
+						($logoInterleave * $i)
+						+ $this->getGridTopMargin(true)
+						+ $graphData['Axis'][1]['Margin']
+						- $logoWidthHeight[self::HEIGHT_KEY] / 2
+						+ 1;
+
+				$this->pImage->$drawingFunction(
+					$gridLeftMarginBeforePadding,
+					$logoYPosition,
+					$absoluteLogoPath
+				);
+			}
+		}
+	}
+
+	private static function getAbsoluteLogoPath($relativeLogoPath)
+	{
+		return PIWIK_INCLUDE_PATH . '/' . $relativeLogoPath;
+	}
+
+	private static function getLogoWidthHeight($logoPath)
+	{
+		$pathInfo = getimagesize($logoPath);
+		return array(
+			self::WIDTH_KEY => $pathInfo[0],
+			self::HEIGHT_KEY => $pathInfo[1]
+		);
+	}
+}
diff --git a/plugins/ImageGraph/StaticGraph/Pie.php b/plugins/ImageGraph/StaticGraph/Pie.php
new file mode 100644
index 0000000000..488136b433
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph/Pie.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ *
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+/**
+ *
+ * @package Piwik_ImageGraph
+ */
+class Piwik_ImageGraph_StaticGraph_Pie extends Piwik_ImageGraph_StaticGraph_PieGraph
+{
+	public function renderGraph()
+	{
+		$this->initPieGraph(false);
+
+		$this->pieChart->draw2DPie(
+			$this->xPosition,
+			$this->yPosition,
+			$this->pieConfig
+		);
+	}
+}
diff --git a/plugins/ImageGraph/StaticGraph/PieGraph.php b/plugins/ImageGraph/StaticGraph/PieGraph.php
new file mode 100644
index 0000000000..5734dc7435
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph/PieGraph.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ *
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pPie.class.php";
+
+/**
+ *
+ * @package Piwik_ImageGraph
+ */
+abstract class Piwik_ImageGraph_StaticGraph_PieGraph extends Piwik_ImageGraph_StaticGraph
+{
+	const RADIUS_MARGIN = 40;
+	const PIE_RIGHT_MARGIN = 20;
+	const SECTOR_GAP = 2.5;
+
+	protected $pieChart;
+	protected $xPosition;
+	protected $yPosition;
+	protected $pieConfig;
+
+	static private $DEFAULT_SLICE_COLORS = array(
+		'SLICE_1' => '3C5A69',
+		'SLICE_2' => '679BB5',
+		'SLICE_3' => '695A3C',
+		'SLICE_4' => 'B58E67',
+		'SLICE_5' => '8AA68A',
+		'SLICE_6' => 'A4D2A6'
+	);
+
+	protected function getDefaultColors()
+	{
+		return self::$DEFAULT_SLICE_COLORS;
+	}
+
+	protected function initPieGraph($showLegend)
+	{
+		$this->truncateSmallValues();
+		$this->initpData();
+		$this->initpImage();
+
+		if ($this->height > $this->width)
+		{
+			$radius = ($this->width / 2) - self::RADIUS_MARGIN;
+		}
+		else
+		{
+			$radius = ($this->height / 2) - self::RADIUS_MARGIN;
+		}
+
+		$this->pieChart = new pPie($this->pImage, $this->pData);
+
+		$i = 0;
+		foreach($this->colors as $color)
+		{
+			$this->pieChart->setSliceColor($i, $color);
+			$i++;
+		}
+
+		// max abscissa label width is used to set the pie right margin
+		$abscissaMaxWidthHeight = $this->maxWidthHeight($this->abscissaSerie);
+		$maxAbscissaLabelWidth = $abscissaMaxWidthHeight[self::WIDTH_KEY];
+
+		$this->xPosition = $this->width - $radius - $maxAbscissaLabelWidth - self::PIE_RIGHT_MARGIN;
+		$this->yPosition = $this->height / 2;
+
+		if ($showLegend)
+		{
+			$this->pieChart->drawPieLegend(15, 40, array("Alpha" => 20));
+		}
+
+		$this->pieConfig =
+				array(
+					'Radius' => $radius,
+					'DrawLabels' => true,
+					'DataGapAngle' => self::SECTOR_GAP,
+					'DataGapRadius' => self::SECTOR_GAP,
+				);
+	}
+
+	/**
+	 * this method logic is close to Piwik's core filter_truncate.
+	 * it uses a threshold to determine if an abscissa value should be drawn on the PIE
+	 * discarded abscissa values are summed in the 'other' abscissa value
+	 *
+	 * if this process is not perform, pChart will draw pie slices that are too small to see
+	 */
+	private function truncateSmallValues()
+	{
+		$ordinateValuesSum = 0;
+		foreach($this->ordinateSerie as $ordinateValue)
+		{
+			$ordinateValuesSum += $ordinateValue;
+		}
+
+		$ordinateValuesCount = count($this->ordinateSerie);
+		$truncatedOrdinateSerie = array();
+		$truncatedAbscissaSerie = array();
+		$smallValuesSum = 0;
+		for($i = 0; $i < $ordinateValuesCount - 1 ; $i++)
+		{
+			$ordinateValue = $this->ordinateSerie[$i];
+			if($ordinateValue / $ordinateValuesSum > 0.01)
+			{
+				$truncatedOrdinateSerie[] = $ordinateValue;
+				$truncatedAbscissaSerie[] = $this->abscissaSerie[$i];
+			}
+			else
+			{
+				$smallValuesSum += $ordinateValue;
+			}
+		}
+
+		$smallValuesSum += $this->ordinateSerie[$ordinateValuesCount - 1];
+		if(($smallValuesSum / $ordinateValuesSum) > 0.01)
+		{
+			$truncatedOrdinateSerie[] = $smallValuesSum;
+			$truncatedAbscissaSerie[] = $this->abscissaSerie[$ordinateValuesCount - 1];
+		}
+
+		$this->ordinateSerie = $truncatedOrdinateSerie;
+		$this->abscissaSerie = $truncatedAbscissaSerie;
+	}
+}
diff --git a/plugins/ImageGraph/StaticGraph/VerticalBar.php b/plugins/ImageGraph/StaticGraph/VerticalBar.php
new file mode 100644
index 0000000000..50eb00425d
--- /dev/null
+++ b/plugins/ImageGraph/StaticGraph/VerticalBar.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Piwik - Open source web analytics
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ * @version $Id$
+ *
+ * @category Piwik_Plugins
+ * @package Piwik_ImageGraph
+ */
+
+
+/**
+ *
+ * @package Piwik_ImageGraph
+ */
+class Piwik_ImageGraph_StaticGraph_VerticalBar extends Piwik_ImageGraph_StaticGraph_GridGraph
+{
+	const INTERLEAVE = 0.10;
+
+	public function renderGraph()
+	{
+		$this->initGridChart(
+			$displayVerticalGridLines = false, 
+			$drawCircles = false,
+			$horizontalGraph = false,
+			$showTicks = true
+		);
+
+		$this->pImage->drawBarChart(
+			array(
+				 'Interleave' => self::INTERLEAVE,
+			)
+		);
+	}
+}
diff --git a/plugins/ImageGraph/fonts/tahoma.ttf b/plugins/ImageGraph/fonts/tahoma.ttf
new file mode 100644
index 0000000000..ca5ab1b904
--- /dev/null
+++ b/plugins/ImageGraph/fonts/tahoma.ttf
diff --git a/plugins/ImageGraph/templates/debug_graphs_all_sizes.tpl b/plugins/ImageGraph/templates/debug_graphs_all_sizes.tpl
index a4a4c2950a..67e04750f1 100644
--- a/plugins/ImageGraph/templates/debug_graphs_all_sizes.tpl
+++ b/plugins/ImageGraph/templates/debug_graphs_all_sizes.tpl
@@ -23,21 +23,25 @@
 						{/foreach}
 					</tr>
 					{foreach from=$availableReports item=report name=i}
-					<tr>
-						<td>{$report.category|escape:"html"}</td>
-						<td>{$report.name|escape:"html"}</td>
-						{foreach from=$graphTypes item=type}
-							<td>
-							<h2>Graph {$type} for all supported sizes</h2>
-							{foreach from=$graphSizes item=sizes}
-								<p>{$sizes.0} x {$sizes.1} {if !empty($sizes.2)} (scaled down to {$sizes.3} x {$sizes.4}){/if}</p>
-								<!-- <iframe width="{if !empty($sizes.3)}{$sizes.3+16}{else}{$sizes.0+16}{/if}" height="{if !empty($sizes.4)}{$sizes.4+16}{else}{$sizes.1+16}{/if}" src="?module=API&method=ImageGraph.get&idSite={$idSite}&period={$period}&date={$rawDate}&apiModule={$report.module}&apiAction={$report.action}&format=xml&token_auth={$token_auth}&graphType={$type}&width={$sizes.0}&height={$sizes.1}{if !empty($sizes.2)}&fontSize={$sizes.2}{/if}" {if !empty($sizes.3)}width={$sizes.3}{/if}  {if !empty($sizes.4)}height={$sizes.4}{/if}></iframe> --> 
-								<!-- <iframe width="{if !empty($sizes.3)}{$sizes.3+16}{else}{$sizes.0+16}{/if}" height="{if !empty($sizes.4)}{$sizes.4+16}{else}{$sizes.1+16}{/if}" src="?module=API&method=ImageGraph.get&idSite={$idSite}&period={$period}&date={$rawDate}&apiModule={$report.module}&apiAction={$report.action}&format=xml&token_auth={$token_auth}&graphType={$type}&width={$sizes.0}&height={$sizes.1}{if !empty($sizes.2)}&fontSize={$sizes.2}{/if}" {if !empty($sizes.3)}width={$sizes.3}{/if}  {if !empty($sizes.4)}height={$sizes.4}{/if}></iframe> --> 
-								<img src="?module=API&method=ImageGraph.get&idSite={$idSite}&period={$period}&date={$rawDate}&apiModule={$report.module}&apiAction={$report.action}&format=xml&token_auth={$token_auth}&graphType={$type}&width={$sizes.0}&height={$sizes.1}{if !empty($sizes.2)}&fontSize={$sizes.2}{/if}" {if !empty($sizes.3)}width={$sizes.3}{/if}  {if !empty($sizes.4)}height={$sizes.4}{/if} />
-							{/foreach}
-							</td>
-						{/foreach}
-					</tr>
+						{if isset($report.imageGraphUrl)}
+							<tr>
+								<td>{$report.category|escape:"html"}</td>
+								<td>{$report.name|escape:"html"}</td>
+								{foreach from=$graphTypes item=type}
+									<td>
+									<h2>Graph {$type} for all supported sizes</h2>
+									{foreach from=$graphSizes item=sizes}
+										<p>{$sizes.0} x {$sizes.1} {if !empty($sizes.2)} (scaled down to {$sizes.3} x {$sizes.4}){/if}</p>
+										<img
+												src="{$report.imageGraphUrl}&graphType={$type}&width={$sizes.0}&height={$sizes.1}{if !empty($sizes.2)}&fontSize={$sizes.2}{/if}"
+											{if !empty($sizes.3)}width={$sizes.3}{/if}
+											{if !empty($sizes.4)}height={$sizes.4}{/if}
+												/>
+									{/foreach}
+									</td>
+								{/foreach}
+							</tr>
+						{/if}
 					{/foreach}
 				</tbody>
 			</table>
diff --git a/plugins/PDFReports/API.php b/plugins/PDFReports/API.php
index 99a69cfe31..dc8587525e 100644
--- a/plugins/PDFReports/API.php
+++ b/plugins/PDFReports/API.php
@@ -332,7 +332,7 @@ class Piwik_PDFReports_API
 
 		$description = str_replace(array("\r", "\n"), ' ', $description);
 
-		// The report will be rendered with the first 30 rows and will aggregate other rows in a summary row
+		// The report will be rendered with the first 23 rows and will aggregate other rows in a summary row
 		$filterTruncateGET = Piwik_Common::getRequestVar('filter_truncate', false);
 		$_GET['filter_truncate'] = 23;
 
@@ -362,6 +362,7 @@ class Piwik_PDFReports_API
 										 $aggregateReportsFormat == Piwik_PDFReports::AGGREGATE_REPORTS_FORMAT_GRAPHS ||
 										 $aggregateReportsFormat == Piwik_PDFReports::AGGREGATE_REPORTS_FORMAT_TABLES_GRAPHS )
 										 && Piwik::isGdExtensionEnabled();
+
 			if ($report['displayGraph']
 				&& !empty($reportMetadata['imageGraphUrl']))
 			{
@@ -369,6 +370,7 @@ class Piwik_PDFReports_API
 					$reportMetadata['imageGraphUrl'] .
 					'&outputType='.Piwik_ImageGraph_API::GRAPH_OUTPUT_PHP.
 					'&format=original&serialize=0'.
+					'&filter_truncate='.
 					'&height='.Piwik_ReportRenderer::IMAGE_GRAPH_HEIGHT.
 					'&width='.Piwik_ReportRenderer::IMAGE_GRAPH_WIDTH
 				);
author	JulienMoumne <julien@piwik.org>	2011-12-20 21:50:45 +0400
committer	JulienMoumne <julien@piwik.org>	2011-12-20 21:50:45 +0400
commit	5e4cf7b3470a79be8f4ed1dd7d308d678af2a575 (patch)
tree	08032e5eed87093c635816c84145b9ae63423dab
parent	118b6b646b41be20b34760aa760b92321ba0a9e6 (diff)