Changeset 265 for trunk/client/modules/Elezioni/grafici/jpgraph.php

Timestamp:

Apr 13, 2019, 8:05:15 PM (6 years ago)

Author:

roby

Message:

 

File:

• trunk/client/modules/Elezioni/grafici/jpgraph.php (modified) (43 diffs)

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

@@ -1 +1 @@
 <?php
 //=======================================================================
-// File:        JPGRAPH.PHP
-// Description: PHP Graph Plotting library. Base module.
-// Created:     2001-01-08
-// Ver:         $Id: jpgraph.php 1091 2009-01-18 22:57:40Z ljp $
+// File:        JPGRAPH.PHP
+// Description: PHP Graph Plotting library. Base module.
+// Created:     2001-01-08
+// Ver:         $Id: jpgraph.php 1924 2010-01-11 14:03:26Z ljp $
 //
-// Copyright (c) Aditus Consulting. All rights reserved.
+// Copyright (c) Asial Corporation. All rights reserved.
 //========================================================================
 
@@ -16 +16 @@
 require_once('jpgraph_text.inc.php');
 require_once('jpgraph_legend.inc.php');
+require_once('jpgraph_theme.inc.php');
+require_once('gd_image.inc.php');
 
 // Version info
-define('JPG_VERSION','2.3.5-dev');
+define('JPG_VERSION','4.2.6');
 
 // Minimum required PHP version
 define('MIN_PHPVERSION','5.1.0');
 
-// Should the image be a truecolor image? 
-define('USE_TRUECOLOR',true);
-
-//------------------------------------------------------------------------
-// Automatic settings of path for cache and font directory
-// if they have not been previously specified
-//------------------------------------------------------------------------
-if(USE_CACHE) {
-    if (!defined('CACHE_DIR')) {
-        if ( strstr( PHP_OS, 'WIN') ) {
-            if( empty($_SERVER['TEMP']) ) {
-                $t = new ErrMsgText();
-                $msg = $t->Get(11,$file,$lineno);
-                die($msg);
-            }
-            else {
-                define('CACHE_DIR', $_SERVER['TEMP'] . '/');
-            }
-        } else {
-            define('CACHE_DIR','/tmp/jpgraph_cache/');
-        }
-    }
-}
-elseif( !defined('CACHE_DIR') ) {
-    define('CACHE_DIR', '');
-}
-
-if (!defined('TTF_DIR')) {
-    if (strstr( PHP_OS, 'WIN') ) {
-        $sroot = getenv('SystemRoot');
-        if( empty($sroot) ) {
-            $t = new ErrMsgText();
-            $msg = $t->Get(12,$file,$lineno);
-            die($msg);
-        }
-        else {
-          define('TTF_DIR', $sroot.'/fonts/');
-        }
-    } else {
-        define('TTF_DIR','/usr/share/fonts/truetype/');
-    }
-}
-
-if (!defined('MBTTF_DIR')) {
-    if (strstr( PHP_OS, 'WIN') ) {
-        $sroot = getenv('SystemRoot');
-        if( empty($sroot) ) {
-            $t = new ErrMsgText();
-            $msg = $t->Get(12,$file,$lineno);
-            die($msg);
-        }
-        else {
-          define('TTF_DIR', $sroot.'/fonts/');
-        }
-    } else {
-        define('MBTTF_DIR','/usr/share/fonts/ja/TrueType/');
-    }
-}
-
-//------------------------------------------------------------------
-// Constants which are used as parameters for the method calls
-//------------------------------------------------------------------
-
+// Special file name to indicate that we only want to calc
+// the image map in the call to Graph::Stroke() used
+// internally from the GetHTMLCSIM() method.
+define('_CSIM_SPECIALFILE','_csim_special_');
+
+// HTTP GET argument that is used with image map
+// to indicate to the script to just generate the image
+// and not the full CSIM HTML page.
+define('_CSIM_DISPLAY','_jpg_csimd');
+
+// Special filename for Graph::Stroke(). If this filename is given
+// then the image will NOT be streamed to browser of file. Instead the
+// Stroke call will return the handler for the created GD image.
+define('_IMG_HANDLER','__handle');
+
+// Special filename for Graph::Stroke(). If this filename is given
+// the image will be stroked to a file with a name based on the script name.
+define('_IMG_AUTO','auto');
 
 // Tick density
@@ -93 +50 @@
 define("TICKD_VERYSPARSE",4);
 
-// Side for ticks and labels. 
+// Side for ticks and labels.
 define("SIDE_LEFT",-1);
 define("SIDE_RIGHT",1);
@@ -156 +113 @@
 define("HORIZONTAL",0);
 
-
 // Axis styles for scientific style axis
 define('AXSTYLE_SIMPLE',1);
@@ -176 +132 @@
 define('TITLEBKG_FILLSTYLE_SOLID',3);
 
+// Styles for axis labels background
+define('LABELBKG_NONE',0);
+define('LABELBKG_XAXIS',1);
+define('LABELBKG_YAXIS',2);
+define('LABELBKG_XAXISFULL',3);
+define('LABELBKG_YAXISFULL',4);
+define('LABELBKG_XYFULL',5);
+define('LABELBKG_XY',6);
+
+
 // Style for background gradient fills
 define('BGRAD_FRAME',1);
@@ -191 +157 @@
 define('SKEW3D_RIGHT',3);
 
-// Line styles
-define('LINESTYLE_SOLID',1);
-define('LINESTYLE_DOTTED',2);
-define('LINESTYLE_DASHED',3);
-define('LINESTYLE_LONGDASH',4);
-
 // For internal use only
 define("_JPG_DEBUG",false);
@@ -202 +162 @@
 define("_FORCE_IMGDIR",'/tmp/jpgimg/');
 
-require_once('gd_image.inc.php');
-
-function CheckPHPVersion($aMinVersion)
-{
-    list($majorC, $minorC, $editC) = split('[/.-]', PHP_VERSION);
-    list($majorR, $minorR, $editR) = split('[/.-]', $aMinVersion);
-  
-    if ($majorC != $majorR) return false;
+
+//
+// Automatic settings of path for cache and font directory
+// if they have not been previously specified
+//
+if(USE_CACHE) {
+    if (!defined('CACHE_DIR')) {
+        if ( strstr( PHP_OS, 'WIN') ) {
+            if( empty($_SERVER['TEMP']) ) {
+                $t = new ErrMsgText();
+                $msg = $t->Get(11,$file,$lineno);
+                die($msg);
+            }
+            else {
+                define('CACHE_DIR', $_SERVER['TEMP'] . '/');
+            }
+        } else {
+            define('CACHE_DIR','/tmp/jpgraph_cache/');
+        }
+    }
+}
+elseif( !defined('CACHE_DIR') ) {
+    define('CACHE_DIR', '');
+}
+
+//
+// Setup path for western/latin TTF fonts
+//
+if (!defined('TTF_DIR')) {
+    if (strstr( PHP_OS, 'WIN') ) {
+        $sroot = getenv('SystemRoot');
+        if( empty($sroot) ) {
+            $t = new ErrMsgText();
+            $msg = $t->Get(12,$file,$lineno);
+            die($msg);
+        }
+        else {
+            define('TTF_DIR', $sroot.'/fonts/');
+        }
+    } else {
+        define('TTF_DIR','/usr/share/fonts/truetype/');
+    }
+}
+
+//
+// Setup path for MultiByte TTF fonts (japanese, chinese etc.)
+//
+if (!defined('MBTTF_DIR')) {
+    if (strstr( PHP_OS, 'WIN') ) {
+        $sroot = getenv('SystemRoot');
+        if( empty($sroot) ) {
+            $t = new ErrMsgText();
+            $msg = $t->Get(12,$file,$lineno);
+            die($msg);
+        }
+        else {
+            define('MBTTF_DIR', $sroot.'/fonts/');
+        }
+    } else {
+        define('MBTTF_DIR','/usr/share/fonts/truetype/');
+    }
+}
+
+//
+// Check minimum PHP version
+//
+function CheckPHPVersion($aMinVersion) {
+    list($majorC, $minorC, $editC) = preg_split('/[\/.-]/', PHP_VERSION);
+    list($majorR, $minorR, $editR) = preg_split('/[\/.-]/', $aMinVersion);
+
     if ($majorC < $majorR) return false;
-    // same major - check ninor
-    if ($minorC > $minorR) return true;
-    if ($minorC < $minorR) return false;
-    // and same minor
-    if ($editC  >= $editR)  return true;
+
+    if ($majorC == $majorR) {
+        if($minorC < $minorR) return false;
+
+        if($minorC == $minorR){
+            if($editC < $editR) return false;
+        }
+    }
+
     return true;
 }
@@ -227 +253 @@
 }
 
-
 //
 // Make GD sanity check
@@ -233 +258 @@
 if( !function_exists("imagetypes") || !function_exists('imagecreatefromstring') ) {
     JpGraphError::RaiseL(25001);
-//("This PHP installation is not configured with the GD library. Please recompile PHP with GD support to run JpGraph. (Neither function imagetypes() nor imagecreatefromstring() does exist)");
+    //("This PHP installation is not configured with the GD library. Please recompile PHP with GD support to run JpGraph. (Neither function imagetypes() nor imagecreatefromstring() does exist)");
 }
 
@@ -242 +267 @@
     // Respect current error level
     if( $errno & error_reporting() ) {
-        JpGraphError::RaiseL(25003,basename($filename),$linenum,$errmsg); 
+        JpGraphError::RaiseL(25003,basename($filename),$linenum,$errmsg);
     }
 }
@@ -251 +276 @@
 
 //
-//Check if there were any warnings, perhaps some wrong includes by the
-//user
+// Check if there were any warnings, perhaps some wrong includes by the user. In this
+// case we raise it immediately since otherwise the image will not show and makes
+// debugging difficult. This is controlled by the user setting CATCH_PHPERRMSG
 //
-if( isset($GLOBALS['php_errormsg']) && CATCH_PHPERRMSG && 
-    !preg_match('/|Deprecated|/i', $GLOBALS['php_errormsg']) ) {
+if( isset($GLOBALS['php_errormsg']) && CATCH_PHPERRMSG && !preg_match('/|Deprecated|/i', $GLOBALS['php_errormsg']) ) {
     JpGraphError::RaiseL(25004,$GLOBALS['php_errormsg']);
 }
 
-
 // Useful mathematical function
 function sign($a) {return $a >= 0 ? 1 : -1;}
 
+//
 // Utility function to generate an image name based on the filename we
 // are running from and assuming we use auto detection of graphic format
 // (top level), i.e it is safe to call this function
 // from a script that uses JpGraph
+//
 function GenImgName() {
     // Determine what format we should use when we save the images
     $supported = imagetypes();
-    if( $supported & IMG_PNG )     $img_format="png";
+    if( $supported & IMG_PNG )    $img_format="png";
     elseif( $supported & IMG_GIF ) $img_format="gif";
     elseif( $supported & IMG_JPG ) $img_format="jpeg";
@@ -277 +303 @@
 
 
-    if( !isset($_SERVER['PHP_SELF']) )
-        JpGraphError::RaiseL(25005);
-//(" Can't access PHP_SELF, PHP global variable. You can't run PHP from command line if you want to use the 'auto' naming of cache or image files.");
+    if( !isset($_SERVER['PHP_SELF']) ) {
+        JpGraphError::RaiseL(25005);
+        //(" Can't access PHP_SELF, PHP global variable. You can't run PHP from command line if you want to use the 'auto' naming of cache or image files.");
+    }
     $fname = basename($_SERVER['PHP_SELF']);
     if( !empty($_SERVER['QUERY_STRING']) ) {
-        $q = @$_SERVER['QUERY_STRING'];
-        $fname .= '_'.preg_replace("/\W/", "_", $q).'.'.$img_format;
+        $q = @$_SERVER['QUERY_STRING'];
+        $fname .= '_'.preg_replace("/\W/", "_", $q).'.'.$img_format;
     }
     else {
-        $fname = substr($fname,0,strlen($fname)-4).'.'.$img_format;
+        $fname = substr($fname,0,strlen($fname)-4).'.'.$img_format;
     }
     return $fname;
 }
-
 
 //===================================================
@@ -299 +325 @@
 //===================================================
 class JpgTimer {
-    private $start, $idx;       
-//---------------
-// CONSTRUCTOR
-    function JpgTimer() {
-        $this->idx=0;
-    }
-
-//---------------
-// PUBLIC METHODS       
+    private $start, $idx;
+
+    function __construct() {
+        $this->idx=0;
+    }
 
     // Push a new timer start on stack
     function Push() {
-        list($ms,$s)=explode(" ",microtime());  
-        $this->start[$this->idx++]=floor($ms*1000) + 1000*$s;   
+        list($ms,$s)=explode(" ",microtime());
+        $this->start[$this->idx++]=floor($ms*1000) + 1000*$s;
     }
 
@@ -318 +340 @@
     // current time
     function Pop() {
-        assert($this->idx>0);
-        list($ms,$s)=explode(" ",microtime());  
-        $etime=floor($ms*1000) + (1000*$s);
-        $this->idx--;
-        return $etime-$this->start[$this->idx];
+        assert($this->idx>0);
+        list($ms,$s)=explode(" ",microtime());
+        $etime=floor($ms*1000) + (1000*$s);
+        $this->idx--;
+        return $etime-$this->start[$this->idx];
     }
 } // Class
 
-$gJpgBrandTiming = BRAND_TIMING;
 //===================================================
 // CLASS DateLocale
@@ -332 +353 @@
 //===================================================
 class DateLocale {
- 
+
     public $iLocale = 'C'; // environmental locale be used by default
     private $iDayAbb = null, $iShortDay = null, $iShortMonth = null, $iMonthName = null;
 
-//---------------
-// CONSTRUCTOR  
-    function DateLocale() {
-        settype($this->iDayAbb, 'array');
-        settype($this->iShortDay, 'array');
-        settype($this->iShortMonth, 'array');
-        settype($this->iMonthName, 'array');
-
-
-        $this->Set('C');
-    }
-
-//---------------
-// PUBLIC METHODS       
+    function __construct() {
+        settype($this->iDayAbb, 'array');
+        settype($this->iShortDay, 'array');
+        settype($this->iShortMonth, 'array');
+        settype($this->iMonthName, 'array');
+        $this->Set('C');
+    }
+
     function Set($aLocale) {
-        if ( in_array($aLocale, array_keys($this->iDayAbb)) ){ 
-            $this->iLocale = $aLocale;
-            return TRUE;  // already cached nothing else to do!
-        }
-
-        $pLocale = setlocale(LC_TIME, 0); // get current locale for LC_TIME
-
-        if (is_array($aLocale)) {
-            foreach ($aLocale as $loc) {
-                $res = @setlocale(LC_TIME, $loc);
-                if ( $res ) {
-                    $aLocale = $loc;
-                    break;
-                }
-            }
-        }
-        else {
-            $res = @setlocale(LC_TIME, $aLocale);
-        }
-
-        if ( ! $res ){
-            JpGraphError::RaiseL(25007,$aLocale);
-//("You are trying to use the locale ($aLocale) which your PHP installation does not support. Hint: Use '' to indicate the default locale for this geographic region.");
-            return FALSE;
-        }
- 
-        $this->iLocale = $aLocale;
-        for ( $i = 0, $ofs = 0 - strftime('%w'); $i < 7; $i++, $ofs++ ){
-            $day = strftime('%a', strtotime("$ofs day"));
-            $day[0] = strtoupper($day[0]);
-            $this->iDayAbb[$aLocale][]= $day[0];
-            $this->iShortDay[$aLocale][]= $day;
-        }
-
-        for($i=1; $i<=12; ++$i) {
-            list($short ,$full) = explode('|', strftime("%b|%B",strtotime("2001-$i-01")));
-            $this->iShortMonth[$aLocale][] = ucfirst($short);
-            $this->iMonthName [$aLocale][] = ucfirst($full);
-        }
-                
-        setlocale(LC_TIME, $pLocale);
-
-        return TRUE;
+        if ( in_array($aLocale, array_keys($this->iDayAbb)) ){
+            $this->iLocale = $aLocale;
+            return TRUE;  // already cached nothing else to do!
+        }
+
+        $pLocale = setlocale(LC_TIME, 0); // get current locale for LC_TIME
+
+        if (is_array($aLocale)) {
+            foreach ($aLocale as $loc) {
+                $res = @setlocale(LC_TIME, $loc);
+                if ( $res ) {
+                    $aLocale = $loc;
+                    break;
+                }
+            }
+        }
+        else {
+            $res = @setlocale(LC_TIME, $aLocale);
+        }
+
+        if ( ! $res ) {
+            JpGraphError::RaiseL(25007,$aLocale);
+            //("You are trying to use the locale ($aLocale) which your PHP installation does not support. Hint: Use '' to indicate the default locale for this geographic region.");
+            return FALSE;
+        }
+
+        $this->iLocale = $aLocale;
+        for( $i = 0, $ofs = 0 - strftime('%w'); $i < 7; $i++, $ofs++ ) {
+            $day = strftime('%a', strtotime("$ofs day"));
+            $day[0] = strtoupper($day[0]);
+            $this->iDayAbb[$aLocale][]= $day[0];
+            $this->iShortDay[$aLocale][]= $day;
+        }
+
+        for($i=1; $i<=12; ++$i) {
+            list($short ,$full) = explode('|', strftime("%b|%B",strtotime("2001-$i-01")));
+            $this->iShortMonth[$aLocale][] = ucfirst($short);
+            $this->iMonthName [$aLocale][] = ucfirst($full);
+        }
+
+        setlocale(LC_TIME, $pLocale);
+
+        return TRUE;
     }
 
 
     function GetDayAbb() {
-        return $this->iDayAbb[$this->iLocale];
-    }
-        
+        return $this->iDayAbb[$this->iLocale];
+    }
+
     function GetShortDay() {
-        return $this->iShortDay[$this->iLocale];
+        return $this->iShortDay[$this->iLocale];
     }
 
     function GetShortMonth() {
-        return $this->iShortMonth[$this->iLocale];
-    }
-        
+        return $this->iShortMonth[$this->iLocale];
+    }
+
     function GetShortMonthName($aNbr) {
-        return $this->iShortMonth[$this->iLocale][$aNbr];
+        return $this->iShortMonth[$this->iLocale][$aNbr];
     }
 
     function GetLongMonthName($aNbr) {
-        return $this->iMonthName[$this->iLocale][$aNbr];
+        return $this->iMonthName[$this->iLocale][$aNbr];
     }
 
     function GetMonth() {
-        return $this->iMonthName[$this->iLocale];
+        return $this->iMonthName[$this->iLocale];
     }
 }
 
+// Global object handlers
 $gDateLocale = new DateLocale();
 $gJpgDateLocale = new DateLocale();
@@ -432 +448 @@
     public $iLeftMargin = 3, $iRightMargin = 3, $iBottomMargin = 3 ;
     public $left,$center,$right;
-
-    function Footer() {
-        $this->left = new Text();
-        $this->left->ParagraphAlign('left');
-        $this->center = new Text();
-        $this->center->ParagraphAlign('center');
-        $this->right = new Text();
-        $this->right->ParagraphAlign('right');
+    private $iTimer=null, $itimerpoststring='';
+
+    function __construct() {
+        $this->left = new Text();
+        $this->left->ParagraphAlign('left');
+        $this->center = new Text();
+        $this->center->ParagraphAlign('center');
+        $this->right = new Text();
+        $this->right->ParagraphAlign('right');
+    }
+
+    function SetTimer($aTimer,$aTimerPostString='') {
+        $this->iTimer = $aTimer;
+        $this->itimerpoststring = $aTimerPostString;
     }
 
     function SetMargin($aLeft=3,$aRight=3,$aBottom=3) {
-        $this->iLeftMargin = $aLeft;
-        $this->iRightMargin = $aRight;
-        $this->iBottomMargin = $aBottom;
+        $this->iLeftMargin = $aLeft;
+        $this->iRightMargin = $aRight;
+        $this->iBottomMargin = $aBottom;
     }
 
     function Stroke($aImg) {
-        $y = $aImg->height - $this->iBottomMargin;
-        $x = $this->iLeftMargin;
-        $this->left->Align('left','bottom');
-        $this->left->Stroke($aImg,$x,$y);
-
-        $x = ($aImg->width - $this->iLeftMargin - $this->iRightMargin)/2;
-        $this->center->Align('center','bottom');
-        $this->center->Stroke($aImg,$x,$y);
-
-        $x = $aImg->width - $this->iRightMargin;
-        $this->right->Align('right','bottom');
-        $this->right->Stroke($aImg,$x,$y);
+        $y = $aImg->height - $this->iBottomMargin;
+        $x = $this->iLeftMargin;
+        $this->left->Align('left','bottom');
+        $this->left->Stroke($aImg,$x,$y);
+
+        $x = ($aImg->width - $this->iLeftMargin - $this->iRightMargin)/2;
+        $this->center->Align('center','bottom');
+        $this->center->Stroke($aImg,$x,$y);
+
+        $x = $aImg->width - $this->iRightMargin;
+        $this->right->Align('right','bottom');
+        if( $this->iTimer != null ) {
+            $this->right->Set( $this->right->t . sprintf('%.3f',$this->iTimer->Pop()/1000.0) . $this->itimerpoststring );
+        }
+        $this->right->Stroke($aImg,$x,$y);
     }
 }
@@ -470 +495 @@
 //===================================================
 class Graph {
-    public $cache=null;                 // Cache object (singleton)
-    public $img=null;                   // Img object (singleton)
-    public $plots=array();              // Array of all plot object in the graph (for Y 1 axis)
-    public $y2plots=array();            // Array of all plot object in the graph (for Y 2 axis)
+    public $cache=null;   // Cache object (singleton)
+    public $img=null;   // Img object (singleton)
+    public $plots=array();  // Array of all plot object in the graph (for Y 1 axis)
+    public $y2plots=array();  // Array of all plot object in the graph (for Y 2 axis)
     public $ynplots=array();
-    public $xscale=null;                // X Scale object (could be instance of LinearScale or LogScale
+    public $xscale=null;  // X Scale object (could be instance of LinearScale or LogScale
     public $yscale=null,$y2scale=null, $ynscale=array();
-    public $iIcons = array();           // Array of Icons to add to 
-    public $cache_name;                 // File name to be used for the current graph in the cache directory
-    public $xgrid=null;                 // X Grid object (linear or logarithmic)
-    public $ygrid=null,$y2grid=null;    //dito for Y
-    public $doframe=true,$frame_color=array(0,0,0), $frame_weight=1;    // Frame around graph
-    public $boxed=false, $box_color=array(0,0,0), $box_weight=1;                // Box around plot area
-    public $doshadow=false,$shadow_width=4,$shadow_color=array(102,102,102);    // Shadow for graph
-    public $xaxis=null;                 // X-axis (instane of Axis class)
-    public $yaxis=null, $y2axis=null, $ynaxis=array();  // Y axis (instance of Axis class)
-    public $margin_color=array(200,200,200);    // Margin color of graph
-    public $plotarea_color=array(255,255,255);  // Plot area color
-    public $title,$subtitle,$subsubtitle;       // Title and subtitle(s) text object
-    public $axtype="linlin";            // Type of axis
-    public $xtick_factor,$ytick_factor; // Factor to determine the maximum number of ticks depending on the plot width
-    public $texts=null, $y2texts=null;  // Text object to ge shown in the graph
+    public $iIcons = array();  // Array of Icons to add to
+    public $cache_name;   // File name to be used for the current graph in the cache directory
+    public $xgrid=null;   // X Grid object (linear or logarithmic)
+    public $ygrid=null,$y2grid=null; //dito for Y
+    public $doframe,$frame_color, $frame_weight; // Frame around graph
+    public $boxed=false, $box_color='black', $box_weight=1;  // Box around plot area
+    public $doshadow=false,$shadow_width=4,$shadow_color='gray@0.5'; // Shadow for graph
+    public $xaxis=null;   // X-axis (instane of Axis class)
+    public $yaxis=null, $y2axis=null, $ynaxis=array(); // Y axis (instance of Axis class)
+    public $margin_color; // Margin color of graph
+    public $plotarea_color=array(255,255,255); // Plot area color
+    public $title,$subtitle,$subsubtitle;  // Title and subtitle(s) text object
+    public $axtype="linlin";  // Type of axis
+    public $xtick_factor,$ytick_factor; // Factor to determine the maximum number of ticks depending on the plot width
+    public $texts=null, $y2texts=null; // Text object to ge shown in the graph
     public $lines=null, $y2lines=null;
     public $bands=null, $y2bands=null;
-    public $text_scale_off=0, $text_scale_abscenteroff=-1;      // Text scale in fractions and for centering bars
-    public $background_image="",$background_image_type=-1,$background_image_format="png";
+    public $text_scale_off=0, $text_scale_abscenteroff=-1; // Text scale in fractions and for centering bars
+    public $background_image='',$background_image_type=-1,$background_image_format="png";
     public $background_image_bright=0,$background_image_contr=0,$background_image_sat=0;
     public $background_image_xpos=0,$background_image_ypos=0;
@@ -501 +526 @@
     public $inline;
     public $showcsim=0,$csimcolor="red";//debug stuff, draw the csim boundaris on the image if <>0
-    public $grid_depth=DEPTH_BACK;      // Draw grid under all plots as default
+    public $grid_depth=DEPTH_BACK; // Draw grid under all plots as default
     public $iAxisStyle = AXSTYLE_SIMPLE;
     public $iCSIMdisplay=false,$iHasStroked = false;
@@ -511 +536 @@
     public $bkg_gradtype=-1,$bkg_gradstyle=BGRAD_MARGIN;
     public $bkg_gradfrom='navy', $bkg_gradto='silver';
+    public $plot_gradtype=-1,$plot_gradstyle=BGRAD_MARGIN;
+    public $plot_gradfrom='silver', $plot_gradto='navy';
+
     public $titlebackground = false;
     public $titlebackground_color = 'lightblue',
-        $titlebackground_style = 1,
-        $titlebackground_framecolor = 'blue',
-        $titlebackground_framestyle = 2,
-        $titlebackground_frameweight = 1,
-        $titlebackground_bevelheight = 3 ;
+           $titlebackground_style = 1,
+           $titlebackground_framecolor,
+           $titlebackground_framestyle,
+           $titlebackground_frameweight,
+           $titlebackground_bevelheight;
     public $titlebkg_fillstyle=TITLEBKG_FILLSTYLE_SOLID;
     public $titlebkg_scolor1='black',$titlebkg_scolor2='white';
-    public $framebevel = false, $framebeveldepth = 2 ;
-    public $framebevelborder = false, $framebevelbordercolor='black';
-    public $framebevelcolor1='white@0.4', $framebevelcolor2='black@0.4';
+    public $framebevel, $framebeveldepth;
+    public $framebevelborder, $framebevelbordercolor;
+    public $framebevelcolor1, $framebevelcolor2;
     public $background_image_mix=100;
     public $background_cflag = '';
@@ -528 +556 @@
     public $background_cflag_mix = 100;
     public $iImgTrans=false,
-        $iImgTransHorizon = 100,$iImgTransSkewDist=150,
-        $iImgTransDirection = 1, $iImgTransMinSize = true,
-        $iImgTransFillColor='white',$iImgTransHighQ=false,
-        $iImgTransBorder=false,$iImgTransHorizonPos=0.5;
+           $iImgTransHorizon = 100,$iImgTransSkewDist=150,
+           $iImgTransDirection = 1, $iImgTransMinSize = true,
+           $iImgTransFillColor='white',$iImgTransHighQ=false,
+           $iImgTransBorder=false,$iImgTransHorizonPos=0.5;
     public $legend;
+    public $graph_theme;
     protected $iYAxisDeltaPos=50;
     protected $iIconDepth=DEPTH_BACK;
     protected $iAxisLblBgType = 0,
-        $iXAxisLblBgFillColor = 'lightgray', $iXAxisLblBgColor = 'black',
-        $iYAxisLblBgFillColor = 'lightgray', $iYAxisLblBgColor = 'black';
+              $iXAxisLblBgFillColor = 'lightgray', $iXAxisLblBgColor = 'black',
+              $iYAxisLblBgFillColor = 'lightgray', $iYAxisLblBgColor = 'black';
     protected $iTables=NULL;
 
-//---------------
-// CONSTRUCTOR
-
-    // aWIdth           Width in pixels of image
-    // aHeight          Height in pixels of image
-    // aCachedName      Name for image file in cache directory 
-    // aTimeOut         Timeout in minutes for image in cache
-    // aInline          If true the image is streamed back in the call to Stroke()
-    //                  If false the image is just created in the cache
-    function Graph($aWidth=300,$aHeight=200,$aCachedName="",$aTimeOut=0,$aInline=true) {
-        GLOBAL $gJpgBrandTiming;
-        // If timing is used create a new timing object
-        if( $gJpgBrandTiming ) {
-            global $tim;
-            $tim = new JpgTimer();
-            $tim->Push();
-        }
-
-        if( !is_numeric($aWidth) || !is_numeric($aHeight) ) {
-            JpGraphError::RaiseL(25008);//('Image width/height argument in Graph::Graph() must be numeric');
-        }               
-
-        // Automatically generate the image file name based on the name of the script that
-        // generates the graph
-        if( $aCachedName=="auto" )
-            $aCachedName=GenImgName();
-                        
-        // Should the image be streamed back to the browser or only to the cache?
-        $this->inline=$aInline;
-                
-        $this->img      = new RotImage($aWidth,$aHeight);
-
-        $this->cache    = new ImgStreamCache($this->img);
-        $this->cache->SetTimeOut($aTimeOut);
-
-        $this->title = new Text();
-        $this->title->ParagraphAlign('center');
-        $this->title->SetFont(FF_FONT2,FS_BOLD);
-        $this->title->SetMargin(3);
-        $this->title->SetAlign('center');
-
-        $this->subtitle = new Text();
-        $this->subtitle->ParagraphAlign('center');
-        $this->subtitle->SetMargin(2);
-        $this->subtitle->SetAlign('center');
-
-        $this->subsubtitle = new Text();
-        $this->subsubtitle->ParagraphAlign('center');
-        $this->subsubtitle->SetMargin(2);
-        $this->subsubtitle->SetAlign('center');
-
-        $this->legend = new Legend();
-        $this->footer = new Footer();
-
-        // Window doesn't like '?' in the file name so replace it with an '_'
-        $aCachedName = str_replace("?","_",$aCachedName);
-
-        // If the cached version exist just read it directly from the
-        // cache, stream it back to browser and exit
-        if( $aCachedName!="" && READ_CACHE && $aInline )
-            if( $this->cache->GetAndStream($aCachedName) ) {
-                exit();
-            }
-                                
-        $this->cache_name = $aCachedName;
-        $this->SetTickDensity(); // Normal density
-
-        $this->tabtitle = new GraphTabTitle();
-    }
-//---------------
-// PUBLIC METHODS       
-    
+    protected $isRunningClear = false;
+    protected $inputValues;
+    protected $isAfterSetScale = false;
+
+    // aWIdth   Width in pixels of image
+    // aHeight   Height in pixels of image
+    // aCachedName Name for image file in cache directory
+    // aTimeOut  Timeout in minutes for image in cache
+    // aInline  If true the image is streamed back in the call to Stroke()
+    //   If false the image is just created in the cache
+    function __construct($aWidth=300,$aHeight=200,$aCachedName='',$aTimeout=0,$aInline=true) {
+
+        if( !is_numeric($aWidth) || !is_numeric($aHeight) ) {
+            JpGraphError::RaiseL(25008);//('Image width/height argument in Graph::Graph() must be numeric');
+        }
+
+        // Initialize frame and margin
+        $this->InitializeFrameAndMargin();
+
+        // Automatically generate the image file name based on the name of the script that
+        // generates the graph
+        if( $aCachedName == 'auto' ) {
+            $aCachedName=GenImgName();
+        }
+
+        // Should the image be streamed back to the browser or only to the cache?
+        $this->inline=$aInline;
+
+        $this->img = new RotImage($aWidth,$aHeight);
+        $this->cache  = new ImgStreamCache();
+
+        // Window doesn't like '?' in the file name so replace it with an '_'
+        $aCachedName = str_replace("?","_",$aCachedName);
+        $this->SetupCache($aCachedName, $aTimeout);
+
+        $this->title = new Text();
+        $this->title->ParagraphAlign('center');
+        $this->title->SetFont(FF_DEFAULT,FS_NORMAL); //FF_FONT2, FS_BOLD
+        $this->title->SetMargin(5);
+        $this->title->SetAlign('center');
+
+        $this->subtitle = new Text();
+        $this->subtitle->ParagraphAlign('center');
+        $this->subtitle->SetMargin(3);
+        $this->subtitle->SetAlign('center');
+
+        $this->subsubtitle = new Text();
+        $this->subsubtitle->ParagraphAlign('center');
+        $this->subsubtitle->SetMargin(3);
+        $this->subsubtitle->SetAlign('center');
+
+        $this->legend = new Legend();
+        $this->footer = new Footer();
+
+        // If the cached version exist just read it directly from the
+        // cache, stream it back to browser and exit
+        if( $aCachedName!='' && READ_CACHE && $aInline ) {
+            if( $this->cache->GetAndStream($this->img,$aCachedName) ) {
+                exit();
+            }
+        }
+
+        $this->SetTickDensity(); // Normal density
+
+        $this->tabtitle = new GraphTabTitle();
+
+        if (!$this->isRunningClear) {
+            $this->inputValues = array();
+            $this->inputValues['aWidth'] = $aWidth;
+            $this->inputValues['aHeight'] = $aHeight;
+            $this->inputValues['aCachedName'] = $aCachedName;
+            $this->inputValues['aTimeout'] = $aTimeout;
+            $this->inputValues['aInline'] = $aInline;
+
+            $theme_class = DEFAULT_THEME_CLASS;
+            if (class_exists($theme_class)) {
+                $this->graph_theme = new $theme_class();
+            }
+        }
+    }
+
+    function InitializeFrameAndMargin() {
+        $this->doframe=true;
+        $this->frame_color='black';
+        $this->frame_weight=1; 
+
+        $this->titlebackground_framecolor = 'blue';
+        $this->titlebackground_framestyle = 2;
+        $this->titlebackground_frameweight = 1;
+        $this->titlebackground_bevelheight = 3;
+        $this->titlebkg_fillstyle=TITLEBKG_FILLSTYLE_SOLID;
+        $this->titlebkg_scolor1='black';
+        $this->titlebkg_scolor2='white';
+        $this->framebevel = false;
+        $this->framebeveldepth = 2;
+        $this->framebevelborder = false;
+        $this->framebevelbordercolor='black';
+        $this->framebevelcolor1='white@0.4';
+        $this->framebevelcolor2='black@0.4';
+
+        $this->margin_color = array(250,250,250);
+    }
+
+    function SetupCache($aFilename,$aTimeout=60) {
+        $this->cache_name = $aFilename;
+        $this->cache->SetTimeOut($aTimeout);
+    }
+
     // Enable final image perspective transformation
     function Set3DPerspective($aDir=1,$aHorizon=100,$aSkewDist=120,$aQuality=false,$aFillColor='#FFFFFF',$aBorder=false,$aMinSize=true,$aHorizonPos=0.5) {
-        $this->iImgTrans = true;
-        $this->iImgTransHorizon = $aHorizon;
-        $this->iImgTransSkewDist= $aSkewDist;
-        $this->iImgTransDirection = $aDir;
-        $this->iImgTransMinSize = $aMinSize;
-        $this->iImgTransFillColor=$aFillColor;
-        $this->iImgTransHighQ=$aQuality;
-        $this->iImgTransBorder=$aBorder;
-        $this->iImgTransHorizonPos=$aHorizonPos;
+        $this->iImgTrans = true;
+        $this->iImgTransHorizon = $aHorizon;
+        $this->iImgTransSkewDist= $aSkewDist;
+        $this->iImgTransDirection = $aDir;
+        $this->iImgTransMinSize = $aMinSize;
+        $this->iImgTransFillColor=$aFillColor;
+        $this->iImgTransHighQ=$aQuality;
+        $this->iImgTransBorder=$aBorder;
+        $this->iImgTransHorizonPos=$aHorizonPos;
     }
 
     function SetUserFont($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->img->ttf->SetUserFont($aNormal,$aBold,$aItalic,$aBoldIt);
+        $this->img->ttf->SetUserFont($aNormal,$aBold,$aItalic,$aBoldIt);
     }
 
     function SetUserFont1($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->img->ttf->SetUserFont1($aNormal,$aBold,$aItalic,$aBoldIt);
+        $this->img->ttf->SetUserFont1($aNormal,$aBold,$aItalic,$aBoldIt);
     }
 
     function SetUserFont2($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->img->ttf->SetUserFont2($aNormal,$aBold,$aItalic,$aBoldIt);
+        $this->img->ttf->SetUserFont2($aNormal,$aBold,$aItalic,$aBoldIt);
     }
 
     function SetUserFont3($aNormal,$aBold='',$aItalic='',$aBoldIt='') {
-        $this->img->ttf->SetUserFont3($aNormal,$aBold,$aItalic,$aBoldIt);
+        $this->img->ttf->SetUserFont3($aNormal,$aBold,$aItalic,$aBoldIt);
     }
 
     // Set Image format and optional quality
     function SetImgFormat($aFormat,$aQuality=75) {
-        $this->img->SetImgFormat($aFormat,$aQuality);
+        $this->img->SetImgFormat($aFormat,$aQuality);
     }
 
     // Should the grid be in front or back of the plot?
     function SetGridDepth($aDepth) {
-        $this->grid_depth=$aDepth;
+        $this->grid_depth=$aDepth;
     }
 
     function SetIconDepth($aDepth) {
-        $this->iIconDepth=$aDepth;
-    }
-        
+        $this->iIconDepth=$aDepth;
+    }
+
     // Specify graph angle 0-360 degrees.
     function SetAngle($aAngle) {
-        $this->img->SetAngle($aAngle);
+        $this->img->SetAngle($aAngle);
     }
 
     function SetAlphaBlending($aFlg=true) {
-        $this->img->SetAlphaBlending($aFlg);
+        $this->img->SetAlphaBlending($aFlg);
     }
 
     // Shortcut to image margin
     function SetMargin($lm,$rm,$tm,$bm) {
-        $this->img->SetMargin($lm,$rm,$tm,$bm);
+        $this->img->SetMargin($lm,$rm,$tm,$bm);
     }
 
     function SetY2OrderBack($aBack=true) {
-        $this->y2orderback = $aBack;
-    }
-
-    // Rotate the graph 90 degrees and set the margin 
+        $this->y2orderback = $aBack;
+    }
+
+    // Rotate the graph 90 degrees and set the margin
     // when we have done a 90 degree rotation
     function Set90AndMargin($lm=0,$rm=0,$tm=0,$bm=0) {
-        $lm = $lm ==0 ? floor(0.2 * $this->img->width)  : $lm ;
-        $rm = $rm ==0 ? floor(0.1 * $this->img->width)  : $rm ;
-        $tm = $tm ==0 ? floor(0.2 * $this->img->height) : $tm ;
-        $bm = $bm ==0 ? floor(0.1 * $this->img->height) : $bm ;
-
-        $adj = ($this->img->height - $this->img->width)/2;
-        $this->img->SetMargin($tm-$adj,$bm-$adj,$rm+$adj,$lm+$adj);
-        $this->img->SetCenter(floor($this->img->width/2),floor($this->img->height/2));
-        $this->SetAngle(90);
-        if( empty($this->yaxis) || empty($this->xaxis) ) {
-            JpgraphError::RaiseL(25009);//('You must specify what scale to use with a call to Graph::SetScale()');
-        }
-        $this->xaxis->SetLabelAlign('right','center');
-        $this->yaxis->SetLabelAlign('center','bottom');
-    }
-        
+        $adj = ($this->img->height - $this->img->width)/2;
+        $this->img->SetMargin($tm-$adj,$bm-$adj,$rm+$adj,$lm+$adj);
+        $this->img->SetCenter(floor($this->img->width/2),floor($this->img->height/2));
+        $this->SetAngle(90);
+        if( empty($this->yaxis) || empty($this->xaxis) ) {
+            JpgraphError::RaiseL(25009);//('You must specify what scale to use with a call to Graph::SetScale()');
+        }
+        $this->xaxis->SetLabelAlign('right','center');
+        $this->yaxis->SetLabelAlign('center','bottom');
+    }
+
     function SetClipping($aFlg=true) {
-        $this->iDoClipping = $aFlg ;
+        $this->iDoClipping = $aFlg ;
     }
 
     // Add a plot object to the graph
     function Add($aPlot) {
-        if( $aPlot == null )
-            JpGraphError::RaiseL(25010);//("Graph::Add() You tried to add a null plot to the graph.");
-        if( is_array($aPlot) && count($aPlot) > 0 )
-            $cl = $aPlot[0];
-        else
-            $cl = $aPlot;
-
-        if( $cl instanceof Text ) 
-            $this->AddText($aPlot);
-        elseif( $cl instanceof PlotLine )
-            $this->AddLine($aPlot);
-        elseif( class_exists('PlotBand',false) && ($cl instanceof PlotBand) )
-            $this->AddBand($aPlot);
-        elseif( class_exists('IconPlot',false) && ($cl instanceof IconPlot) )
-            $this->AddIcon($aPlot);
-        elseif( class_exists('GTextTable',false) && ($cl instanceof GTextTable) )
-            $this->AddTable($aPlot);
-        else
-            $this->plots[] = $aPlot;
+        if( $aPlot == null ) {
+            JpGraphError::RaiseL(25010);//("Graph::Add() You tried to add a null plot to the graph.");
+        }
+        if( is_array($aPlot) && count($aPlot) > 0 ) {
+            $cl = $aPlot[0];
+        }
+        else {
+            $cl = $aPlot;
+        }
+
+        if( $cl instanceof Text ) $this->AddText($aPlot);
+        elseif( class_exists('PlotLine',false) && ($cl instanceof PlotLine) )  $this->AddLine($aPlot);
+        elseif( class_exists('PlotBand',false) && ($cl instanceof PlotBand) ) $this->AddBand($aPlot);
+        elseif( class_exists('IconPlot',false) && ($cl instanceof IconPlot) ) $this->AddIcon($aPlot);
+        elseif( class_exists('GTextTable',false) && ($cl instanceof GTextTable) ) $this->AddTable($aPlot);
+        else {
+            if( is_array($aPlot) ) {
+                $this->plots = array_merge($this->plots,$aPlot);
+            }
+            else {
+                $this->plots[] = $aPlot;
+            }
+        }
+
+        if ($this->graph_theme) {
+            $this->graph_theme->SetupPlot($aPlot);
+        }
     }
 
     function AddTable($aTable) {
-        if( is_array($aTable) ) {
-            for($i=0; $i < count($aTable); ++$i )
-                $this->iTables[]=$aTable[$i];
-        }
-        else {
-            $this->iTables[] = $aTable ;
-        }       
+        if( is_array($aTable) ) {
+            for($i=0; $i < count($aTable); ++$i ) {
+                $this->iTables[]=$aTable[$i];
+            }
+        }
+        else {
+            $this->iTables[] = $aTable ;
+        }
     }
 
     function AddIcon($aIcon) {
-        if( is_array($aIcon) ) {
-            for($i=0; $i < count($aIcon); ++$i )
-                $this->iIcons[]=$aIcon[$i];
-        }
-        else {
-            $this->iIcons[] = $aIcon ;
-        }       
+        if( is_array($aIcon) ) {
+            for($i=0; $i < count($aIcon); ++$i ) {
+                $this->iIcons[]=$aIcon[$i];
+            }
+        }
+        else {
+            $this->iIcons[] = $aIcon ;
+        }
     }
 
     // Add plot to second Y-scale
     function AddY2($aPlot) {
-        if( $aPlot == null )
-            JpGraphError::RaiseL(25011);//("Graph::AddY2() You tried to add a null plot to the graph.");        
-
-        if( is_array($aPlot) && count($aPlot) > 0 )
-            $cl = $aPlot[0];
-        else
-            $cl = $aPlot;
-
-        if( $cl instanceof Text ) 
-            $this->AddText($aPlot,true);
-        elseif( $cl instanceof PlotLine )
-            $this->AddLine($aPlot,true);
-        elseif( class_exists('PlotBand',false) && ($cl instanceof PlotBand) )
-            $this->AddBand($aPlot,true);
-        else
-            $this->y2plots[] = $aPlot;
-    }
-        
+        if( $aPlot == null ) {
+            JpGraphError::RaiseL(25011);//("Graph::AddY2() You tried to add a null plot to the graph.");
+        }
+
+        if( is_array($aPlot) && count($aPlot) > 0 ) {
+            $cl = $aPlot[0];
+        }
+        else {
+            $cl = $aPlot;
+        }
+
+        if( $cl instanceof Text ) {
+            $this->AddText($aPlot,true);
+        }
+        elseif( class_exists('PlotLine',false) && ($cl instanceof PlotLine) ) {
+            $this->AddLine($aPlot,true);
+        }
+        elseif( class_exists('PlotBand',false) && ($cl instanceof PlotBand) ) {
+            $this->AddBand($aPlot,true);
+        }
+        else {
+            $this->y2plots[] = $aPlot;
+        }
+
+        if ($this->graph_theme) {
+            $this->graph_theme->SetupPlot($aPlot);
+        }
+    }
+
     // Add plot to the extra Y-axises
     function AddY($aN,$aPlot) {
 
-        if( $aPlot == null )
-            JpGraphError::RaiseL(25012);//("Graph::AddYN() You tried to add a null plot to the graph.");        
-
-        if( is_array($aPlot) && count($aPlot) > 0 )
-            $cl = $aPlot[0];
-        else
-            $cl = $aPlot;
-
-        if( ($cl instanceof Text) || ($cl instanceof PlotLine) || 
-            (class_exists('PlotBand',false) && ($cl instanceof PlotBand)) )
-            JpGraph::RaiseL(25013);//('You can only add standard plots to multiple Y-axis');
-        else
-            $this->ynplots[$aN][] = $aPlot;
+        if( $aPlot == null ) {
+            JpGraphError::RaiseL(25012);//("Graph::AddYN() You tried to add a null plot to the graph.");
+        }
+
+        if( is_array($aPlot) && count($aPlot) > 0 ) {
+            $cl = $aPlot[0];
+        }
+        else {
+            $cl = $aPlot;
+        }
+
+        if( ($cl instanceof Text) ||
+            (class_exists('PlotLine',false) && ($cl instanceof PlotLine)) ||
+            (class_exists('PlotBand',false) && ($cl instanceof PlotBand)) ) {
+            JpGraph::RaiseL(25013);//('You can only add standard plots to multiple Y-axis');
+        }
+        else {
+            $this->ynplots[$aN][] = $aPlot;
+        }
+
+        if ($this->graph_theme) {
+            $this->graph_theme->SetupPlot($aPlot);
+        }
     }
 
     // Add text object to the graph
     function AddText($aTxt,$aToY2=false) {
-        if( $aTxt == null )
-            JpGraphError::RaiseL(25014);//("Graph::AddText() You tried to add a null text to the graph.");              
-        if( $aToY2 ) {
-            if( is_array($aTxt) ) {
-                for($i=0; $i < count($aTxt); ++$i )
-                    $this->y2texts[]=$aTxt[$i];
-            }
-            else
-                $this->y2texts[] = $aTxt;
-        }
-        else {
-            if( is_array($aTxt) ) {
-                for($i=0; $i < count($aTxt); ++$i )
-                    $this->texts[]=$aTxt[$i];
-            }
-            else
-                $this->texts[] = $aTxt;
-        }
-    }
-        
+        if( $aTxt == null ) {
+            JpGraphError::RaiseL(25014);//("Graph::AddText() You tried to add a null text to the graph.");
+        }
+        if( $aToY2 ) {
+            if( is_array($aTxt) ) {
+                for($i=0; $i < count($aTxt); ++$i ) {
+                    $this->y2texts[]=$aTxt[$i];
+                }
+            }
+            else {
+                $this->y2texts[] = $aTxt;
+            }
+        }
+        else {
+            if( is_array($aTxt) ) {
+                for($i=0; $i < count($aTxt); ++$i ) {
+                    $this->texts[]=$aTxt[$i];
+                }
+            }
+            else {
+                $this->texts[] = $aTxt;
+            }
+        }
+    }
+
     // Add a line object (class PlotLine) to the graph
     function AddLine($aLine,$aToY2=false) {
-        if( $aLine == null )
-            JpGraphError::RaiseL(25015);//("Graph::AddLine() You tried to add a null line to the graph.");      
-
-        if( $aToY2 ) {
-            if( is_array($aLine) ) {
-                for($i=0; $i < count($aLine); ++$i )
-                    $this->y2lines[]=$aLine[$i];
-            }
-            else
-                $this->y2lines[] = $aLine;
-        }
-        else {
-            if( is_array($aLine) ) {
-                for($i=0; $i<count($aLine); ++$i )
-                    $this->lines[]=$aLine[$i];
-            }
-            else
-                $this->lines[] = $aLine;
-        }
+        if( $aLine == null ) {
+            JpGraphError::RaiseL(25015);//("Graph::AddLine() You tried to add a null line to the graph.");
+        }
+
+        if( $aToY2 ) {
+            if( is_array($aLine) ) {
+                for($i=0; $i < count($aLine); ++$i ) {
+                    //$this->y2lines[]=$aLine[$i];
+                    $this->y2plots[]=$aLine[$i];
+                }
+            }
+            else {
+                //$this->y2lines[] = $aLine;
+                $this->y2plots[]=$aLine;
+            }
+        }
+        else {
+            if( is_array($aLine) ) {
+                for($i=0; $i<count($aLine); ++$i ) {
+                    //$this->lines[]=$aLine[$i];
+                    $this->plots[]=$aLine[$i];
+                }
+            }
+            else {
+                //$this->lines[] = $aLine;
+                $this->plots[] = $aLine;
+            }
+        }
     }
 
     // Add vertical or horizontal band
     function AddBand($aBand,$aToY2=false) {
-        if( $aBand == null )
-            JpGraphError::RaiseL(25016);//(" Graph::AddBand() You tried to add a null band to the graph.");
-
-        if( $aToY2 ) {
-            if( is_array($aBand) ) {
-                for($i=0; $i < count($aBand); ++$i )
-                    $this->y2bands[] = $aBand[$i];
-            }
-            else
-                $this->y2bands[] = $aBand;
-        }
-        else {
-            if( is_array($aBand) ) {
-                for($i=0; $i < count($aBand); ++$i )
-                    $this->bands[] = $aBand[$i];
-            }
-            else
-                $this->bands[] = $aBand;
-        }
+        if( $aBand == null ) {
+            JpGraphError::RaiseL(25016);//(" Graph::AddBand() You tried to add a null band to the graph.");
+        }
+
+        if( $aToY2 ) {
+            if( is_array($aBand) ) {
+                for($i=0; $i < count($aBand); ++$i ) {
+                    $this->y2bands[] = $aBand[$i];
+                }
+            }
+            else {
+                $this->y2bands[] = $aBand;
+            }
+        }
+        else {
+            if( is_array($aBand) ) {
+                for($i=0; $i < count($aBand); ++$i ) {
+                    $this->bands[] = $aBand[$i];
+                }
+            }
+            else {
+                $this->bands[] = $aBand;
+            }
+        }
+    }
+
+    function SetPlotGradient($aFrom='navy',$aTo='silver',$aGradType=2) {
+        $this->plot_gradtype=$aGradType;
+        $this->plot_gradfrom = $aFrom;
+        $this->plot_gradto = $aTo;
     }
 
     function SetBackgroundGradient($aFrom='navy',$aTo='silver',$aGradType=2,$aStyle=BGRAD_FRAME) {
-        $this->bkg_gradtype=$aGradType;
-        $this->bkg_gradstyle=$aStyle;
-        $this->bkg_gradfrom = $aFrom;
-        $this->bkg_gradto = $aTo;
-    } 
-        
+        $this->bkg_gradtype=$aGradType;
+        $this->bkg_gradstyle=$aStyle;
+        $this->bkg_gradfrom = $aFrom;
+        $this->bkg_gradto = $aTo;
+    }
+
     // Set a country flag in the background
     function SetBackgroundCFlag($aName,$aBgType=BGIMG_FILLPLOT,$aMix=100) {
-        $this->background_cflag = $aName;
-        $this->background_cflag_type = $aBgType;
-        $this->background_cflag_mix = $aMix;
+        $this->background_cflag = $aName;
+        $this->background_cflag_type = $aBgType;
+        $this->background_cflag_mix = $aMix;
     }
 
     // Alias for the above method
     function SetBackgroundCountryFlag($aName,$aBgType=BGIMG_FILLPLOT,$aMix=100) {
-        $this->background_cflag = $aName;
-        $this->background_cflag_type = $aBgType;
-        $this->background_cflag_mix = $aMix;
+        $this->background_cflag = $aName;
+        $this->background_cflag_type = $aBgType;
+        $this->background_cflag_mix = $aMix;
     }
 
 
     // Specify a background image
-    function SetBackgroundImage($aFileName,$aBgType=BGIMG_FILLPLOT,$aImgFormat="auto") {
-
-        if( !USE_TRUECOLOR ) {
-            JpGraphError::RaiseL(25017);//("You are using GD 2.x and are trying to use a background images on a non truecolor image. To use background images with GD 2.x you <b>must</b> enable truecolor by setting the USE_TRUECOLOR constant to TRUE. Due to a bug in GD 2.0.1 using any truetype fonts with truecolor images will result in very poor quality fonts.");
-        }
-
-        // Get extension to determine image type
-        if( $aImgFormat == "auto" ) {
-            $e = explode('.',$aFileName);
-            if( !$e ) {
-                JpGraphError::RaiseL(25018,$aFileName);//('Incorrect file name for Graph::SetBackgroundImage() : '.$aFileName.' Must have a valid image extension (jpg,gif,png) when using autodetection of image type');
-            }
-
-            $valid_formats = array('png', 'jpg', 'gif');
-            $aImgFormat = strtolower($e[count($e)-1]);
-            if ($aImgFormat == 'jpeg')  {
-                $aImgFormat = 'jpg';
-            }
-            elseif (!in_array($aImgFormat, $valid_formats) )  {
-                JpGraphError::RaiseL(25019,$aImgFormat);//('Unknown file extension ($aImgFormat) in Graph::SetBackgroundImage() for filename: '.$aFileName);
-            }    
-        }
-
-        $this->background_image = $aFileName;
-        $this->background_image_type=$aBgType;
-        $this->background_image_format=$aImgFormat;
+    function SetBackgroundImage($aFileName,$aBgType=BGIMG_FILLPLOT,$aImgFormat='auto') {
+
+        // Get extension to determine image type
+        if( $aImgFormat == 'auto' ) {
+            $e = explode('.',$aFileName);
+            if( !$e ) {
+                JpGraphError::RaiseL(25018,$aFileName);//('Incorrect file name for Graph::SetBackgroundImage() : '.$aFileName.' Must have a valid image extension (jpg,gif,png) when using autodetection of image type');
+            }
+
+            $valid_formats = array('png', 'jpg', 'gif');
+            $aImgFormat = strtolower($e[count($e)-1]);
+            if ($aImgFormat == 'jpeg')  {
+                $aImgFormat = 'jpg';
+            }
+            elseif (!in_array($aImgFormat, $valid_formats) )  {
+                JpGraphError::RaiseL(25019,$aImgFormat);//('Unknown file extension ($aImgFormat) in Graph::SetBackgroundImage() for filename: '.$aFileName);
+            }
+        }
+
+        $this->background_image = $aFileName;
+        $this->background_image_type=$aBgType;
+        $this->background_image_format=$aImgFormat;
     }
 
     function SetBackgroundImageMix($aMix) {
-        $this->background_image_mix = $aMix ;
-    }
-        
+        $this->background_image_mix = $aMix ;
+    }
+
     // Adjust background image position
     function SetBackgroundImagePos($aXpos,$aYpos) {
-        $this->background_image_xpos = $aXpos ;
-        $this->background_image_ypos = $aYpos ;
-    }
-        
+        $this->background_image_xpos = $aXpos ;
+        $this->background_image_ypos = $aYpos ;
+    }
+
     // Specify axis style (boxed or single)
     function SetAxisStyle($aStyle) {
         $this->iAxisStyle = $aStyle ;
     }
-        
+
     // Set a frame around the plot area
     function SetBox($aDrawPlotFrame=true,$aPlotFrameColor=array(0,0,0),$aPlotFrameWeight=1) {
-        $this->boxed = $aDrawPlotFrame;
-        $this->box_weight = $aPlotFrameWeight;
-        $this->box_color = $aPlotFrameColor;
-    }
-        
+        $this->boxed = $aDrawPlotFrame;
+        $this->box_weight = $aPlotFrameWeight;
+        $this->box_color = $aPlotFrameColor;
+    }
+
     // Specify color for the plotarea (not the margins)
     function SetColor($aColor) {
-        $this->plotarea_color=$aColor;
-    }
-        
+        $this->plotarea_color=$aColor;
+    }
+
     // Specify color for the margins (all areas outside the plotarea)
     function SetMarginColor($aColor) {
-        $this->margin_color=$aColor;
-    }
-        
+        $this->margin_color=$aColor;
+    }
+
     // Set a frame around the entire image
     function SetFrame($aDrawImgFrame=true,$aImgFrameColor=array(0,0,0),$aImgFrameWeight=1) {
-        $this->doframe = $aDrawImgFrame;
-        $this->frame_color = $aImgFrameColor;
-        $this->frame_weight = $aImgFrameWeight;
+        $this->doframe = $aDrawImgFrame;
+        $this->frame_color = $aImgFrameColor;
+        $this->frame_weight = $aImgFrameWeight;
     }
 
     function SetFrameBevel($aDepth=3,$aBorder=false,$aBorderColor='black',$aColor1='white@0.4',$aColor2='darkgray@0.4',$aFlg=true) {
-        $this->framebevel = $aFlg ;
-        $this->framebeveldepth = $aDepth ;
-        $this->framebevelborder = $aBorder ;
-        $this->framebevelbordercolor = $aBorderColor ;
-        $this->framebevelcolor1 = $aColor1 ;
-        $this->framebevelcolor2 = $aColor2 ;
-
-        $this->doshadow = false ;
+        $this->framebevel = $aFlg ;
+        $this->framebeveldepth = $aDepth ;
+        $this->framebevelborder = $aBorder ;
+        $this->framebevelbordercolor = $aBorderColor ;
+        $this->framebevelcolor1 = $aColor1 ;
+        $this->framebevelcolor2 = $aColor2 ;
+
+        $this->doshadow = false ;
     }
 
     // Set the shadow around the whole image
-    function SetShadow($aShowShadow=true,$aShadowWidth=5,$aShadowColor=array(102,102,102)) {
-        $this->doshadow = $aShowShadow;
-        $this->shadow_color = $aShadowColor;
-        $this->shadow_width = $aShadowWidth;
-        $this->footer->iBottomMargin += $aShadowWidth;
-        $this->footer->iRightMargin += $aShadowWidth;
+    function SetShadow($aShowShadow=true,$aShadowWidth=5,$aShadowColor='darkgray') {
+        $this->doshadow = $aShowShadow;
+        $this->shadow_color = $aShadowColor;
+        $this->shadow_width = $aShadowWidth;
+        $this->footer->iBottomMargin += $aShadowWidth;
+        $this->footer->iRightMargin += $aShadowWidth;
     }
 
@@ -958 +1070 @@
     // you must also specify the tick distance with a call to Ticks::Set()
     function SetScale($aAxisType,$aYMin=1,$aYMax=1,$aXMin=1,$aXMax=1) {
-        $this->axtype = $aAxisType;
-
-        if( $aYMax < $aYMin || $aXMax < $aXMin )
-            JpGraphError::RaiseL(25020);//('Graph::SetScale(): Specified Max value must be larger than the specified Min value.');
-
-        $yt=substr($aAxisType,-3,3);
-        if( $yt=="lin" )
-            $this->yscale = new LinearScale($aYMin,$aYMax);
-        elseif( $yt == "int" ) {
-            $this->yscale = new LinearScale($aYMin,$aYMax);
-            $this->yscale->SetIntScale();
-        }
-        elseif( $yt=="log" )
-            $this->yscale = new LogScale($aYMin,$aYMax);
-        else
-            JpGraphError::RaiseL(25021,$aAxisType);//("Unknown scale specification for Y-scale. ($aAxisType)");
-                        
-        $xt=substr($aAxisType,0,3);
-        if( $xt == "lin" || $xt == "tex" ) {
-            $this->xscale = new LinearScale($aXMin,$aXMax,"x");
-            $this->xscale->textscale = ($xt == "tex");
-        }
-        elseif( $xt == "int" ) {
-            $this->xscale = new LinearScale($aXMin,$aXMax,"x");
-            $this->xscale->SetIntScale();
-        }
-        elseif( $xt == "dat" ) {
-            $this->xscale = new DateScale($aXMin,$aXMax,"x");
-        }
-        elseif( $xt == "log" )
-            $this->xscale = new LogScale($aXMin,$aXMax,"x");
-        else
-            JpGraphError::RaiseL(25022,$aAxisType);//(" Unknown scale specification for X-scale. ($aAxisType)");
-
-        $this->xaxis = new Axis($this->img,$this->xscale);
-        $this->yaxis = new Axis($this->img,$this->yscale);
-        $this->xgrid = new Grid($this->xaxis);
-        $this->ygrid = new Grid($this->yaxis);  
-        $this->ygrid->Show();                   
-    }
-        
+        $this->axtype = $aAxisType;
+
+        if( $aYMax < $aYMin || $aXMax < $aXMin ) {
+            JpGraphError::RaiseL(25020);//('Graph::SetScale(): Specified Max value must be larger than the specified Min value.');
+        }
+
+        $yt=substr($aAxisType,-3,3);
+        if( $yt == 'lin' ) {
+            $this->yscale = new LinearScale($aYMin,$aYMax);
+        }
+        elseif( $yt == 'int' ) {
+            $this->yscale = new LinearScale($aYMin,$aYMax);
+            $this->yscale->SetIntScale();
+        }
+        elseif( $yt == 'log' ) {
+            $this->yscale = new LogScale($aYMin,$aYMax);
+        }
+        else {
+            JpGraphError::RaiseL(25021,$aAxisType);//("Unknown scale specification for Y-scale. ($aAxisType)");
+        }
+
+        $xt=substr($aAxisType,0,3);
+        if( $xt == 'lin' || $xt == 'tex' ) {
+            $this->xscale = new LinearScale($aXMin,$aXMax,'x');
+            $this->xscale->textscale = ($xt == 'tex');
+        }
+        elseif( $xt == 'int' ) {
+            $this->xscale = new LinearScale($aXMin,$aXMax,'x');
+            $this->xscale->SetIntScale();
+        }
+        elseif( $xt == 'dat' ) {
+            $this->xscale = new DateScale($aXMin,$aXMax,'x');
+        }
+        elseif( $xt == 'log' ) {
+            $this->xscale = new LogScale($aXMin,$aXMax,'x');
+        }
+        else {
+            JpGraphError::RaiseL(25022,$aAxisType);//(" Unknown scale specification for X-scale. ($aAxisType)");
+        }
+
+        $this->xaxis = new Axis($this->img,$this->xscale);
+        $this->yaxis = new Axis($this->img,$this->yscale);
+        $this->xgrid = new Grid($this->xaxis);
+        $this->ygrid = new Grid($this->yaxis);
+        $this->ygrid->Show();
+
+
+        if (!$this->isRunningClear) {
+            $this->inputValues['aAxisType'] = $aAxisType;
+            $this->inputValues['aYMin'] = $aYMin;
+            $this->inputValues['aYMax'] = $aYMax;
+            $this->inputValues['aXMin'] = $aXMin;
+            $this->inputValues['aXMax'] = $aXMax;
+
+            if ($this->graph_theme) {
+                $this->graph_theme->ApplyGraph($this);
+            }
+        }
+
+        $this->isAfterSetScale = true;
+    }
+
     // Specify secondary Y scale
-    function SetY2Scale($aAxisType="lin",$aY2Min=1,$aY2Max=1) {
-        if( $aAxisType=="lin" ) 
-            $this->y2scale = new LinearScale($aY2Min,$aY2Max);
-        elseif( $aAxisType == "int" ) {
-            $this->y2scale = new LinearScale($aY2Min,$aY2Max);
-            $this->y2scale->SetIntScale();
-        }
-        elseif( $aAxisType=="log" ) {
-            $this->y2scale = new LogScale($aY2Min,$aY2Max);
-        }
-        else JpGraphError::RaiseL(25023,$aAxisType);//("JpGraph: Unsupported Y2 axis type: $aAxisType\nMust be one of (lin,log,int)");
-                        
-        $this->y2axis = new Axis($this->img,$this->y2scale);
-        $this->y2axis->scale->ticks->SetDirection(SIDE_LEFT); 
-        $this->y2axis->SetLabelSide(SIDE_RIGHT); 
-        $this->y2axis->SetPos('max');
-        $this->y2axis->SetTitleSide(SIDE_RIGHT);
-                
-        // Deafult position is the max x-value
-        $this->y2grid = new Grid($this->y2axis);                                                        
+    function SetY2Scale($aAxisType='lin',$aY2Min=1,$aY2Max=1) {
+        if( $aAxisType == 'lin' ) {
+            $this->y2scale = new LinearScale($aY2Min,$aY2Max);
+        }
+        elseif( $aAxisType == 'int' ) {
+            $this->y2scale = new LinearScale($aY2Min,$aY2Max);
+            $this->y2scale->SetIntScale();
+        }
+        elseif( $aAxisType == 'log' ) {
+            $this->y2scale = new LogScale($aY2Min,$aY2Max);
+        }
+        else {
+            JpGraphError::RaiseL(25023,$aAxisType);//("JpGraph: Unsupported Y2 axis type: $aAxisType\nMust be one of (lin,log,int)");
+        }
+
+        $this->y2axis = new Axis($this->img,$this->y2scale);
+        $this->y2axis->scale->ticks->SetDirection(SIDE_LEFT);
+        $this->y2axis->SetLabelSide(SIDE_RIGHT);
+        $this->y2axis->SetPos('max');
+        $this->y2axis->SetTitleSide(SIDE_RIGHT);
+
+        // Deafult position is the max x-value
+        $this->y2grid = new Grid($this->y2axis);
+
+        if ($this->graph_theme) {
+          $this->graph_theme->ApplyGraph($this);
+        }
     }
 
     // Set the delta position (in pixels) between the multiple Y-axis
     function SetYDeltaDist($aDist) {
-        $this->iYAxisDeltaPos = $aDist;
+        $this->iYAxisDeltaPos = $aDist;
     }
 
@@ -1030 +1170 @@
     function SetYScale($aN,$aAxisType="lin",$aYMin=1,$aYMax=1) {
 
-        if( $aAxisType=="lin" ) 
-            $this->ynscale[$aN] = new LinearScale($aYMin,$aYMax);
-        elseif( $aAxisType == "int" ) {
-            $this->ynscale[$aN] = new LinearScale($aYMin,$aYMax);
-            $this->ynscale[$aN]->SetIntScale();
-        }
-        elseif( $aAxisType=="log" ) {
-            $this->ynscale[$aN] = new LogScale($aYMin,$aYMax);
-        }
-        else JpGraphError::RaiseL(25024,$aAxisType);//("JpGraph: Unsupported Y axis type: $aAxisType\nMust be one of (lin,log,int)");
-                        
-        $this->ynaxis[$aN] = new Axis($this->img,$this->ynscale[$aN]);
-        $this->ynaxis[$aN]->scale->ticks->SetDirection(SIDE_LEFT); 
-        $this->ynaxis[$aN]->SetLabelSide(SIDE_RIGHT); 
+        if( $aAxisType == 'lin' ) {
+            $this->ynscale[$aN] = new LinearScale($aYMin,$aYMax);
+        }
+        elseif( $aAxisType == 'int' ) {
+            $this->ynscale[$aN] = new LinearScale($aYMin,$aYMax);
+            $this->ynscale[$aN]->SetIntScale();
+        }
+        elseif( $aAxisType == 'log' ) {
+            $this->ynscale[$aN] = new LogScale($aYMin,$aYMax);
+        }
+        else {
+            JpGraphError::RaiseL(25024,$aAxisType);//("JpGraph: Unsupported Y axis type: $aAxisType\nMust be one of (lin,log,int)");
+        }
+
+        $this->ynaxis[$aN] = new Axis($this->img,$this->ynscale[$aN]);
+        $this->ynaxis[$aN]->scale->ticks->SetDirection(SIDE_LEFT);
+        $this->ynaxis[$aN]->SetLabelSide(SIDE_RIGHT);
+
+        if ($this->graph_theme) {
+            $this->graph_theme->ApplyGraph($this);
+        }
     }
 
     // Specify density of ticks when autoscaling 'normal', 'dense', 'sparse', 'verysparse'
-    // The dividing factor have been determined heuristically according to my aesthetic 
+    // The dividing factor have been determined heuristically according to my aesthetic
     // sense (or lack off) y.m.m.v !
     function SetTickDensity($aYDensity=TICKD_NORMAL,$aXDensity=TICKD_NORMAL) {
-        $this->xtick_factor=30;
-        $this->ytick_factor=25;         
-        switch( $aYDensity ) {
-            case TICKD_DENSE:
-                $this->ytick_factor=12;                 
-                break;
-            case TICKD_NORMAL:
-                $this->ytick_factor=25;                 
-                break;
-            case TICKD_SPARSE:
-                $this->ytick_factor=40;                 
-                break;
-            case TICKD_VERYSPARSE:
-                $this->ytick_factor=100;                        
-                break;          
-            default:
-                JpGraphError::RaiseL(25025,$densy);//("JpGraph: Unsupported Tick density: $densy");
-        }
-        switch( $aXDensity ) {
-            case TICKD_DENSE:
-                $this->xtick_factor=15;                                                 
-                break;
-            case TICKD_NORMAL:
-                $this->xtick_factor=30;                 
-                break;
-            case TICKD_SPARSE:
-                $this->xtick_factor=45;                                 
-                break;
-            case TICKD_VERYSPARSE:
-                $this->xtick_factor=60;                                                         
-                break;          
-            default:
-                JpGraphError::RaiseL(25025,$densx);//("JpGraph: Unsupported Tick density: $densx");
-        }               
-    }
-        
-
-    // Get a string of all image map areas      
+        $this->xtick_factor=30;
+        $this->ytick_factor=25;
+        switch( $aYDensity ) {
+            case TICKD_DENSE:
+                $this->ytick_factor=12;
+                break;
+            case TICKD_NORMAL:
+                $this->ytick_factor=25;
+                break;
+            case TICKD_SPARSE:
+                $this->ytick_factor=40;
+                break;
+            case TICKD_VERYSPARSE:
+                $this->ytick_factor=100;
+                break;
+            default:
+                JpGraphError::RaiseL(25025,$densy);//("JpGraph: Unsupported Tick density: $densy");
+        }
+        switch( $aXDensity ) {
+            case TICKD_DENSE:
+                $this->xtick_factor=15;
+                break;
+            case TICKD_NORMAL:
+                $this->xtick_factor=30;
+                break;
+            case TICKD_SPARSE:
+                $this->xtick_factor=45;
+                break;
+            case TICKD_VERYSPARSE:
+                $this->xtick_factor=60;
+                break;
+            default:
+                JpGraphError::RaiseL(25025,$densx);//("JpGraph: Unsupported Tick density: $densx");
+        }
+    }
+
+
+    // Get a string of all image map areas
     function GetCSIMareas() {
-        if( !$this->iHasStroked )
-            $this->Stroke(_CSIM_SPECIALFILE);
-
-        $csim = $this->title->GetCSIMAreas();
-        $csim .= $this->subtitle->GetCSIMAreas();
-        $csim .= $this->subsubtitle->GetCSIMAreas();
-        $csim .= $this->legend->GetCSIMAreas();
-
-        if( $this->y2axis != NULL ) {
-            $csim .= $this->y2axis->title->GetCSIMAreas();
-        }
-
-        if( $this->texts != null ) {
-            $n = count($this->texts);
-            for($i=0; $i < $n; ++$i ) {
-                $csim .= $this->texts[$i]->GetCSIMAreas();
-            }
-        }
-
-        if( $this->y2texts != null && $this->y2scale != null ) {
-            $n = count($this->y2texts);
-            for($i=0; $i < $n; ++$i ) {
-                $csim .= $this->y2texts[$i]->GetCSIMAreas();
-            }
-        }
-
-        if( $this->yaxis != null && $this->xaxis != null ) {
-            $csim .= $this->yaxis->title->GetCSIMAreas();       
-            $csim .= $this->xaxis->title->GetCSIMAreas();
-        }
-
-        $n = count($this->plots);
-        for( $i=0; $i < $n; ++$i ) 
-            $csim .= $this->plots[$i]->GetCSIMareas();
-
-        $n = count($this->y2plots);
-        for( $i=0; $i < $n; ++$i ) 
-            $csim .= $this->y2plots[$i]->GetCSIMareas();
-
-        $n = count($this->ynaxis);
-        for( $i=0; $i < $n; ++$i ) {
-            $m = count($this->ynplots[$i]); 
-            for($j=0; $j < $m; ++$j ) {
-                $csim .= $this->ynplots[$i][$j]->GetCSIMareas();
-            }
-        }
-
-        $n = count($this->iTables);
-        for( $i=0; $i < $n; ++$i ) {
-            $csim .= $this->iTables[$i]->GetCSIMareas();
-        }
-
-        return $csim;
-    }
-        
+        if( !$this->iHasStroked ) {
+            $this->Stroke(_CSIM_SPECIALFILE);
+        }
+
+        $csim = $this->title->GetCSIMAreas();
+        $csim .= $this->subtitle->GetCSIMAreas();
+        $csim .= $this->subsubtitle->GetCSIMAreas();
+        $csim .= $this->legend->GetCSIMAreas();
+
+        if( $this->y2axis != NULL ) {
+            $csim .= $this->y2axis->title->GetCSIMAreas();
+        }
+
+        if( $this->texts != null ) {
+            $n = count($this->texts);
+            for($i=0; $i < $n; ++$i ) {
+                $csim .= $this->texts[$i]->GetCSIMAreas();
+            }
+        }
+
+        if( $this->y2texts != null && $this->y2scale != null ) {
+            $n = count($this->y2texts);
+            for($i=0; $i < $n; ++$i ) {
+                $csim .= $this->y2texts[$i]->GetCSIMAreas();
+            }
+        }
+
+        if( $this->yaxis != null && $this->xaxis != null ) {
+            $csim .= $this->yaxis->title->GetCSIMAreas();
+            $csim .= $this->xaxis->title->GetCSIMAreas();
+        }
+
+        $n = count($this->plots);
+        for( $i=0; $i < $n; ++$i ) {
+            $csim .= $this->plots[$i]->GetCSIMareas();
+        }
+
+        $n = count($this->y2plots);
+        for( $i=0; $i < $n; ++$i ) {
+            $csim .= $this->y2plots[$i]->GetCSIMareas();
+        }
+
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            $m = count($this->ynplots[$i]);
+            for($j=0; $j < $m; ++$j ) {
+                $csim .= $this->ynplots[$i][$j]->GetCSIMareas();
+            }
+        }
+
+        if($this->iTables != null) {
+            $n = count($this->iTables);
+            for ($i = 0; $i < $n; ++$i) {
+                $csim .= $this->iTables[$i]->GetCSIMareas();
+            }
+        }
+
+        return $csim;
+    }
+
     // Get a complete <MAP>..</MAP> tag for the final image map
     function GetHTMLImageMap($aMapName) {
-        $im = "<map name=\"$aMapName\" id=\"$aMapName\" >\n";
-        $im .= $this->GetCSIMareas();
-        $im .= "</map>"; 
-        return $im;
+        $im = "<map name=\"$aMapName\" id=\"$aMapName\" >\n";
+        $im .= $this->GetCSIMareas();
+        $im .= "</map>";
+        return $im;
     }
 
     function CheckCSIMCache($aCacheName,$aTimeOut=60) {
-        global $_SERVER;
-
-        if( $aCacheName=='auto' )
-            $aCacheName=basename($_SERVER['PHP_SELF']);
-
-        $urlarg = $this->GetURLArguments();
-        $this->csimcachename = CSIMCACHE_DIR.$aCacheName.$urlarg;
-        $this->csimcachetimeout = $aTimeOut;
-
-        // First determine if we need to check for a cached version
-        // This differs from the standard cache in the sense that the
-        // image and CSIM map HTML file is written relative to the directory
-        // the script executes in and not the specified cache directory.
-        // The reason for this is that the cache directory is not necessarily
-        // accessible from the HTTP server.
-        if( $this->csimcachename != '' ) {
-            $dir = dirname($this->csimcachename);
-            $base = basename($this->csimcachename);
-            $base = strtok($base,'.');
-            $suffix = strtok('.');
-            $basecsim = $dir.'/'.$base.'?'.$urlarg.'_csim_.html';
-            $baseimg = $dir.'/'.$base.'?'.$urlarg.'.'.$this->img->img_format;
-
-            $timedout=false;
-            // Does it exist at all ?
-            
-            if( file_exists($basecsim) && file_exists($baseimg) ) {
-                // Check that it hasn't timed out
-                $diff=time()-filemtime($basecsim);
-                if( $this->csimcachetimeout>0 && ($diff > $this->csimcachetimeout*60) ) {
-                    $timedout=true;
-                    @unlink($basecsim);
-                    @unlink($baseimg);
-                }
-                else {
-                    if ($fh = @fopen($basecsim, "r")) {
-                        fpassthru($fh);
-                        return true;
-                    }
-                    else
-                        JpGraphError::RaiseL(25027,$basecsim);//(" Can't open cached CSIM \"$basecsim\" for reading.");
-                }
-            }
-        }
-        return false;
+        global $_SERVER;
+
+        if( $aCacheName=='auto' ) {
+            $aCacheName=basename($_SERVER['PHP_SELF']);
+        }
+
+        $urlarg = $this->GetURLArguments();
+        $this->csimcachename = CSIMCACHE_DIR.$aCacheName.$urlarg;
+        $this->csimcachetimeout = $aTimeOut;
+
+        // First determine if we need to check for a cached version
+        // This differs from the standard cache in the sense that the
+        // image and CSIM map HTML file is written relative to the directory
+        // the script executes in and not the specified cache directory.
+        // The reason for this is that the cache directory is not necessarily
+        // accessible from the HTTP server.
+        if( $this->csimcachename != '' ) {
+            $dir = dirname($this->csimcachename);
+            $base = basename($this->csimcachename);
+            $base = strtok($base,'.');
+            $suffix = strtok('.');
+            $basecsim = $dir.'/'.$base.'?'.$urlarg.'_csim_.html';
+            $baseimg = $dir.'/'.$base.'?'.$urlarg.'.'.$this->img->img_format;
+
+            $timedout=false;
+            // Does it exist at all ?
+
+            if( file_exists($basecsim) && file_exists($baseimg) ) {
+                // Check that it hasn't timed out
+                $diff=time()-filemtime($basecsim);
+                if( $this->csimcachetimeout>0 && ($diff > $this->csimcachetimeout*60) ) {
+                    $timedout=true;
+                    @unlink($basecsim);
+                    @unlink($baseimg);
+                }
+                else {
+                    if ($fh = @fopen($basecsim, "r")) {
+                        fpassthru($fh);
+                        return true;
+                    }
+                    else {
+                        JpGraphError::RaiseL(25027,$basecsim);//(" Can't open cached CSIM \"$basecsim\" for reading.");
+                    }
+                }
+            }
+        }
+        return false;
     }
 
     // Build the argument string to be used with the csim images
-    function GetURLArguments() {
-                
-        // This is a JPGRAPH internal defined that prevents
-        // us from recursively coming here again
-        $urlarg = _CSIM_DISPLAY.'=1';
-
-        // Now reconstruct any user URL argument
-        reset($_GET);
-        while( list($key,$value) = each($_GET) ) {
-            if( is_array($value) ) {
-                foreach ( $value as $k => $v ) {
-                    $urlarg .= '&amp;'.$key.'%5B'.$k.'%5D='.urlencode($v);
-                }
-            }
-            else {
-                $urlarg .= '&amp;'.$key.'='.urlencode($value);
-            }
-        }
-
-        // It's not ideal to convert POST argument to GET arguments
-        // but there is little else we can do. One idea for the 
-        // future might be recreate the POST header in case.
-        reset($_POST);
-        while( list($key,$value) = each($_POST) ) {
-            if( is_array($value) ) {
-                foreach ( $value as $k => $v ) {
-                    $urlarg .= '&amp;'.$key.'%5B'.$k.'%5D='.urlencode($v);
-                }
-            }
-            else {
-                $urlarg .= '&amp;'.$key.'='.urlencode($value);
-            }
-        }
-
-        return $urlarg;
+    static function GetURLArguments($aAddRecursiveBlocker=false) {
+
+        if( $aAddRecursiveBlocker ) {
+            // This is a JPGRAPH internal defined that prevents
+            // us from recursively coming here again
+            $urlarg = _CSIM_DISPLAY.'=1';
+        }
+
+        // Now reconstruct any user URL argument
+        reset($_GET);
+        foreach ($_GET as $key => $value) {
+            if( is_array($value) ) {
+                foreach ( $value as $k => $v ) {
+                    $urlarg .= '&amp;'.$key.'%5B'.$k.'%5D='.urlencode($v);
+                }
+            }
+            else {
+                $urlarg .= '&amp;'.$key.'='.urlencode($value);
+            }
+        }
+
+        // It's not ideal to convert POST argument to GET arguments
+        // but there is little else we can do. One idea for the
+        // future might be recreate the POST header in case.
+        reset($_POST);
+        foreach ($_POST as $key => $value) {
+            if( is_array($value) ) {
+                foreach ( $value as $k => $v ) {
+                    $urlarg .= '&amp;'.$key.'%5B'.$k.'%5D='.urlencode($v);
+                }
+            }
+            else {
+                $urlarg .= '&amp;'.$key.'='.urlencode($value);
+            }
+        }
+
+        return $urlarg;
     }
 
     function SetCSIMImgAlt($aAlt) {
-        $this->iCSIMImgAlt = $aAlt;
+        $this->iCSIMImgAlt = $aAlt;
     }
 
     function StrokeCSIM($aScriptName='auto',$aCSIMName='',$aBorder=0) {
-        if( $aCSIMName=='' ) {
-            // create a random map name
-            srand ((double) microtime() * 1000000);
-            $r = rand(0,100000);
-            $aCSIMName='__mapname'.$r.'__';
-        }
-
-        if( $aScriptName=='auto' )
-            $aScriptName=basename($_SERVER['PHP_SELF']);
-
-        $urlarg = $this->GetURLArguments();
-
-        if( empty($_GET[_CSIM_DISPLAY]) ) {
-            // First determine if we need to check for a cached version
-            // This differs from the standard cache in the sense that the
-            // image and CSIM map HTML file is written relative to the directory
-            // the script executes in and not the specified cache directory.
-            // The reason for this is that the cache directory is not necessarily
-            // accessible from the HTTP server.
-            if( $this->csimcachename != '' ) {
-                $dir = dirname($this->csimcachename);
-                $base = basename($this->csimcachename);
-                $base = strtok($base,'.');
-                $suffix = strtok('.');
-                $basecsim = $dir.'/'.$base.'?'.$urlarg.'_csim_.html';
-                $baseimg = $base.'?'.$urlarg.'.'.$this->img->img_format;
-
-                // Check that apache can write to directory specified
-
-                if( file_exists($dir) && !is_writeable($dir) ) {
-                    JpgraphError::RaiseL(25028,$dir);//('Apache/PHP does not have permission to write to the CSIM cache directory ('.$dir.'). Check permissions.');
-                }
-                
-                // Make sure directory exists
-                $this->cache->MakeDirs($dir);
-
-                // Write the image file
-                $this->Stroke(CSIMCACHE_DIR.$baseimg);
-
-                // Construct wrapper HTML and write to file and send it back to browser
-
-                // In the src URL we must replace the '?' with its encoding to prevent the arguments
-                // to be converted to real arguments.
-                $tmp = str_replace('?','%3f',$baseimg);
-                $htmlwrap = $this->GetHTMLImageMap($aCSIMName)."\n".
-                    '<img src="'.CSIMCACHE_HTTP_DIR.$tmp.'" ismap="ismap" usemap="#'.$aCSIMName.'" border="'.$aBorder.'" width="'.$this->img->width.'" height="'.$this->img->height."\" alt=\"".$this->iCSIMImgAlt."\" />\n";
-
-                if($fh =  @fopen($basecsim,'w') ) {
-                    fwrite($fh,$htmlwrap);
-                    fclose($fh);
-                    echo $htmlwrap;
-                }
-                else
-                    JpGraphError::RaiseL(25029,$basecsim);//(" Can't write CSIM \"$basecsim\" for writing. Check free space and permissions.");
-            }
-            else {
-
-                if( $aScriptName=='' ) {
-                    JpGraphError::RaiseL(25030);//('Missing script name in call to StrokeCSIM(). You must specify the name of the actual image script as the first parameter to StrokeCSIM().');
-                }
-                echo $this->GetHTMLImageMap($aCSIMName);
-                echo "<img src=\"".$aScriptName.'?'.$urlarg."\" ismap=\"ismap\" usemap=\"#".$aCSIMName.'" border="'.$aBorder.'" width="'.$this->img->width.'" height="'.$this->img->height."\" alt=\"".$this->iCSIMImgAlt."\" />\n";
-            }
-        }
-        else {
-            $this->Stroke();
-        }
+        if( $aCSIMName=='' ) {
+            // create a random map name
+            srand ((double) microtime() * 1000000);
+            $r = rand(0,100000);
+            $aCSIMName='__mapname'.$r.'__';
+        }
+
+        if( $aScriptName=='auto' ) {
+            $aScriptName=basename($_SERVER['PHP_SELF']);
+        }
+
+        $urlarg = $this->GetURLArguments(true);
+
+        if( empty($_GET[_CSIM_DISPLAY]) ) {
+            // First determine if we need to check for a cached version
+            // This differs from the standard cache in the sense that the
+            // image and CSIM map HTML file is written relative to the directory
+            // the script executes in and not the specified cache directory.
+            // The reason for this is that the cache directory is not necessarily
+            // accessible from the HTTP server.
+            if( $this->csimcachename != '' ) {
+                $dir = dirname($this->csimcachename);
+                $base = basename($this->csimcachename);
+                $base = strtok($base,'.');
+                $suffix = strtok('.');
+                $basecsim = $dir.'/'.$base.'?'.$urlarg.'_csim_.html';
+                $baseimg = $base.'?'.$urlarg.'.'.$this->img->img_format;
+
+                // Check that apache can write to directory specified
+
+                if( file_exists($dir) && !is_writeable($dir) ) {
+                    JpgraphError::RaiseL(25028,$dir);//('Apache/PHP does not have permission to write to the CSIM cache directory ('.$dir.'). Check permissions.');
+                }
+
+                // Make sure directory exists
+                $this->cache->MakeDirs($dir);
+
+                // Write the image file
+                $this->Stroke(CSIMCACHE_DIR.$baseimg);
+
+                // Construct wrapper HTML and write to file and send it back to browser
+
+                // In the src URL we must replace the '?' with its encoding to prevent the arguments
+                // to be converted to real arguments.
+                $tmp = str_replace('?','%3f',$baseimg);
+                $htmlwrap = $this->GetHTMLImageMap($aCSIMName)."\n".
+                            '<img src="'.CSIMCACHE_HTTP_DIR.$tmp.'" ismap="ismap" usemap="#'.$aCSIMName.' width="'.$this->img->width.'" height="'.$this->img->height."\" alt=\"".$this->iCSIMImgAlt."\" />\n";
+
+                if($fh =  @fopen($basecsim,'w') ) {
+                    fwrite($fh,$htmlwrap);
+                    fclose($fh);
+                    echo $htmlwrap;
+                }
+                else {
+                    JpGraphError::RaiseL(25029,$basecsim);//(" Can't write CSIM \"$basecsim\" for writing. Check free space and permissions.");
+                }
+            }
+            else {
+
+                if( $aScriptName=='' ) {
+                    JpGraphError::RaiseL(25030);//('Missing script name in call to StrokeCSIM(). You must specify the name of the actual image script as the first parameter to StrokeCSIM().');
+                }
+                echo $this->GetHTMLImageMap($aCSIMName) . $this->GetCSIMImgHTML($aCSIMName, $aScriptName, $aBorder);
+            }
+        }
+        else {
+            $this->Stroke();
+        }
+    }
+
+    function StrokeCSIMImage() {
+        if( @$_GET[_CSIM_DISPLAY] == 1 ) {
+            $this->Stroke();
+        }
+    }
+
+    function GetCSIMImgHTML($aCSIMName, $aScriptName='auto', $aBorder=0 ) {
+        if( $aScriptName=='auto' ) {
+            $aScriptName=basename($_SERVER['PHP_SELF']);
+        }
+        $urlarg = $this->GetURLArguments(true);
+        return "<img src=\"".$aScriptName.'?'.$urlarg."\" ismap=\"ismap\" usemap=\"#".$aCSIMName.'" height="'.$this->img->height."\" alt=\"".$this->iCSIMImgAlt."\" />\n";
     }
 
     function GetTextsYMinMax($aY2=false) {
-        if( $aY2 ) 
-            $txts = $this->y2texts;
-        else
-            $txts = $this->texts;
-        $n = count($txts);
-        $min=null;
-        $max=null;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $txts[$i]->iScalePosY !== null && 
-                $txts[$i]->iScalePosX !== null  ) {
-                if( $min === null  ) {
-                    $min = $max = $txts[$i]->iScalePosY ;
-                }
-                else {
-                    $min = min($min,$txts[$i]->iScalePosY);
-                    $max = max($max,$txts[$i]->iScalePosY);
-                }
-            }
-        }
-        if( $min !== null ) {
-            return array($min,$max);
-        }
-        else
-            return null;
+        if( $aY2 ) {
+            $txts = $this->y2texts;
+        }
+        else {
+            $txts = $this->texts;
+        }
+        $n = is_array($txts) ? count($txts) : 0;
+        $min=null;
+        $max=null;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $txts[$i]->iScalePosY !== null && $txts[$i]->iScalePosX !== null  ) {
+                if( $min === null  ) {
+                    $min = $max = $txts[$i]->iScalePosY ;
+                }
+                else {
+                    $min = min($min,$txts[$i]->iScalePosY);
+                    $max = max($max,$txts[$i]->iScalePosY);
+                }
+            }
+        }
+        if( $min !== null ) {
+            return array($min,$max);
+        }
+        else {
+            return null;
+        }
     }
 
     function GetTextsXMinMax($aY2=false) {
-        if( $aY2 ) 
-            $txts = $this->y2texts;
-        else
-            $txts = $this->texts;
-        $n = count($txts);
-        $min=null;
-        $max=null;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $txts[$i]->iScalePosY !== null && 
-                $txts[$i]->iScalePosX !== null  ) {
-                if( $min === null  ) {
-                    $min = $max = $txts[$i]->iScalePosX ;
-                }
-                else {
-                    $min = min($min,$txts[$i]->iScalePosX);
-                    $max = max($max,$txts[$i]->iScalePosX);
-                }
-            }
-        }
-        if( $min !== null ) {
-            return array($min,$max);
-        }
-        else
-            return null;
+        if( $aY2 ) {
+            $txts = $this->y2texts;
+        }
+        else {
+            $txts = $this->texts;
+        }
+        $n = is_array($txts) ? count($txts) : 0;
+        $min=null;
+        $max=null;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $txts[$i]->iScalePosY !== null && $txts[$i]->iScalePosX !== null  ) {
+                if( $min === null  ) {
+                    $min = $max = $txts[$i]->iScalePosX ;
+                }
+                else {
+                    $min = min($min,$txts[$i]->iScalePosX);
+                    $max = max($max,$txts[$i]->iScalePosX);
+                }
+            }
+        }
+        if( $min !== null ) {
+            return array($min,$max);
+        }
+        else {
+            return null;
+        }
     }
 
     function GetXMinMax() {
-        list($min,$ymin) = $this->plots[0]->Min();
-        list($max,$ymax) = $this->plots[0]->Max();
-        foreach( $this->plots as $p ) {
-            list($xmin,$ymin) = $p->Min();
-            list($xmax,$ymax) = $p->Max();                      
-            $min = Min($xmin,$min);
-            $max = Max($xmax,$max);
-        }
-
-        if( $this->y2axis != null ) {
-            foreach( $this->y2plots as $p ) {
-                list($xmin,$ymin) = $p->Min();
-                        list($xmax,$ymax) = $p->Max();                  
-                        $min = Min($xmin,$min);
-                        $max = Max($xmax,$max);
-            }               
-        }
-
-        $n = count($this->ynaxis);
-        for( $i=0; $i < $n; ++$i ) {
-            if( $this->ynaxis[$i] != null) {
-                foreach( $this->ynplots[$i] as $p ) {
-                    list($xmin,$ymin) = $p->Min();
-                    list($xmax,$ymax) = $p->Max();                      
-                    $min = Min($xmin,$min);
-                    $max = Max($xmax,$max);
-                }                   
-            }
-        }
-        return array($min,$max);
+
+        list($min,$ymin) = $this->plots[0]->Min();
+        list($max,$ymax) = $this->plots[0]->Max();
+
+        $i=0;
+        // Some plots, e.g. PlotLine should not affect the scale
+        // and will return (null,null). We should ignore those
+        // values.
+        while( ($min===null || $max === null) && ($i < count($this->plots)-1) ) {
+            ++$i;
+            list($min,$ymin) = $this->plots[$i]->Min();
+            list($max,$ymax) = $this->plots[$i]->Max();
+        }
+
+        foreach( $this->plots as $p ) {
+            list($xmin,$ymin) = $p->Min();
+            list($xmax,$ymax) = $p->Max();
+
+            if( $xmin !== null && $xmax !== null ) {
+                $min = Min($xmin,$min);
+                $max = Max($xmax,$max);
+            }
+        }
+
+        if( $this->y2axis != null ) {
+            foreach( $this->y2plots as $p ) {
+                list($xmin,$ymin) = $p->Min();
+                list($xmax,$ymax) = $p->Max();
+                if( $xmin !== null && $xmax !== null ) {
+                    $min = Min($xmin, $min);
+                    $max = Max($xmax, $max);
+                }
+            }
+        }
+
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            if( $this->ynaxis[$i] != null) {
+                foreach( $this->ynplots[$i] as $p ) {
+                    list($xmin,$ymin) = $p->Min();
+                    list($xmax,$ymax) = $p->Max();
+                    if( $xmin !== null && $xmax !== null ) {
+                        $min = Min($xmin, $min);
+                        $max = Max($xmax, $max);
+                    }
+                }
+            }
+        }
+        return array($min,$max);
     }
 
     function AdjustMarginsForTitles() {
-        $totrequired = 
-            ($this->title->t != '' ? 
-             $this->title->GetTextHeight($this->img) + $this->title->margin + 5 : 0 ) +
-            ($this->subtitle->t != '' ? 
-             $this->subtitle->GetTextHeight($this->img) + $this->subtitle->margin + 5 : 0 ) + 
-            ($this->subsubtitle->t != '' ? 
-             $this->subsubtitle->GetTextHeight($this->img) + $this->subsubtitle->margin + 5 : 0 ) ;
-        
-
-        $btotrequired = 0;
-        if($this->xaxis != null &&  !$this->xaxis->hide && !$this->xaxis->hide_labels ) {
-            // Minimum bottom margin
-            if( $this->xaxis->title->t != '' ) {
-                if( $this->img->a == 90 ) 
-                    $btotrequired = $this->yaxis->title->GetTextHeight($this->img) + 5 ;
-                else
-                    $btotrequired = $this->xaxis->title->GetTextHeight($this->img) + 5 ;
-            }
-            else
-                $btotrequired = 0;
-            
-            if( $this->img->a == 90 ) {
-                $this->img->SetFont($this->yaxis->font_family,$this->yaxis->font_style,
-                                    $this->yaxis->font_size);
-                $lh = $this->img->GetTextHeight('Mg',$this->yaxis->label_angle);
-            }
-            else {
-                $this->img->SetFont($this->xaxis->font_family,$this->xaxis->font_style,
-                                    $this->xaxis->font_size);
-                $lh = $this->img->GetTextHeight('Mg',$this->xaxis->label_angle);
-            }
-            
-            $btotrequired += $lh + 5;
-        }
-
-        if( $this->img->a == 90 ) {
-            // DO Nothing. It gets too messy to do this properly for 90 deg...
-        }
-        else{
-            if( $this->img->top_margin < $totrequired ) {
-                $this->SetMargin($this->img->left_margin,$this->img->right_margin,
-                                 $totrequired,$this->img->bottom_margin);
-            }
-            if( $this->img->bottom_margin < $btotrequired ) {
-                $this->SetMargin($this->img->left_margin,$this->img->right_margin,
-                                 $this->img->top_margin,$btotrequired);
-            }
-        }
-    }
+        $totrequired = 
+            ($this->title->t != '' 
+                ? $this->title->GetTextHeight($this->img) + $this->title->margin + 5 * SUPERSAMPLING_SCALE
+                : 0 ) +
+            ($this->subtitle->t != '' 
+                ? $this->subtitle->GetTextHeight($this->img) + $this->subtitle->margin + 5 * SUPERSAMPLING_SCALE
+                : 0 ) +
+            ($this->subsubtitle->t != '' 
+                ? $this->subsubtitle->GetTextHeight($this->img) + $this->subsubtitle->margin + 5 * SUPERSAMPLING_SCALE
+                : 0 ) ;
+
+        $btotrequired = 0;
+        if($this->xaxis != null &&  !$this->xaxis->hide && !$this->xaxis->hide_labels ) {
+            // Minimum bottom margin
+            if( $this->xaxis->title->t != '' ) {
+                if( $this->img->a == 90 ) {
+                    $btotrequired = $this->yaxis->title->GetTextHeight($this->img) + 7 ;
+                }
+                else {
+                    $btotrequired = $this->xaxis->title->GetTextHeight($this->img) + 7 ;
+                }
+            }
+            else {
+                $btotrequired = 0;
+            }
+
+            if( $this->img->a == 90 ) {
+                $this->img->SetFont($this->yaxis->font_family,$this->yaxis->font_style,
+                $this->yaxis->font_size);
+                $lh = $this->img->GetTextHeight('Mg',$this->yaxis->label_angle);
+            }
+            else {
+                $this->img->SetFont($this->xaxis->font_family,$this->xaxis->font_style,
+                $this->xaxis->font_size);
+                $lh = $this->img->GetTextHeight('Mg',$this->xaxis->label_angle);
+            }
+
+            $btotrequired += $lh + 6;
+        }
+
+        if( $this->img->a == 90 ) {
+            // DO Nothing. It gets too messy to do this properly for 90 deg...
+        }
+        else{
+            // need more top margin
+            if( $this->img->top_margin < $totrequired ) {
+                $this->SetMargin(
+                    $this->img->raw_left_margin,
+                    $this->img->raw_right_margin,
+                    $totrequired / SUPERSAMPLING_SCALE, 
+                    $this->img->raw_bottom_margin
+                );
+            }
+
+            // need more bottom margin
+            if( $this->img->bottom_margin < $btotrequired ) {
+                $this->SetMargin(
+                    $this->img->raw_left_margin,
+                    $this->img->raw_right_margin,
+                    $this->img->raw_top_margin,
+                    $btotrequired / SUPERSAMPLING_SCALE
+                );
+            }
+        }
+    }
+
+    function StrokeStore($aStrokeFileName) {
+        // Get the handler to prevent the library from sending the
+        // image to the browser
+        $ih = $this->Stroke(_IMG_HANDLER);
+
+        // Stroke it to a file
+        $this->img->Stream($aStrokeFileName);
+
+        // Send it back to browser
+        $this->img->Headers();
+        $this->img->Stream();
+    }
+
+    function doAutoscaleXAxis() {
+    //Check if we should autoscale x-axis
+        if( !$this->xscale->IsSpecified() ) {
+            if( substr($this->axtype,0,4) == "text" ) {
+                $max=0;
+                $n = count($this->plots);
+                for($i=0; $i < $n; ++$i ) {
+                    $p = $this->plots[$i];
+                    // We need some unfortunate sub class knowledge here in order
+                    // to increase number of data points in case it is a line plot
+                    // which has the barcenter set. If not it could mean that the
+                    // last point of the data is outside the scale since the barcenter
+                    // settings means that we will shift the entire plot half a tick step
+                    // to the right in oder to align with the center of the bars.
+                    if( class_exists('BarPlot',false) ) {
+                        $cl = strtolower(get_class($p));
+                        if( (class_exists('BarPlot',false) && ($p instanceof BarPlot)) || empty($p->barcenter) ) {
+                            $max=max($max,$p->numpoints-1);
+                        }
+                        else {
+                            $max=max($max,$p->numpoints);
+                        }
+                    }
+                    else {
+                        if( empty($p->barcenter) ) {
+                            $max=max($max,$p->numpoints-1);
+                        }
+                        else {
+                            $max=max($max,$p->numpoints);
+                        }
+                    }
+                }
+                $min=0;
+                if( $this->y2axis != null ) {
+                    foreach( $this->y2plots as $p ) {
+                        $max=max($max,$p->numpoints-1);
+                    }
+                }
+                $n = count($this->ynaxis);
+                for( $i=0; $i < $n; ++$i ) {
+                    if( $this->ynaxis[$i] != null) {
+                        foreach( $this->ynplots[$i] as $p ) {
+                            $max=max($max,$p->numpoints-1);
+                        }
+                    }
+                }
+
+                $this->xscale->Update($this->img,$min,$max);
+                $this->xscale->ticks->Set($this->xaxis->tick_step,1);
+                $this->xscale->ticks->SupressMinorTickMarks();
+            }
+            else {
+                list($min,$max) = $this->GetXMinMax();
+
+                $lres = $this->GetLinesXMinMax($this->lines);
+                if( $lres ) {
+                    list($linmin,$linmax) = $lres ;
+                    $min = min($min,$linmin);
+                    $max = max($max,$linmax);
+                }
+
+                $lres = $this->GetLinesXMinMax($this->y2lines);
+                if( $lres ) {
+                    list($linmin,$linmax) = $lres ;
+                    $min = min($min,$linmin);
+                    $max = max($max,$linmax);
+                }
+
+                $tres = $this->GetTextsXMinMax();
+                if( $tres ) {
+                    list($tmin,$tmax) = $tres ;
+                    $min = min($min,$tmin);
+                    $max = max($max,$tmax);
+                }
+
+                $tres = $this->GetTextsXMinMax(true);
+                if( $tres ) {
+                    list($tmin,$tmax) = $tres ;
+                    $min = min($min,$tmin);
+                    $max = max($max,$tmax);
+                }
+
+                $this->xscale->AutoScale($this->img,$min,$max,round($this->img->plotwidth/$this->xtick_factor));
+            }
+
+            //Adjust position of y-axis and y2-axis to minimum/maximum of x-scale
+            if( !is_numeric($this->yaxis->pos) && !is_string($this->yaxis->pos) ) {
+                $this->yaxis->SetPos($this->xscale->GetMinVal());
+            }
+        }
+        elseif( $this->xscale->IsSpecified() &&
+                ( $this->xscale->auto_ticks || !$this->xscale->ticks->IsSpecified()) ) {
+            // The tick calculation will use the user suplied min/max values to determine
+            // the ticks. If auto_ticks is false the exact user specifed min and max
+            // values will be used for the scale.
+            // If auto_ticks is true then the scale might be slightly adjusted
+            // so that the min and max values falls on an even major step.
+            $min = $this->xscale->scale[0];
+            $max = $this->xscale->scale[1];
+            $this->xscale->AutoScale($this->img,$min,$max,round($this->img->plotwidth/$this->xtick_factor),false);
+
+            // Now make sure we show enough precision to accurate display the
+            // labels. If this is not done then the user might end up with
+            // a scale that might actually start with, say 13.5, butdue to rounding
+            // the scale label will ony show 14.
+            if( abs(floor($min)-$min) > 0 ) {
+
+                // If the user has set a format then we bail out
+                if( $this->xscale->ticks->label_formatstr == '' && $this->xscale->ticks->label_dateformatstr == '' ) {
+                    $this->xscale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
+                }
+            }
+        }
+
+        // Position the optional Y2 and Yn axis to the rightmost position of the x-axis
+        if( $this->y2axis != null ) {
+            if( !is_numeric($this->y2axis->pos) && !is_string($this->y2axis->pos) ) {
+                $this->y2axis->SetPos($this->xscale->GetMaxVal());
+            }
+            $this->y2axis->SetTitleSide(SIDE_RIGHT);
+        }
+
+        $n = count($this->ynaxis);
+        $nY2adj = $this->y2axis != null ? $this->iYAxisDeltaPos : 0;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $this->ynaxis[$i] != null ) {
+                if( !is_numeric($this->ynaxis[$i]->pos) && !is_string($this->ynaxis[$i]->pos) ) {
+                    $this->ynaxis[$i]->SetPos($this->xscale->GetMaxVal());
+                    $this->ynaxis[$i]->SetPosAbsDelta($i*$this->iYAxisDeltaPos + $nY2adj);
+                }
+                $this->ynaxis[$i]->SetTitleSide(SIDE_RIGHT);
+            }
+        }
+    }
+
+
+    function doAutoScaleYnAxis() {
+
+        if( $this->y2scale != null) {
+            if( !$this->y2scale->IsSpecified() && count($this->y2plots)>0 ) {
+                list($min,$max) = $this->GetPlotsYMinMax($this->y2plots);
+
+                $lres = $this->GetLinesYMinMax($this->y2lines);
+                if( is_array($lres) ) {
+                    list($linmin,$linmax) = $lres ;
+                    $min = min($min,$linmin);
+                    $max = max($max,$linmax);
+                }
+                $tres = $this->GetTextsYMinMax(true);
+                if( is_array($tres) ) {
+                    list($tmin,$tmax) = $tres ;
+                    $min = min($min,$tmin);
+                    $max = max($max,$tmax);
+                }
+                $this->y2scale->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
+            }
+            elseif( $this->y2scale->IsSpecified() && ( $this->y2scale->auto_ticks || !$this->y2scale->ticks->IsSpecified()) ) {
+                // The tick calculation will use the user suplied min/max values to determine
+                // the ticks. If auto_ticks is false the exact user specifed min and max
+                // values will be used for the scale.
+                // If auto_ticks is true then the scale might be slightly adjusted
+                // so that the min and max values falls on an even major step.
+                $min = $this->y2scale->scale[0];
+                $max = $this->y2scale->scale[1];
+                $this->y2scale->AutoScale($this->img,$min,$max,
+                $this->img->plotheight/$this->ytick_factor,
+                $this->y2scale->auto_ticks);
+
+                // Now make sure we show enough precision to accurate display the
+                // labels. If this is not done then the user might end up with
+                // a scale that might actually start with, say 13.5, butdue to rounding
+                // the scale label will ony show 14.
+                if( abs(floor($min)-$min) > 0 ) {
+                    // If the user has set a format then we bail out
+                    if( $this->y2scale->ticks->label_formatstr == '' && $this->y2scale->ticks->label_dateformatstr == '' ) {
+                        $this->y2scale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
+                    }
+                }
+
+            }
+        }
+
+
+        //
+        // Autoscale the extra Y-axises
+        //
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            if( $this->ynscale[$i] != null) {
+                if( !$this->ynscale[$i]->IsSpecified() && count($this->ynplots[$i])>0 ) {
+                    list($min,$max) = $this->GetPlotsYMinMax($this->ynplots[$i]);
+                    $this->ynscale[$i]->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
+                }
+                elseif( $this->ynscale[$i]->IsSpecified() && ( $this->ynscale[$i]->auto_ticks || !$this->ynscale[$i]->ticks->IsSpecified()) ) {
+                    // The tick calculation will use the user suplied min/max values to determine
+                    // the ticks. If auto_ticks is false the exact user specifed min and max
+                    // values will be used for the scale.
+                    // If auto_ticks is true then the scale might be slightly adjusted
+                    // so that the min and max values falls on an even major step.
+                    $min = $this->ynscale[$i]->scale[0];
+                    $max = $this->ynscale[$i]->scale[1];
+                    $this->ynscale[$i]->AutoScale($this->img,$min,$max,
+                    $this->img->plotheight/$this->ytick_factor,
+                    $this->ynscale[$i]->auto_ticks);
+
+                    // Now make sure we show enough precision to accurate display the
+                    // labels. If this is not done then the user might end up with
+                    // a scale that might actually start with, say 13.5, butdue to rounding
+                    // the scale label will ony show 14.
+                    if( abs(floor($min)-$min) > 0 ) {
+                        // If the user has set a format then we bail out
+                        if( $this->ynscale[$i]->ticks->label_formatstr == '' && $this->ynscale[$i]->ticks->label_dateformatstr == '' ) {
+                            $this->ynscale[$i]->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    function doAutoScaleYAxis() {
+
+        //Check if we should autoscale y-axis
+        if( !$this->yscale->IsSpecified() && count($this->plots)>0 ) {
+            list($min,$max) = $this->GetPlotsYMinMax($this->plots);
+            $lres = $this->GetLinesYMinMax($this->lines);
+            if( is_array($lres) ) {
+                list($linmin,$linmax) = $lres ;
+                $min = min($min,$linmin);
+                $max = max($max,$linmax);
+            }
+            $tres = $this->GetTextsYMinMax();
+            if( is_array($tres) ) {
+                list($tmin,$tmax) = $tres ;
+                $min = min($min,$tmin);
+                $max = max($max,$tmax);
+            }
+            $this->yscale->AutoScale($this->img,$min,$max,
+            $this->img->plotheight/$this->ytick_factor);
+        }
+        elseif( $this->yscale->IsSpecified() && ( $this->yscale->auto_ticks || !$this->yscale->ticks->IsSpecified()) ) {
+            // The tick calculation will use the user suplied min/max values to determine
+            // the ticks. If auto_ticks is false the exact user specifed min and max
+            // values will be used for the scale.
+            // If auto_ticks is true then the scale might be slightly adjusted
+            // so that the min and max values falls on an even major step.
+            $min = $this->yscale->scale[0];
+            $max = $this->yscale->scale[1];
+            $this->yscale->AutoScale($this->img,$min,$max,
+            $this->img->plotheight/$this->ytick_factor,
+            $this->yscale->auto_ticks);
+
+            // Now make sure we show enough precision to accurate display the
+            // labels. If this is not done then the user might end up with
+            // a scale that might actually start with, say 13.5, butdue to rounding
+            // the scale label will ony show 14.
+            if( abs(floor($min)-$min) > 0 ) {
+
+                // If the user has set a format then we bail out
+                if( $this->yscale->ticks->label_formatstr == '' && $this->yscale->ticks->label_dateformatstr == '' ) {
+                    $this->yscale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
+                }
+            }
+        }
+
+    }
+
+    function InitScaleConstants() {
+        // Setup scale constants
+        if( $this->yscale ) $this->yscale->InitConstants($this->img);
+        if( $this->xscale ) $this->xscale->InitConstants($this->img);
+        if( $this->y2scale ) $this->y2scale->InitConstants($this->img);
+
+        $n=count($this->ynscale);
+        for($i=0; $i < $n; ++$i) {
+            if( $this->ynscale[$i] ) {
+                $this->ynscale[$i]->InitConstants($this->img);
+            }
+        }
+    }
+
+    function doPrestrokeAdjustments() {
+
+        // Do any pre-stroke adjustment that is needed by the different plot types
+        // (i.e bar plots want's to add an offset to the x-labels etc)
+        for($i=0; $i < count($this->plots) ; ++$i ) {
+            $this->plots[$i]->PreStrokeAdjust($this);
+            $this->plots[$i]->DoLegend($this);
+        }
+
+        // Any plots on the second Y scale?
+        if( $this->y2scale != null ) {
+            for($i=0; $i<count($this->y2plots) ; ++$i ) {
+                $this->y2plots[$i]->PreStrokeAdjust($this);
+                $this->y2plots[$i]->DoLegend($this);
+            }
+        }
+
+        // Any plots on the extra Y axises?
+        $n = count($this->ynaxis);
+        for($i=0; $i<$n ; ++$i ) {
+            if( $this->ynplots == null || $this->ynplots[$i] == null) {
+                JpGraphError::RaiseL(25032,$i);//("No plots for Y-axis nbr:$i");
+            }
+            $m = count($this->ynplots[$i]);
+            for($j=0; $j < $m; ++$j ) {
+                $this->ynplots[$i][$j]->PreStrokeAdjust($this);
+                $this->ynplots[$i][$j]->DoLegend($this);
+            }
+        }
+    }
+
+    function StrokeBands($aDepth,$aCSIM) {
+    // Stroke bands
+        if( $this->bands != null && !$aCSIM) {
+            for($i=0; $i < count($this->bands); ++$i) {
+            // Stroke all bands that asks to be in the background
+                if( $this->bands[$i]->depth == $aDepth ) {
+                    $this->bands[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+                }
+            }
+        }
+
+        if( $this->y2bands != null && $this->y2scale != null && !$aCSIM ) {
+            for($i=0; $i < count($this->y2bands); ++$i) {
+            // Stroke all bands that asks to be in the foreground
+                if( $this->y2bands[$i]->depth == $aDepth ) {
+                    $this->y2bands[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+                }
+            }
+        }
+    }
+
 
     // Stroke the graph
-    // $aStrokeFileName If != "" the image will be written to this file and NOT
+    // $aStrokeFileName If != "" the image will be written to this file and NOT
     // streamed back to the browser
-    function Stroke($aStrokeFileName="") {              
-
-        // Fist make a sanity check that user has specified a scale
-        if( empty($this->yscale) ) {
-            JpGraphError::RaiseL(25031);//('You must specify what scale to use with a call to Graph::SetScale().');
-        }
-
-        // Start by adjusting the margin so that potential titles will fit.
-        $this->AdjustMarginsForTitles();
-
-        // Setup scale constants
-        if( $this->yscale ) $this->yscale->InitConstants($this->img);
-        if( $this->xscale ) $this->xscale->InitConstants($this->img);
-        if( $this->y2scale ) $this->y2scale->InitConstants($this->img);
-        
-        $n=count($this->ynscale);
-        for($i=0; $i < $n; ++$i) {
-          if( $this->ynscale[$i] ) $this->ynscale[$i]->InitConstants($this->img);
-        }
-
-        // If the filename is the predefined value = '_csim_special_'
-        // we assume that the call to stroke only needs to do enough
-        // to correctly generate the CSIM maps.
-        // We use this variable to skip things we don't strictly need
-        // to do to generate the image map to improve performance
-        // a best we can. Therefor you will see a lot of tests !$_csim in the
-        // code below.
-        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
-
-        // We need to know if we have stroked the plot in the
-        // GetCSIMareas. Otherwise the CSIM hasn't been generated
-        // and in the case of GetCSIM called before stroke to generate
-        // CSIM without storing an image to disk GetCSIM must call Stroke.
-        $this->iHasStroked = true;
-
-        // Do any pre-stroke adjustment that is needed by the different plot types
-        // (i.e bar plots want's to add an offset to the x-labels etc)
-        for($i=0; $i < count($this->plots) ; ++$i ) {
-            $this->plots[$i]->PreStrokeAdjust($this);
-            $this->plots[$i]->DoLegend($this);
-        }
-                
-        // Any plots on the second Y scale?
-        if( $this->y2scale != null ) {
-            for($i=0; $i<count($this->y2plots)  ; ++$i ) {
-                $this->y2plots[$i]->PreStrokeAdjust($this);
-                $this->y2plots[$i]->DoLegend($this);
-            }
-        }
-
-        // Any plots on the extra Y axises?
-        $n = count($this->ynaxis);
-        for($i=0; $i<$n ; ++$i ) {
-            if( $this->ynplots == null || $this->ynplots[$i] == null) {
-                JpGraphError::RaiseL(25032,$i);//("No plots for Y-axis nbr:$i");
-            } 
-            $m = count($this->ynplots[$i]); 
-            for($j=0; $j < $m; ++$j ) {
-                $this->ynplots[$i][$j]->PreStrokeAdjust($this);
-                $this->ynplots[$i][$j]->DoLegend($this);
-            }
-        }
-
-        // Bail out if any of the Y-axis not been specified and
-        // has no plots. (This means it is impossible to do autoscaling and
-        // no other scale was given so we can't possible draw anything). If you use manual
-        // scaling you also have to supply the tick steps as well.
-        if( (!$this->yscale->IsSpecified() && count($this->plots)==0) ||
-            ($this->y2scale!=null && !$this->y2scale->IsSpecified() && count($this->y2plots)==0) ) {
-            //$e = "n=".count($this->y2plots)."\n";
-            // $e = "Can't draw unspecified Y-scale.<br>\nYou have either:<br>\n";
-            // $e .= "1. Specified an Y axis for autoscaling but have not supplied any plots<br>\n";
-            // $e .= "2. Specified a scale manually but have forgot to specify the tick steps";
-            JpGraphError::RaiseL(25026);
-        }
-                
-        // Bail out if no plots and no specified X-scale
-        if( (!$this->xscale->IsSpecified() && count($this->plots)==0 && count($this->y2plots)==0) )
-            JpGraphError::RaiseL(25034);//("<strong>JpGraph: Can't draw unspecified X-scale.</strong><br>No plots.<br>");
-
-        //Check if we should autoscale y-axis
-        if( !$this->yscale->IsSpecified() && count($this->plots)>0 ) {
-            list($min,$max) = $this->GetPlotsYMinMax($this->plots);
-            $lres = $this->GetLinesYMinMax($this->lines);
-            if( is_array($lres) ) {
-                list($linmin,$linmax) = $lres ;
-                $min = min($min,$linmin);
-                $max = max($max,$linmax);
-            }
-            $tres = $this->GetTextsYMinMax();
-            if( is_array($tres) ) {
-                list($tmin,$tmax) = $tres ;
-                $min = min($min,$tmin);
-                $max = max($max,$tmax);
-            }
-            $this->yscale->AutoScale($this->img,$min,$max,
-                                     $this->img->plotheight/$this->ytick_factor);
-        }
-        elseif( $this->yscale->IsSpecified() && 
-                ( $this->yscale->auto_ticks || !$this->yscale->ticks->IsSpecified()) ) {
-            // The tick calculation will use the user suplied min/max values to determine
-            // the ticks. If auto_ticks is false the exact user specifed min and max
-            // values will be used for the scale. 
-            // If auto_ticks is true then the scale might be slightly adjusted
-            // so that the min and max values falls on an even major step.
-            $min = $this->yscale->scale[0];
-            $max = $this->yscale->scale[1];
-            $this->yscale->AutoScale($this->img,$min,$max,
-                                     $this->img->plotheight/$this->ytick_factor,
-                                     $this->yscale->auto_ticks);
-
-            // Now make sure we show enough precision to accurate display the
-            // labels. If this is not done then the user might end up with
-            // a scale that might actually start with, say 13.5, butdue to rounding
-            // the scale label will ony show 14.
-            if( abs(floor($min)-$min) > 0 ) {
-                
-                // If the user has set a format then we bail out
-                if( $this->yscale->ticks->label_formatstr == '' && $this->yscale->ticks->label_dateformatstr == '' ) {
-                    $this->yscale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
-                }
-            }
-        }
-
-        if( $this->y2scale != null) {
-            if( !$this->y2scale->IsSpecified() && count($this->y2plots)>0 ) {
-                list($min,$max) = $this->GetPlotsYMinMax($this->y2plots);
-
-                $lres = $this->GetLinesYMinMax($this->y2lines);
-                if( is_array($lres) ) {
-                    list($linmin,$linmax) = $lres ;
-                    $min = min($min,$linmin);
-                    $max = max($max,$linmax);
-                }
-                $tres = $this->GetTextsYMinMax(true);
-                if( is_array($tres) ) {
-                    list($tmin,$tmax) = $tres ;
-                    $min = min($min,$tmin);
-                    $max = max($max,$tmax);
-                }
-                $this->y2scale->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
-            }                   
-            elseif( $this->y2scale->IsSpecified() && 
-                    ( $this->y2scale->auto_ticks || !$this->y2scale->ticks->IsSpecified()) ) {
-                // The tick calculation will use the user suplied min/max values to determine
-                // the ticks. If auto_ticks is false the exact user specifed min and max
-                // values will be used for the scale. 
-                // If auto_ticks is true then the scale might be slightly adjusted
-                // so that the min and max values falls on an even major step.
-                $min = $this->y2scale->scale[0];
-                $max = $this->y2scale->scale[1];
-                $this->y2scale->AutoScale($this->img,$min,$max,
-                                          $this->img->plotheight/$this->ytick_factor,
-                                          $this->y2scale->auto_ticks);
-
-            // Now make sure we show enough precision to accurate display the
-            // labels. If this is not done then the user might end up with
-            // a scale that might actually start with, say 13.5, butdue to rounding
-            // the scale label will ony show 14.
-            if( abs(floor($min)-$min) > 0 ) {
-                
-                // If the user has set a format then we bail out
-                if( $this->y2scale->ticks->label_formatstr == '' && $this->y2scale->ticks->label_dateformatstr == '' ) {
-                    $this->y2scale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
-                }
-            }
-
-            }
-        }
-                                
-        //
-        // Autoscale the extra Y-axises
-        //
-        $n = count($this->ynaxis);
-        for( $i=0; $i < $n; ++$i ) {
-          if( $this->ynscale[$i] != null) {
-            if( !$this->ynscale[$i]->IsSpecified() && count($this->ynplots[$i])>0 ) {
-              list($min,$max) = $this->GetPlotsYMinMax($this->ynplots[$i]);
-              $this->ynscale[$i]->AutoScale($this->img,$min,$max,$this->img->plotheight/$this->ytick_factor);
-            }                   
-            elseif( $this->ynscale[$i]->IsSpecified() && 
-                    ( $this->ynscale[$i]->auto_ticks || !$this->ynscale[$i]->ticks->IsSpecified()) ) {
-                // The tick calculation will use the user suplied min/max values to determine
-                // the ticks. If auto_ticks is false the exact user specifed min and max
-                // values will be used for the scale. 
-                // If auto_ticks is true then the scale might be slightly adjusted
-                // so that the min and max values falls on an even major step.
-              $min = $this->ynscale[$i]->scale[0];
-              $max = $this->ynscale[$i]->scale[1];
-              $this->ynscale[$i]->AutoScale($this->img,$min,$max,
-                                            $this->img->plotheight/$this->ytick_factor,
-                                            $this->ynscale[$i]->auto_ticks);
-
-              // Now make sure we show enough precision to accurate display the
-              // labels. If this is not done then the user might end up with
-              // a scale that might actually start with, say 13.5, butdue to rounding
-              // the scale label will ony show 14.
-              if( abs(floor($min)-$min) > 0 ) {
-                
-                  // If the user has set a format then we bail out
-                  if( $this->ynscale[$i]->ticks->label_formatstr == '' && $this->ynscale[$i]->ticks->label_dateformatstr == '' ) {
-                      $this->ynscale[$i]->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
-                  }
-              }
-
-            }
-          }
-        }
-                
-        //Check if we should autoscale x-axis
-        if( !$this->xscale->IsSpecified() ) {
-            if( substr($this->axtype,0,4) == "text" ) {
-                $max=0;
-                $n = count($this->plots);
-                for($i=0; $i < $n; ++$i ) {
-                    $p = $this->plots[$i];
-                    // We need some unfortunate sub class knowledge here in order
-                    // to increase number of data points in case it is a line plot
-                    // which has the barcenter set. If not it could mean that the
-                    // last point of the data is outside the scale since the barcenter
-                    // settings means that we will shift the entire plot half a tick step
-                    // to the right in oder to align with the center of the bars.
-                    if( class_exists('BarPlot',false) ) {
-                        $cl = strtolower(get_class($p));
-                        if( (class_exists('BarPlot',false) && ($p instanceof BarPlot)) || 
-                            empty($p->barcenter) ) 
-                            $max=max($max,$p->numpoints-1);
-                        else {
-                            $max=max($max,$p->numpoints);
-                        }
-                    }
-                    else {
-                        if( empty($p->barcenter) ) {
-                            $max=max($max,$p->numpoints-1);
-                        }
-                        else {
-                            $max=max($max,$p->numpoints);
-                        }
-                    }
-                }
-                $min=0;
-                if( $this->y2axis != null ) {
-                    foreach( $this->y2plots as $p ) {
-                        $max=max($max,$p->numpoints-1);
-                    }               
-                }
-                $n = count($this->ynaxis);
-                for( $i=0; $i < $n; ++$i ) {
-                    if( $this->ynaxis[$i] != null) {
-                        foreach( $this->ynplots[$i] as $p ) {
-                            $max=max($max,$p->numpoints-1);
-                        }                   
-                    }
-                }
-                
-                $this->xscale->Update($this->img,$min,$max);
-                $this->xscale->ticks->Set($this->xaxis->tick_step,1);
-                $this->xscale->ticks->SupressMinorTickMarks();
-            }
-            else {
-                list($min,$max) = $this->GetXMinMax();
-
-                $lres = $this->GetLinesXMinMax($this->lines);
-                if( $lres ) {
-                    list($linmin,$linmax) = $lres ;
-                    $min = min($min,$linmin);
-                    $max = max($max,$linmax);
-                }
-
-                $lres = $this->GetLinesXMinMax($this->y2lines);
-                if( $lres ) {
-                    list($linmin,$linmax) = $lres ;
-                    $min = min($min,$linmin);
-                    $max = max($max,$linmax);
-                }
-
-                $tres = $this->GetTextsXMinMax();
-                if( $tres ) {
-                    list($tmin,$tmax) = $tres ;
-                    $min = min($min,$tmin);
-                    $max = max($max,$tmax);
-                }
-
-                $tres = $this->GetTextsXMinMax(true);
-                if( $tres ) {
-                    list($tmin,$tmax) = $tres ;
-                    $min = min($min,$tmin);
-                    $max = max($max,$tmax);
-                }
-
-                $this->xscale->AutoScale($this->img,$min,$max,round($this->img->plotwidth/$this->xtick_factor));
-            }
-                        
-            //Adjust position of y-axis and y2-axis to minimum/maximum of x-scale
-            if( !is_numeric($this->yaxis->pos) && !is_string($this->yaxis->pos) )
-                $this->yaxis->SetPos($this->xscale->GetMinVal());
-            if( $this->y2axis != null ) {
-                if( !is_numeric($this->y2axis->pos) && !is_string($this->y2axis->pos) )
-                    $this->y2axis->SetPos($this->xscale->GetMaxVal());
-                $this->y2axis->SetTitleSide(SIDE_RIGHT);
-            }
-            $n = count($this->ynaxis);
-            $nY2adj = $this->y2axis != null ? $this->iYAxisDeltaPos : 0;
-            for( $i=0; $i < $n; ++$i ) { 
-                if( $this->ynaxis[$i] != null ) {
-                    if( !is_numeric($this->ynaxis[$i]->pos) && !is_string($this->ynaxis[$i]->pos) ) {
-                        $this->ynaxis[$i]->SetPos($this->xscale->GetMaxVal());
-                  $this->ynaxis[$i]->SetPosAbsDelta($i*$this->iYAxisDeltaPos + $nY2adj);
-                    }
-                    $this->ynaxis[$i]->SetTitleSide(SIDE_RIGHT);
-                }
-            }
-
-        }       
-        elseif( $this->xscale->IsSpecified() &&  
-                ( $this->xscale->auto_ticks || !$this->xscale->ticks->IsSpecified()) ) {
-            // The tick calculation will use the user suplied min/max values to determine
-            // the ticks. If auto_ticks is false the exact user specifed min and max
-            // values will be used for the scale. 
-            // If auto_ticks is true then the scale might be slightly adjusted
-            // so that the min and max values falls on an even major step.
-            $min = $this->xscale->scale[0];
-            $max = $this->xscale->scale[1];
-            $this->xscale->AutoScale($this->img,$min,$max,
-                                     round($this->img->plotwidth/$this->xtick_factor),
-                                     false);
-
-            // Now make sure we show enough precision to accurate display the
-            // labels. If this is not done then the user might end up with
-            // a scale that might actually start with, say 13.5, butdue to rounding
-            // the scale label will ony show 14.
-            if( abs(floor($min)-$min) > 0 ) {
-                
-                // If the user has set a format then we bail out
-                if( $this->xscale->ticks->label_formatstr == '' && $this->xscale->ticks->label_dateformatstr == '' ) {
-                    $this->xscale->ticks->precision = abs( floor(log10( abs(floor($min)-$min))) )+1;
-                }
-            }
-
-
-            if( $this->y2axis != null ) {
-                if( !is_numeric($this->y2axis->pos) && !is_string($this->y2axis->pos) )
-                    $this->y2axis->SetPos($this->xscale->GetMaxVal());
-                $this->y2axis->SetTitleSide(SIDE_RIGHT);
-            }
-
-        }
-                
-        // If we have a negative values and x-axis position is at 0
-        // we need to supress the first and possible the last tick since
-        // they will be drawn on top of the y-axis (and possible y2 axis)
-        // The test below might seem strange the reasone being that if
-        // the user hasn't specified a value for position this will not
-        // be set until we do the stroke for the axis so as of now it
-        // is undefined.
-        // For X-text scale we ignore all this since the tick are usually
-        // much further in and not close to the Y-axis. Hence the test 
-        // for 'text'   
-
-        if( ($this->yaxis->pos==$this->xscale->GetMinVal() || 
-             (is_string($this->yaxis->pos) && $this->yaxis->pos=='min')) &&  
-            !is_numeric($this->xaxis->pos) && $this->yscale->GetMinVal() < 0 && 
-            substr($this->axtype,0,4) != 'text' && $this->xaxis->pos!="min" ) {
-
-            //$this->yscale->ticks->SupressZeroLabel(false);
-            $this->xscale->ticks->SupressFirst();
-            if( $this->y2axis != null ) {
-                $this->xscale->ticks->SupressLast();
-            }
-        }
-        elseif( !is_numeric($this->yaxis->pos) && $this->yaxis->pos=='max' ) {
-            $this->xscale->ticks->SupressLast();
-        }
-        
-
-        if( !$_csim ) {
-            $this->StrokePlotArea();
-            if( $this->iIconDepth == DEPTH_BACK ) {
-                $this->StrokeIcons();
-            }
-        }
-        $this->StrokeAxis(false);
-
-        // Stroke bands
-        if( $this->bands != null && !$_csim) 
-            for($i=0; $i < count($this->bands); ++$i) {
-                // Stroke all bands that asks to be in the background
-                if( $this->bands[$i]->depth == DEPTH_BACK )
-                    $this->bands[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-            }
-
-        if( $this->y2bands != null && $this->y2scale != null && !$_csim )
-            for($i=0; $i < count($this->y2bands); ++$i) {
-                // Stroke all bands that asks to be in the foreground
-                if( $this->y2bands[$i]->depth == DEPTH_BACK )
-                    $this->y2bands[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
-            }
-
-
-        if( $this->grid_depth == DEPTH_BACK && !$_csim) {
-            $this->ygrid->Stroke();
-            $this->xgrid->Stroke();
-        }
-                                
-        // Stroke Y2-axis
-        if( $this->y2axis != null && !$_csim) {         
-            $this->y2axis->Stroke($this->xscale);                               
-            $this->y2grid->Stroke();
-        }
-
-        // Stroke yn-axis
-        $n = count($this->ynaxis); 
-        for( $i=0; $i < $n; ++$i ) {
-            $this->ynaxis[$i]->Stroke($this->xscale);                           
-        }
-
-        $oldoff=$this->xscale->off;
-        if(substr($this->axtype,0,4)=="text") {
-            if( $this->text_scale_abscenteroff > -1 ) {
-                // For a text scale the scale factor is the number of pixel per step. 
-                // Hence we can use the scale factor as a substitute for number of pixels
-                // per major scale step and use that in order to adjust the offset so that
-                // an object of width "abscenteroff" becomes centered.
-                $this->xscale->off += round($this->xscale->scale_factor/2)-round($this->text_scale_abscenteroff/2);
-            }
-            else {
-                $this->xscale->off += 
-                    ceil($this->xscale->scale_factor*$this->text_scale_off*$this->xscale->ticks->minor_step);
-            }
-        }
-
-        if( $this->iDoClipping ) {
-            $oldimage = $this->img->CloneCanvasH();
-        }
-
-        if( ! $this->y2orderback ) {
-            // Stroke all plots for Y1 axis
-            for($i=0; $i < count($this->plots); ++$i) {
-                $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-                $this->plots[$i]->StrokeMargin($this->img);
-            }                                           
-        }
-
-        // Stroke all plots for Y2 axis
-        if( $this->y2scale != null )
-            for($i=0; $i< count($this->y2plots); ++$i ) {       
-                $this->y2plots[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
-            }           
-
-        if( $this->y2orderback ) {
-            // Stroke all plots for Y1 axis
-            for($i=0; $i < count($this->plots); ++$i) {
-                $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-                $this->plots[$i]->StrokeMargin($this->img);
-            }                                           
-        }
-
-        $n = count($this->ynaxis); 
-        for( $i=0; $i < $n; ++$i ) {
-            $m = count($this->ynplots[$i]);
-            for( $j=0; $j < $m; ++$j ) { 
-                $this->ynplots[$i][$j]->Stroke($this->img,$this->xscale,$this->ynscale[$i]);
-                $this->ynplots[$i][$j]->StrokeMargin($this->img);
-            }
-        }
-
-        if( $this->iIconDepth == DEPTH_FRONT) {
-            $this->StrokeIcons();
-        }
-        
-        if( $this->iDoClipping ) {
-            // Clipping only supports graphs at 0 and 90 degrees
-            if( $this->img->a == 0 ) {
-                $this->img->CopyCanvasH($oldimage,$this->img->img,
-                                        $this->img->left_margin,$this->img->top_margin,
-                                        $this->img->left_margin,$this->img->top_margin,
-                                        $this->img->plotwidth+1,$this->img->plotheight);
-            }
-            elseif( $this->img->a == 90 ) {
-                $adj = ($this->img->height - $this->img->width)/2;
-                $this->img->CopyCanvasH($oldimage,$this->img->img,
-                                        $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                                        $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                                        $this->img->plotheight+1,$this->img->plotwidth);
-            }
-            else {
-                JpGraphError::RaiseL(25035,$this->img->a);//('You have enabled clipping. Cliping is only supported for graphs at 0 or 90 degrees rotation. Please adjust you current angle (='.$this->img->a.' degrees) or disable clipping.');
-            }
-            $this->img->Destroy();
-            $this->img->SetCanvasH($oldimage);
-        }
-
-        $this->xscale->off=$oldoff;
-                
-        if( $this->grid_depth == DEPTH_FRONT && !$_csim ) {
-            $this->ygrid->Stroke();
-            $this->xgrid->Stroke();
-        }
-
-        // Stroke bands
-        if( $this->bands!= null )
-            for($i=0; $i < count($this->bands); ++$i) {
-                // Stroke all bands that asks to be in the foreground
-                if( $this->bands[$i]->depth == DEPTH_FRONT )
-                    $this->bands[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-            }
-
-        if( $this->y2bands!= null && $this->y2scale != null )
-            for($i=0; $i < count($this->y2bands); ++$i) {
-                // Stroke all bands that asks to be in the foreground
-                if( $this->y2bands[$i]->depth == DEPTH_FRONT )
-                    $this->y2bands[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
-            }
-
-
-        // Stroke any lines added
-        if( $this->lines != null ) {
-            for($i=0; $i < count($this->lines); ++$i) {
-                $this->lines[$i]->Stroke($this->img,$this->xscale,$this->yscale);
-                $this->lines[$i]->DoLegend($this);
-            }
-        }
-
-        if( $this->y2lines != null && $this->y2scale != null ) {
-            for($i=0; $i < count($this->y2lines); ++$i) {
-                $this->y2lines[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
-                $this->y2lines[$i]->DoLegend($this);
-            }
-        }
-
-        // Finally draw the axis again since some plots may have nagged
-        // the axis in the edges.
-        if( !$_csim ) {
-            $this->StrokeAxis();
-        }
-
-        if( $this->y2scale != null && !$_csim ) 
-            $this->y2axis->Stroke($this->xscale,false);         
-                
-        if( !$_csim ) {
-            $this->StrokePlotBox();
-        }
-                
-        // The titles and legends never gets rotated so make sure
-        // that the angle is 0 before stroking them                             
-        $aa = $this->img->SetAngle(0);
-        $this->StrokeTitles();
-        $this->footer->Stroke($this->img);
-        $this->legend->Stroke($this->img);              
-        $this->img->SetAngle($aa);      
-        $this->StrokeTexts();   
-        $this->StrokeTables();
-
-        if( !$_csim ) {
-
-            $this->img->SetAngle($aa);  
-                        
-            // Draw an outline around the image map     
-            if(_JPG_DEBUG) {
-                $this->DisplayClientSideaImageMapAreas();               
-            }
-            
-            // Should we do any final image transformation
-            if( $this->iImgTrans ) {
-                if( !class_exists('ImgTrans',false) ) {
-                    require_once('jpgraph_imgtrans.php');
-                    //JpGraphError::Raise('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.');
-                }
-               
-                $tform = new ImgTrans($this->img->img);
-                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
-                                                 $this->iImgTransDirection,$this->iImgTransHighQ,
-                                                 $this->iImgTransMinSize,$this->iImgTransFillColor,
-                                                 $this->iImgTransBorder);
-            }
-
-            // If the filename is given as the special "__handle"
-            // then the image handler is returned and the image is NOT
-            // streamed back
-            if( $aStrokeFileName == _IMG_HANDLER ) {
-                return $this->img->img;
-            }
-            else {
-                // Finally stream the generated picture                                 
-                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);                
-            }
-        }
+    function Stroke($aStrokeFileName='') {
+        // Fist make a sanity check that user has specified a scale
+        if( empty($this->yscale) ) {
+            JpGraphError::RaiseL(25031);//('You must specify what scale to use with a call to Graph::SetScale().');
+        }
+
+        // Start by adjusting the margin so that potential titles will fit.
+        $this->AdjustMarginsForTitles();
+
+        // Give the plot a chance to do any scale adjuments the individual plots
+        // wants to do. Right now this is only used by the contour plot to set scale
+        // limits
+        for($i=0; $i < count($this->plots) ; ++$i ) {
+            $this->plots[$i]->PreScaleSetup($this);
+        }
+
+        // Init scale constants that are used to calculate the transformation from
+        // world to pixel coordinates
+        $this->InitScaleConstants();
+
+        // If the filename is the predefined value = '_csim_special_'
+        // we assume that the call to stroke only needs to do enough
+        // to correctly generate the CSIM maps.
+        // We use this variable to skip things we don't strictly need
+        // to do to generate the image map to improve performance
+        // a best we can. Therefor you will see a lot of tests !$_csim in the
+        // code below.
+        $_csim = ($aStrokeFileName===_CSIM_SPECIALFILE);
+
+        // If we are called the second time (perhaps the user has called GetHTMLImageMap()
+        // himself then the legends have alsready been populated once in order to get the
+        // CSIM coordinats. Since we do not want the legends to be populated a second time
+        // we clear the legends
+        $this->legend->Clear();
+
+        // We need to know if we have stroked the plot in the
+        // GetCSIMareas. Otherwise the CSIM hasn't been generated
+        // and in the case of GetCSIM called before stroke to generate
+        // CSIM without storing an image to disk GetCSIM must call Stroke.
+        $this->iHasStroked = true;
+
+        // Setup pre-stroked adjustments and Legends
+        $this->doPrestrokeAdjustments();
+
+        if ($this->graph_theme) {
+            $this->graph_theme->PreStrokeApply($this);
+        }
+
+        // Bail out if any of the Y-axis not been specified and
+        // has no plots. (This means it is impossible to do autoscaling and
+        // no other scale was given so we can't possible draw anything). If you use manual
+        // scaling you also have to supply the tick steps as well.
+        if( (!$this->yscale->IsSpecified() && count($this->plots)==0) ||
+            ($this->y2scale!=null && !$this->y2scale->IsSpecified() && count($this->y2plots)==0) ) {
+            //$e = "n=".count($this->y2plots)."\n";
+            // $e = "Can't draw unspecified Y-scale.<br>\nYou have either:<br>\n";
+            // $e .= "1. Specified an Y axis for autoscaling but have not supplied any plots<br>\n";
+            // $e .= "2. Specified a scale manually but have forgot to specify the tick steps";
+            JpGraphError::RaiseL(25026);
+        }
+
+        // Bail out if no plots and no specified X-scale
+        if( (!$this->xscale->IsSpecified() && count($this->plots)==0 && count($this->y2plots)==0) ) {
+            JpGraphError::RaiseL(25034);//("<strong>JpGraph: Can't draw unspecified X-scale.</strong><br>No plots.<br>");
+        }
+
+        // Autoscale the normal Y-axis
+        $this->doAutoScaleYAxis();
+
+        // Autoscale all additiopnal y-axis
+        $this->doAutoScaleYnAxis();
+
+        // Autoscale the regular x-axis and position the y-axis properly
+        $this->doAutoScaleXAxis();
+
+        // If we have a negative values and x-axis position is at 0
+        // we need to supress the first and possible the last tick since
+        // they will be drawn on top of the y-axis (and possible y2 axis)
+        // The test below might seem strange the reasone being that if
+        // the user hasn't specified a value for position this will not
+        // be set until we do the stroke for the axis so as of now it
+        // is undefined.
+        // For X-text scale we ignore all this since the tick are usually
+        // much further in and not close to the Y-axis. Hence the test
+        // for 'text'
+        if( ($this->yaxis->pos==$this->xscale->GetMinVal() || (is_string($this->yaxis->pos) && $this->yaxis->pos=='min')) &&
+            !is_numeric($this->xaxis->pos) && $this->yscale->GetMinVal() < 0 &&
+            substr($this->axtype,0,4) != 'text' && $this->xaxis->pos != 'min' ) {
+
+            //$this->yscale->ticks->SupressZeroLabel(false);
+            $this->xscale->ticks->SupressFirst();
+            if( $this->y2axis != null ) {
+                $this->xscale->ticks->SupressLast();
+            }
+        }
+        elseif( !is_numeric($this->yaxis->pos) && $this->yaxis->pos=='max' ) {
+            $this->xscale->ticks->SupressLast();
+        }
+
+        if( !$_csim ) {
+            $this->StrokePlotArea();
+            if( $this->iIconDepth == DEPTH_BACK ) {
+                $this->StrokeIcons();
+            }
+        }
+        $this->StrokeAxis(false);
+
+        // Stroke colored bands
+        $this->StrokeBands(DEPTH_BACK,$_csim);
+
+        if( $this->grid_depth == DEPTH_BACK && !$_csim) {
+            $this->ygrid->Stroke();
+            $this->xgrid->Stroke();
+        }
+
+        // Stroke Y2-axis
+        if( $this->y2axis != null && !$_csim) {
+            $this->y2axis->Stroke($this->xscale);
+            $this->y2grid->Stroke();
+        }
+
+        // Stroke yn-axis
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            $this->ynaxis[$i]->Stroke($this->xscale);
+        }
+
+        $oldoff=$this->xscale->off;
+        if( substr($this->axtype,0,4) == 'text' ) {
+            if( $this->text_scale_abscenteroff > -1 ) {
+                // For a text scale the scale factor is the number of pixel per step.
+                // Hence we can use the scale factor as a substitute for number of pixels
+                // per major scale step and use that in order to adjust the offset so that
+                // an object of width "abscenteroff" becomes centered.
+                $this->xscale->off += round($this->xscale->scale_factor/2)-round($this->text_scale_abscenteroff/2);
+            }
+            else {
+                $this->xscale->off += ceil($this->xscale->scale_factor*$this->text_scale_off*$this->xscale->ticks->minor_step);
+            }
+        }
+
+        if( $this->iDoClipping ) {
+            $oldimage = $this->img->CloneCanvasH();
+        }
+
+        if( ! $this->y2orderback ) {
+            // Stroke all plots for Y1 axis
+            for($i=0; $i < count($this->plots); ++$i) {
+                $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+                $this->plots[$i]->StrokeMargin($this->img);
+            }
+        }
+
+        // Stroke all plots for Y2 axis
+        if( $this->y2scale != null ) {
+            for($i=0; $i< count($this->y2plots); ++$i ) {
+                $this->y2plots[$i]->Stroke($this->img,$this->xscale,$this->y2scale);
+            }
+        }
+
+        if( $this->y2orderback ) {
+            // Stroke all plots for Y1 axis
+            for($i=0; $i < count($this->plots); ++$i) {
+                $this->plots[$i]->Stroke($this->img,$this->xscale,$this->yscale);
+                $this->plots[$i]->StrokeMargin($this->img);
+            }
+        }
+
+        $n = count($this->ynaxis);
+        for( $i=0; $i < $n; ++$i ) {
+            $m = count($this->ynplots[$i]);
+            for( $j=0; $j < $m; ++$j ) {
+                $this->ynplots[$i][$j]->Stroke($this->img,$this->xscale,$this->ynscale[$i]);
+                $this->ynplots[$i][$j]->StrokeMargin($this->img);
+            }
+        }
+
+        if( $this->iIconDepth == DEPTH_FRONT) {
+            $this->StrokeIcons();
+        }
+
+        if( $this->iDoClipping ) {
+            // Clipping only supports graphs at 0 and 90 degrees
+            if( $this->img->a == 0 ) {
+                $this->img->CopyCanvasH($oldimage,$this->img->img,
+                $this->img->left_margin,$this->img->top_margin,
+                $this->img->left_margin,$this->img->top_margin,
+                $this->img->plotwidth+1,$this->img->plotheight);
+            }
+            elseif( $this->img->a == 90 ) {
+                $adj = ($this->img->height - $this->img->width)/2;
+                $this->img->CopyCanvasH($oldimage,$this->img->img,
+                $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
+                $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
+                $this->img->plotheight+1,$this->img->plotwidth);
+            }
+            else {
+                JpGraphError::RaiseL(25035,$this->img->a);//('You have enabled clipping. Cliping is only supported for graphs at 0 or 90 degrees rotation. Please adjust you current angle (='.$this->img->a.' degrees) or disable clipping.');
+            }
+            $this->img->Destroy();
+            $this->img->SetCanvasH($oldimage);
+        }
+
+        $this->xscale->off=$oldoff;
+
+        if( $this->grid_depth == DEPTH_FRONT && !$_csim ) {
+            $this->ygrid->Stroke();
+            $this->xgrid->Stroke();
+        }
+
+        // Stroke colored bands
+        $this->StrokeBands(DEPTH_FRONT,$_csim);
+
+        // Finally draw the axis again since some plots may have nagged
+        // the axis in the edges.
+        if( !$_csim ) {
+            $this->StrokeAxis();
+        }
+
+        if( $this->y2scale != null && !$_csim ) {
+            $this->y2axis->Stroke($this->xscale,false);
+        }
+
+        if( !$_csim ) {
+            $this->StrokePlotBox();
+        }
+
+        // The titles and legends never gets rotated so make sure
+        // that the angle is 0 before stroking them
+        $aa = $this->img->SetAngle(0);
+        $this->StrokeTitles();
+        $this->footer->Stroke($this->img);
+        $this->legend->Stroke($this->img);
+        $this->img->SetAngle($aa);
+        $this->StrokeTexts();
+        $this->StrokeTables();
+
+        if( !$_csim ) {
+
+            $this->img->SetAngle($aa);
+
+            // Draw an outline around the image map
+            if(_JPG_DEBUG) {
+                $this->DisplayClientSideaImageMapAreas();
+            }
+
+            // Should we do any final image transformation
+            if( $this->iImgTrans ) {
+                if( !class_exists('ImgTrans',false) ) {
+                    require_once('jpgraph_imgtrans.php');
+                    //JpGraphError::Raise('In order to use image transformation you must include the file jpgraph_imgtrans.php in your script.');
+                }
+
+                $tform = new ImgTrans($this->img->img);
+                $this->img->img = $tform->Skew3D($this->iImgTransHorizon,$this->iImgTransSkewDist,
+                $this->iImgTransDirection,$this->iImgTransHighQ,
+                $this->iImgTransMinSize,$this->iImgTransFillColor,
+                $this->iImgTransBorder);
+            }
+
+            // If the filename is given as the special "__handle"
+            // then the image handler is returned and the image is NOT
+            // streamed back
+            if( $aStrokeFileName == _IMG_HANDLER ) {
+                return $this->img->img;
+            }
+            else {
+                // Finally stream the generated picture
+                $this->cache->PutAndStream($this->img,$this->cache_name,$this->inline,$aStrokeFileName);
+            }
+        }
     }
 
     function SetAxisLabelBackground($aType,$aXFColor='lightgray',$aXColor='black',$aYFColor='lightgray',$aYColor='black') {
-        $this->iAxisLblBgType = $aType;
-        $this->iXAxisLblBgFillColor = $aXFColor;
-        $this->iXAxisLblBgColor = $aXColor;
-        $this->iYAxisLblBgFillColor = $aYFColor;
-        $this->iYAxisLblBgColor = $aYColor;
-    }
-
-//---------------
-// PRIVATE METHODS      
+        $this->iAxisLblBgType = $aType;
+        $this->iXAxisLblBgFillColor = $aXFColor;
+        $this->iXAxisLblBgColor = $aXColor;
+        $this->iYAxisLblBgFillColor = $aYFColor;
+        $this->iYAxisLblBgColor = $aYColor;
+    }
 
     function StrokeAxisLabelBackground() {
-        // Types 
-        // 0 = No background
-        // 1 = Only X-labels, length of axis
-        // 2 = Only Y-labels, length of axis
-        // 3 = As 1 but extends to width of graph
-        // 4 = As 2 but extends to height of graph
-        // 5 = Combination of 3 & 4
-        // 6 = Combination of 1 & 2
- 
-        $t = $this->iAxisLblBgType ;
-        if( $t < 1 ) return;
-        // Stroke optional X-axis label background color
-        if( $t == 1 || $t == 3 || $t == 5 || $t == 6 ) {
-            $this->img->PushColor($this->iXAxisLblBgFillColor);
-            if( $t == 1 || $t == 6 ) {
-                $xl = $this->img->left_margin;
-                $yu = $this->img->height - $this->img->bottom_margin + 1;
-                $xr = $this->img->width - $this->img->right_margin ;
-                $yl = $this->img->height-1-$this->frame_weight;
-            }
-            else { // t==3 || t==5
-                $xl = $this->frame_weight;
-                $yu = $this->img->height - $this->img->bottom_margin + 1;
-                $xr = $this->img->width - 1 - $this->frame_weight;
-                $yl = $this->img->height-1-$this->frame_weight;
-            }
-
-            $this->img->FilledRectangle($xl,$yu,$xr,$yl);
-            $this->img->PopColor();
-
-            // Check if we should add the vertical lines at left and right edge
-            if( $this->iXAxisLblBgColor !== '' ) {
-                // Hardcode to one pixel wide
-                $this->img->SetLineWeight(1); 
-                $this->img->PushColor($this->iXAxisLblBgColor);
-                if( $t == 1 || $t == 6 ) {
-                    $this->img->Line($xl,$yu,$xl,$yl);
-                    $this->img->Line($xr,$yu,$xr,$yl);
-                }
-                else {
-                    $xl = $this->img->width - $this->img->right_margin ;
-                    $this->img->Line($xl,$yu-1,$xr,$yu-1);
-                }
-                $this->img->PopColor();
-            }
-        }
-
-        if( $t == 2 || $t == 4 || $t == 5 || $t == 6 ) {
-            $this->img->PushColor($this->iYAxisLblBgFillColor);
-            if( $t == 2 || $t == 6 ) {      
-                $xl = $this->frame_weight;
-                $yu = $this->frame_weight+$this->img->top_margin;
-                $xr = $this->img->left_margin - 1;
-                $yl = $this->img->height - $this->img->bottom_margin + 1;
-            }
-            else {
-                $xl = $this->frame_weight;
-                $yu = $this->frame_weight;
-                $xr = $this->img->left_margin - 1;
-                $yl = $this->img->height-1-$this->frame_weight;
-            }
-
-            $this->img->FilledRectangle($xl,$yu,$xr,$yl);
-            $this->img->PopColor();
-
-            // Check if we should add the vertical lines at left and right edge
-            if( $this->iXAxisLblBgColor !== '' ) {
-                $this->img->PushColor($this->iXAxisLblBgColor);
-                if( $t == 2 || $t == 6 ) {
-                    $this->img->Line($xl,$yu-1,$xr,$yu-1);
-                    $this->img->Line($xl,$yl-1,$xr,$yl-1);                  
-                }
-                else {
-                    $this->img->Line($xr+1,$yu,$xr+1,$this->img->top_margin);               
-                }
-                $this->img->PopColor();
-            }
-
-        }
+        // Types
+        // 0 = No background
+        // 1 = Only X-labels, length of axis
+        // 2 = Only Y-labels, length of axis
+        // 3 = As 1 but extends to width of graph
+        // 4 = As 2 but extends to height of graph
+        // 5 = Combination of 3 & 4
+        // 6 = Combination of 1 & 2
+
+        $t = $this->iAxisLblBgType ;
+        if( $t < 1 ) return;
+
+        // Stroke optional X-axis label background color
+        if( $t == 1 || $t == 3 || $t == 5 || $t == 6 ) {
+            $this->img->PushColor($this->iXAxisLblBgFillColor);
+            if( $t == 1 || $t == 6 ) {
+                $xl = $this->img->left_margin;
+                $yu = $this->img->height - $this->img->bottom_margin + 1;
+                $xr = $this->img->width - $this->img->right_margin ;
+                $yl = $this->img->height-1-$this->frame_weight;
+            }
+            else { // t==3 || t==5
+                $xl = $this->frame_weight;
+                $yu = $this->img->height - $this->img->bottom_margin + 1;
+                $xr = $this->img->width - 1 - $this->frame_weight;
+                $yl = $this->img->height-1-$this->frame_weight;
+            }
+
+            $this->img->FilledRectangle($xl,$yu,$xr,$yl);
+            $this->img->PopColor();
+
+            // Check if we should add the vertical lines at left and right edge
+            if( $this->iXAxisLblBgColor !== '' ) {
+                // Hardcode to one pixel wide
+                $this->img->SetLineWeight(1);
+                $this->img->PushColor($this->iXAxisLblBgColor);
+                if( $t == 1 || $t == 6 ) {
+                    $this->img->Line($xl,$yu,$xl,$yl);
+                    $this->img->Line($xr,$yu,$xr,$yl);
+                }
+                else {
+                    $xl = $this->img->width - $this->img->right_margin ;
+                    $this->img->Line($xl,$yu-1,$xr,$yu-1);
+                }
+                $this->img->PopColor();
+            }
+        }
+
+        if( $t == 2 || $t == 4 || $t == 5 || $t == 6 ) {
+            $this->img->PushColor($this->iYAxisLblBgFillColor);
+            if( $t == 2 || $t == 6 ) {
+                $xl = $this->frame_weight;
+                $yu = $this->frame_weight+$this->img->top_margin;
+                $xr = $this->img->left_margin - 1;
+                $yl = $this->img->height - $this->img->bottom_margin + 1;
+            }
+            else {
+                $xl = $this->frame_weight;
+                $yu = $this->frame_weight;
+                $xr = $this->img->left_margin - 1;
+                $yl = $this->img->height-1-$this->frame_weight;
+            }
+
+            $this->img->FilledRectangle($xl,$yu,$xr,$yl);
+            $this->img->PopColor();
+
+            // Check if we should add the vertical lines at left and right edge
+            if( $this->iXAxisLblBgColor !== '' ) {
+                $this->img->PushColor($this->iXAxisLblBgColor);
+                if( $t == 2 || $t == 6 ) {
+                    $this->img->Line($xl,$yu-1,$xr,$yu-1);
+                    $this->img->Line($xl,$yl-1,$xr,$yl-1);
+                }
+                else {
+                    $this->img->Line($xr+1,$yu,$xr+1,$this->img->top_margin);
+                }
+                $this->img->PopColor();
+            }
+
+        }
     }
 
     function StrokeAxis($aStrokeLabels=true) {
-        
-        if( $aStrokeLabels ) {
-            $this->StrokeAxisLabelBackground();
-        }
-
-        // Stroke axis
-        if( $this->iAxisStyle != AXSTYLE_SIMPLE ) {
-            switch( $this->iAxisStyle ) {
-                case AXSTYLE_BOXIN :
-                    $toppos = SIDE_DOWN;
-                    $bottompos = SIDE_UP;
-                    $leftpos = SIDE_RIGHT;
-                    $rightpos = SIDE_LEFT;
-                    break;
-                case AXSTYLE_BOXOUT :
-                    $toppos = SIDE_UP;
-                    $bottompos = SIDE_DOWN;         
-                    $leftpos = SIDE_LEFT;
-                    $rightpos = SIDE_RIGHT;
-                    break;
-                case AXSTYLE_YBOXIN:
-                    $toppos = FALSE; 
-                    $bottompos = SIDE_UP;
-                    $leftpos = SIDE_RIGHT;
-                    $rightpos = SIDE_LEFT;
-                    break;
-                case AXSTYLE_YBOXOUT:
-                    $toppos = FALSE;
-                    $bottompos = SIDE_DOWN;         
-                    $leftpos = SIDE_LEFT;
-                    $rightpos = SIDE_RIGHT;
-                    break;
-                default:
-                    JpGRaphError::RaiseL(25036,$this->iAxisStyle); //('Unknown AxisStyle() : '.$this->iAxisStyle);
-                    break;
-            }
-            
-            // By default we hide the first label so it doesn't cross the
-            // Y-axis in case the positon hasn't been set by the user.
-            // However, if we use a box we always want the first value
-            // displayed so we make sure it will be displayed.
-            $this->xscale->ticks->SupressFirst(false);    
-
-            // Now draw the bottom X-axis
-            $this->xaxis->SetPos('min');
-            $this->xaxis->SetLabelSide(SIDE_DOWN);
-            $this->xaxis->scale->ticks->SetSide($bottompos);
-            $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
-
-            if( $toppos !== FALSE ) {
-                // We also want a top X-axis
-                $this->xaxis = $this->xaxis;
-                $this->xaxis->SetPos('max');
-                $this->xaxis->SetLabelSide(SIDE_UP);
-                // No title for the top X-axis 
-                if( $aStrokeLabels ) {
-                    $this->xaxis->title->Set('');
-                }
-                $this->xaxis->scale->ticks->SetSide($toppos);
-                $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
-            }
-
-            // Stroke the left Y-axis
-            $this->yaxis->SetPos('min');
-            $this->yaxis->SetLabelSide(SIDE_LEFT);
-            $this->yaxis->scale->ticks->SetSide($leftpos);
-            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
-
-            // Stroke the  right Y-axis
-            $this->yaxis->SetPos('max');
-            // No title for the right side 
-            if( $aStrokeLabels ) {
-                $this->yaxis->title->Set('');
-            }
-            $this->yaxis->SetLabelSide(SIDE_RIGHT);
-            $this->yaxis->scale->ticks->SetSide($rightpos);
-            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);  
-        }
-        else {
-            $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
-            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);         
-        }
+
+        if( $aStrokeLabels ) {
+            $this->StrokeAxisLabelBackground();
+        }
+
+        // Stroke axis
+        if( $this->iAxisStyle != AXSTYLE_SIMPLE ) {
+            switch( $this->iAxisStyle ) {
+                case AXSTYLE_BOXIN :
+                    $toppos = SIDE_DOWN;
+                    $bottompos = SIDE_UP;
+                    $leftpos = SIDE_RIGHT;
+                    $rightpos = SIDE_LEFT;
+                    break;
+                case AXSTYLE_BOXOUT :
+                    $toppos = SIDE_UP;
+                    $bottompos = SIDE_DOWN;
+                    $leftpos = SIDE_LEFT;
+                    $rightpos = SIDE_RIGHT;
+                    break;
+                case AXSTYLE_YBOXIN:
+                    $toppos = FALSE;
+                    $bottompos = SIDE_UP;
+                    $leftpos = SIDE_RIGHT;
+                    $rightpos = SIDE_LEFT;
+                    break;
+                case AXSTYLE_YBOXOUT:
+                    $toppos = FALSE;
+                    $bottompos = SIDE_DOWN;
+                    $leftpos = SIDE_LEFT;
+                    $rightpos = SIDE_RIGHT;
+                    break;
+                default:
+                    JpGRaphError::RaiseL(25036,$this->iAxisStyle); //('Unknown AxisStyle() : '.$this->iAxisStyle);
+                    break;
+            }
+
+            // By default we hide the first label so it doesn't cross the
+            // Y-axis in case the positon hasn't been set by the user.
+            // However, if we use a box we always want the first value
+            // displayed so we make sure it will be displayed.
+            $this->xscale->ticks->SupressFirst(false);
+
+            // Now draw the bottom X-axis
+            $this->xaxis->SetPos('min');
+            $this->xaxis->SetLabelSide(SIDE_DOWN);
+            $this->xaxis->scale->ticks->SetSide($bottompos);
+            $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
+
+            if( $toppos !== FALSE ) {
+                // We also want a top X-axis
+                $this->xaxis = $this->xaxis;
+                $this->xaxis->SetPos('max');
+                $this->xaxis->SetLabelSide(SIDE_UP);
+                // No title for the top X-axis
+                if( $aStrokeLabels ) {
+                    $this->xaxis->title->Set('');
+                }
+                $this->xaxis->scale->ticks->SetSide($toppos);
+                $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
+            }
+
+            // Stroke the left Y-axis
+            $this->yaxis->SetPos('min');
+            $this->yaxis->SetLabelSide(SIDE_LEFT);
+            $this->yaxis->scale->ticks->SetSide($leftpos);
+            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
+
+            // Stroke the  right Y-axis
+            $this->yaxis->SetPos('max');
+            // No title for the right side
+            if( $aStrokeLabels ) {
+                $this->yaxis->title->Set('');
+            }
+            $this->yaxis->SetLabelSide(SIDE_RIGHT);
+            $this->yaxis->scale->ticks->SetSide($rightpos);
+            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
+        }
+        else {
+            $this->xaxis->Stroke($this->yscale,$aStrokeLabels);
+            $this->yaxis->Stroke($this->xscale,$aStrokeLabels);
+        }
     }
 
@@ -2223 +2462 @@
     // Private helper function for backgound image
     static function LoadBkgImage($aImgFormat='',$aFile='',$aImgStr='') {
-        if( $aImgStr != '' ) {
-            return Image::CreateFromString($aImgStr);
-        }
-
-        // Remove case sensitivity and setup appropriate function to create image
-        // Get file extension. This should be the LAST '.' separated part of the filename
-        $e = explode('.',$aFile);
-        $ext = strtolower($e[count($e)-1]);
-        if ($ext == "jpeg")  {
-            $ext = "jpg";
-        }
-        
-        if( trim($ext) == '' ) 
-            $ext = 'png';  // Assume PNG if no extension specified
-
-        if( $aImgFormat == '' )
-            $imgtag = $ext;
-        else
-            $imgtag = $aImgFormat;
-
-        $supported = imagetypes();
-        if( ( $ext == 'jpg' && !($supported & IMG_JPG) ) ||
-            ( $ext == 'gif' && !($supported & IMG_GIF) ) ||
-            ( $ext == 'png' && !($supported & IMG_PNG) ) ||
-            ( $ext == 'bmp' && !($supported & IMG_WBMP) ) ||
-            ( $ext == 'xpm' && !($supported & IMG_XPM) ) ) {
-
-            JpGraphError::RaiseL(25037,$aFile);//('The image format of your background image ('.$aFile.') is not supported in your system configuration. ');
-        }
-
-
-        if( $imgtag == "jpg" || $imgtag == "jpeg")
-        {
-            $f = "imagecreatefromjpeg";
-            $imgtag = "jpg";
-        }
-        else
-        {
-            $f = "imagecreatefrom".$imgtag;
-        }
-
-        // Compare specified image type and file extension
-        if( $imgtag != $ext ) {
-            //$t = "Background image seems to be of different type (has different file extension) than specified imagetype. Specified: '".$aImgFormat."'File: '".$aFile."'";
-            JpGraphError::RaiseL(25038, $aImgFormat, $aFile);
-        }
-
-        $img = @$f($aFile);
-        if( !$img ) {
-            JpGraphError::RaiseL(25039,$aFile);//(" Can't read background image: '".$aFile."'");   
-        }
-        return $img;
-    }   
+        if( $aImgStr != '' ) {
+            return Image::CreateFromString($aImgStr);
+        }
+
+        // Remove case sensitivity and setup appropriate function to create image
+        // Get file extension. This should be the LAST '.' separated part of the filename
+        $e = explode('.',$aFile);
+        $ext = strtolower($e[count($e)-1]);
+        if ($ext == "jpeg")  {
+            $ext = "jpg";
+        }
+
+        if( trim($ext) == '' ) {
+            $ext = 'png';  // Assume PNG if no extension specified
+        }
+
+        if( $aImgFormat == '' ) {
+            $imgtag = $ext;
+        }
+        else {
+            $imgtag = $aImgFormat;
+        }
+
+        $supported = imagetypes();
+        if( ( $ext == 'jpg' && !($supported & IMG_JPG) ) ||
+            ( $ext == 'gif' && !($supported & IMG_GIF) ) ||
+            ( $ext == 'png' && !($supported & IMG_PNG) ) ||
+            ( $ext == 'bmp' && !($supported & IMG_WBMP) ) ||
+            ( $ext == 'xpm' && !($supported & IMG_XPM) ) ) {
+
+            JpGraphError::RaiseL(25037,$aFile);//('The image format of your background image ('.$aFile.') is not supported in your system configuration. ');
+        }
+
+
+        if( $imgtag == "jpg" || $imgtag == "jpeg") {
+            $f = "imagecreatefromjpeg";
+            $imgtag = "jpg";
+        }
+        else {
+            $f = "imagecreatefrom".$imgtag;
+        }
+
+        // Compare specified image type and file extension
+        if( $imgtag != $ext ) {
+            //$t = "Background image seems to be of different type (has different file extension) than specified imagetype. Specified: '".$aImgFormat."'File: '".$aFile."'";
+            JpGraphError::RaiseL(25038, $aImgFormat, $aFile);
+        }
+
+        $img = @$f($aFile);
+        if( !$img ) {
+            JpGraphError::RaiseL(25039,$aFile);//(" Can't read background image: '".$aFile."'");
+        }
+        return $img;
+    }
+
+    function StrokePlotGrad() {
+        if( $this->plot_gradtype < 0  )
+            return;
+            
+        $grad = new Gradient($this->img);
+        $xl = $this->img->left_margin;
+        $yt = $this->img->top_margin;
+        $xr = $xl + $this->img->plotwidth+1 ;
+        $yb = $yt + $this->img->plotheight ;
+        $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->plot_gradfrom,$this->plot_gradto,$this->plot_gradtype);
+
+    }
 
     function StrokeBackgroundGrad() {
-        if( $this->bkg_gradtype < 0  ) 
-            return;
-        $grad = new Gradient($this->img);
-        if( $this->bkg_gradstyle == BGRAD_PLOT ) {
-            $xl = $this->img->left_margin;
-            $yt = $this->img->top_margin;
-            $xr = $xl + $this->img->plotwidth+1 ;
-            $yb = $yt + $this->img->plotheight ; 
-            $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->bkg_gradfrom,$this->bkg_gradto,$this->bkg_gradtype);
-        }
-        else {
-            $xl = 0;
-            $yt = 0;
-            $xr = $xl + $this->img->width - 1;
-            $yb = $yt + $this->img->height ;
-            if( $this->doshadow  ) {
-                $xr -= $this->shadow_width; 
-                $yb -= $this->shadow_width; 
-            }
-            if( $this->doframe ) {
-                $yt += $this->frame_weight;
-                $yb -= $this->frame_weight;    
-                $xl += $this->frame_weight;
-                $xr -= $this->frame_weight;
-            }
-            $aa = $this->img->SetAngle(0);
-            $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->bkg_gradfrom,$this->bkg_gradto,$this->bkg_gradtype);
-            $aa = $this->img->SetAngle($aa);
-        }
+        if( $this->bkg_gradtype < 0  )
+            return;
+
+        $grad = new Gradient($this->img);
+        if( $this->bkg_gradstyle == BGRAD_PLOT ) {
+            $xl = $this->img->left_margin;
+            $yt = $this->img->top_margin;
+            $xr = $xl + $this->img->plotwidth+1 ;
+            $yb = $yt + $this->img->plotheight ;
+            $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->bkg_gradfrom,$this->bkg_gradto,$this->bkg_gradtype);
+        }
+        else {
+            $xl = 0;
+            $yt = 0;
+            $xr = $xl + $this->img->width - 1;
+            $yb = $yt + $this->img->height - 1 ;
+            if( $this->doshadow  ) {
+                $xr -= $this->shadow_width;
+                $yb -= $this->shadow_width;
+            }
+            if( $this->doframe ) {
+                $yt += $this->frame_weight;
+                $yb -= $this->frame_weight;
+                $xl += $this->frame_weight;
+                $xr -= $this->frame_weight;
+            }
+            $aa = $this->img->SetAngle(0);
+            $grad->FilledRectangle($xl,$yt,$xr,$yb,$this->bkg_gradfrom,$this->bkg_gradto,$this->bkg_gradtype);
+            $aa = $this->img->SetAngle($aa);
+        }
     }
 
     function StrokeFrameBackground() {
-        if( $this->background_image != "" && $this->background_cflag != "" ) {
-            JpGraphError::RaiseL(25040);//('It is not possible to specify both a background image and a background country flag.');
-        }
-        if( $this->background_image != "" ) {
-            $bkgimg = $this->LoadBkgImage($this->background_image_format,$this->background_image);
-        }
-        elseif( $this->background_cflag != "" ) {
-            if( ! class_exists('FlagImages',false) ) {
-                JpGraphError::RaiseL(25041);//('In order to use Country flags as backgrounds you must include the "jpgraph_flags.php" file.');
-            }
-            $fobj = new FlagImages(FLAGSIZE4);
-            $dummy='';
-            $bkgimg = $fobj->GetImgByName($this->background_cflag,$dummy);
-            $this->background_image_mix = $this->background_cflag_mix;
-            $this->background_image_type = $this->background_cflag_type;
-        }
-        else {
-            return ;
-        }
-
-        $bw = ImageSX($bkgimg);
-        $bh = ImageSY($bkgimg);
-
-        // No matter what the angle is we always stroke the image and frame
-        // assuming it is 0 degree
-        $aa = $this->img->SetAngle(0);
-                
-        switch( $this->background_image_type ) {
-            case BGIMG_FILLPLOT: // Resize to just fill the plotarea
-                $this->FillMarginArea();
-                $this->StrokeFrame();
-                // Special case to hande 90 degree rotated graph corectly
-                if( $aa == 90 ) {
-                    $this->img->SetAngle(90);
-                    $this->FillPlotArea();
-                    $aa = $this->img->SetAngle(0);
-                    $adj = ($this->img->height - $this->img->width)/2;
-                    $this->img->CopyMerge($bkgimg,
-                                          $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
-                                          0,0,
-                                          $this->img->plotheight+1,$this->img->plotwidth,
-                                          $bw,$bh,$this->background_image_mix);
-
-                }
-                else {
-                    $this->FillPlotArea();
-                    $this->img->CopyMerge($bkgimg,
-                                          $this->img->left_margin,$this->img->top_margin,
-                                          0,0,$this->img->plotwidth+1,$this->img->plotheight,
-                                          $bw,$bh,$this->background_image_mix);
-                }
-                break;
-            case BGIMG_FILLFRAME: // Fill the whole area from upper left corner, resize to just fit
-                $hadj=0; $vadj=0;
-                if( $this->doshadow ) {
-                    $hadj = $this->shadow_width;
-                    $vadj = $this->shadow_width;
-                }
-                $this->FillMarginArea();
-                $this->FillPlotArea();
-                $this->img->CopyMerge($bkgimg,0,0,0,0,$this->img->width-$hadj,$this->img->height-$vadj,
-                                      $bw,$bh,$this->background_image_mix);
-                $this->StrokeFrame();
-                break;
-            case BGIMG_COPY: // Just copy the image from left corner, no resizing
-                $this->FillMarginArea();
-                $this->FillPlotArea();
-                $this->img->CopyMerge($bkgimg,0,0,0,0,$bw,$bh,
-                                      $bw,$bh,$this->background_image_mix);
-                $this->StrokeFrame();
-                break;
-            case BGIMG_CENTER: // Center original image in the plot area
-                $this->FillMarginArea();
-                $this->FillPlotArea();
-                $centerx = round($this->img->plotwidth/2+$this->img->left_margin-$bw/2);
-                $centery = round($this->img->plotheight/2+$this->img->top_margin-$bh/2);
-                $this->img->CopyMerge($bkgimg,$centerx,$centery,0,0,$bw,$bh,
-                                      $bw,$bh,$this->background_image_mix);
-                $this->StrokeFrame();
-                break;
-            case BGIMG_FREE: // Just copy the image to the specified location
-                $this->img->CopyMerge($bkgimg,
-                                      $this->background_image_xpos,$this->background_image_ypos,
-                                      0,0,$bw,$bh,$bw,$bh,$this->background_image_mix);
-                $this->StrokeFrame(); // New
-                break;
-            default:
-                JpGraphError::RaiseL(25042);//(" Unknown background image layout");
-        }                       
-        $this->img->SetAngle($aa);              
+        if( $this->background_image != '' && $this->background_cflag != '' ) {
+            JpGraphError::RaiseL(25040);//('It is not possible to specify both a background image and a background country flag.');
+        }
+        if( $this->background_image != '' ) {
+            $bkgimg = $this->LoadBkgImage($this->background_image_format,$this->background_image);
+        }
+        elseif( $this->background_cflag != '' ) {
+            if( ! class_exists('FlagImages',false) ) {
+                JpGraphError::RaiseL(25041);//('In order to use Country flags as backgrounds you must include the "jpgraph_flags.php" file.');
+            }
+            $fobj = new FlagImages(FLAGSIZE4);
+            $dummy='';
+            $bkgimg = $fobj->GetImgByName($this->background_cflag,$dummy);
+            $this->background_image_mix = $this->background_cflag_mix;
+            $this->background_image_type = $this->background_cflag_type;
+        }
+        else {
+            return ;
+        }
+
+        $bw = ImageSX($bkgimg);
+        $bh = ImageSY($bkgimg);
+
+        // No matter what the angle is we always stroke the image and frame
+        // assuming it is 0 degree
+        $aa = $this->img->SetAngle(0);
+
+        switch( $this->background_image_type ) {
+            case BGIMG_FILLPLOT: // Resize to just fill the plotarea
+                $this->FillMarginArea();
+                $this->StrokeFrame();
+                // Special case to hande 90 degree rotated graph corectly
+                if( $aa == 90 ) {
+                    $this->img->SetAngle(90);
+                    $this->FillPlotArea();
+                    $aa = $this->img->SetAngle(0);
+                    $adj = ($this->img->height - $this->img->width)/2;
+                    $this->img->CopyMerge($bkgimg,
+                        $this->img->bottom_margin-$adj,$this->img->left_margin+$adj,
+                        0,0,
+                        $this->img->plotheight+1,$this->img->plotwidth,
+                        $bw,$bh,$this->background_image_mix);
+                }
+                else {
+                    $this->FillPlotArea();
+                    $this->img->CopyMerge($bkgimg,
+                        $this->img->left_margin,$this->img->top_margin+1,
+                        0,0,$this->img->plotwidth+1,$this->img->plotheight,
+                        $bw,$bh,$this->background_image_mix);
+                }
+                break;
+            case BGIMG_FILLFRAME: // Fill the whole area from upper left corner, resize to just fit
+                $hadj=0; $vadj=0;
+                if( $this->doshadow ) {
+                    $hadj = $this->shadow_width;
+                    $vadj = $this->shadow_width;
+                }
+                $this->FillMarginArea();
+                $this->FillPlotArea();
+                $this->img->CopyMerge($bkgimg,0,0,0,0,$this->img->width-$hadj,$this->img->height-$vadj,
+                $bw,$bh,$this->background_image_mix);
+                $this->StrokeFrame();
+                break;
+            case BGIMG_COPY: // Just copy the image from left corner, no resizing
+                $this->FillMarginArea();
+                $this->FillPlotArea();
+                $this->img->CopyMerge($bkgimg,0,0,0,0,$bw,$bh,
+                $bw,$bh,$this->background_image_mix);
+                $this->StrokeFrame();
+                break;
+            case BGIMG_CENTER: // Center original image in the plot area
+                $this->FillMarginArea();
+                $this->FillPlotArea();
+                $centerx = round($this->img->plotwidth/2+$this->img->left_margin-$bw/2);
+                $centery = round($this->img->plotheight/2+$this->img->top_margin-$bh/2);
+                $this->img->CopyMerge($bkgimg,$centerx,$centery,0,0,$bw,$bh,
+                $bw,$bh,$this->background_image_mix);
+                $this->StrokeFrame();
+                break;
+            case BGIMG_FREE: // Just copy the image to the specified location
+                $this->img->CopyMerge($bkgimg,
+                $this->background_image_xpos,$this->background_image_ypos,
+                0,0,$bw,$bh,$bw,$bh,$this->background_image_mix);
+                $this->StrokeFrame(); // New
+                break;
+            default:
+                JpGraphError::RaiseL(25042);//(" Unknown background image layout");
+        }
+        $this->img->SetAngle($aa);
     }
 
@@ -2405 +2658 @@
     // Draw a frame around the image
     function StrokeFrame() {
-        if( !$this->doframe ) return;
-
-        if( $this->background_image_type <= 1 && 
-            ($this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_PLOT)) ) { 
-            $c = $this->margin_color;
-        }
-        else {
-            $c = false;
-        }
-        
-        if( $this->doshadow ) {
-            $this->img->SetColor($this->frame_color);                   
-            $this->img->ShadowRectangle(0,0,$this->img->width,$this->img->height,
-                                        $c,$this->shadow_width,$this->shadow_color);
-        }
-        elseif( $this->framebevel ) {
-            if( $c ) {
-                $this->img->SetColor($this->margin_color);
-                $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1); 
-            }
-            $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
-                              $this->framebeveldepth,
-                              $this->framebevelcolor1,$this->framebevelcolor2);
-            if( $this->framebevelborder ) {
-                $this->img->SetColor($this->framebevelbordercolor);
-                $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
-            }
-        }
-        else {
-            $this->img->SetLineWeight($this->frame_weight);
-            if( $c ) {
-                $this->img->SetColor($this->margin_color);
-                $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1); 
-            }
-            $this->img->SetColor($this->frame_color);
-            $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);                
-        }
+        if( !$this->doframe ) return;
+
+        if( $this->background_image_type <= 1 && ($this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_PLOT)) ) {
+            $c = $this->margin_color;
+        }
+        else {
+            $c = false;
+        }
+
+        if( $this->doshadow ) {
+            $this->img->SetColor($this->frame_color);
+            $this->img->ShadowRectangle(0,0,$this->img->width,$this->img->height,
+            $c,$this->shadow_width,$this->shadow_color);
+        }
+        elseif( $this->framebevel ) {
+            if( $c ) {
+                $this->img->SetColor($this->margin_color);
+                $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1);
+            }
+            $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
+            $this->framebeveldepth,
+            $this->framebevelcolor1,$this->framebevelcolor2);
+            if( $this->framebevelborder ) {
+                $this->img->SetColor($this->framebevelbordercolor);
+                $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
+            }
+        }
+        else {
+            $this->img->SetLineWeight($this->frame_weight);
+            if( $c ) {
+                $this->img->SetColor($this->margin_color);
+                $this->img->FilledRectangle(0,0,$this->img->width-1,$this->img->height-1);
+            }
+            $this->img->SetColor($this->frame_color);
+            $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
+        }
     }
 
     function FillMarginArea() {
-        $hadj=0; $vadj=0;
-        if( $this->doshadow ) {
-            $hadj = $this->shadow_width;
-            $vadj = $this->shadow_width;
-        }
-
-        $this->img->SetColor($this->margin_color);
-//      $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->height-1-$vadj); 
-
-        $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->top_margin); 
-        $this->img->FilledRectangle(0,$this->img->top_margin,$this->img->left_margin,$this->img->height-1-$hadj); 
-        $this->img->FilledRectangle($this->img->left_margin+1,
-                                    $this->img->height-$this->img->bottom_margin,
-                                    $this->img->width-1-$hadj,
-                                    $this->img->height-1-$hadj); 
-        $this->img->FilledRectangle($this->img->width-$this->img->right_margin,
-                                    $this->img->top_margin+1,
-                                    $this->img->width-1-$hadj,
-                                    $this->img->height-$this->img->bottom_margin-1); 
+        $hadj=0; $vadj=0;
+        if( $this->doshadow ) {
+            $hadj = $this->shadow_width;
+            $vadj = $this->shadow_width;
+        }
+
+        $this->img->SetColor($this->margin_color);
+        $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->height-1-$vadj);
+
+        $this->img->FilledRectangle(0,0,$this->img->width-1-$hadj,$this->img->top_margin);
+        $this->img->FilledRectangle(0,$this->img->top_margin,$this->img->left_margin,$this->img->height-1-$hadj);
+        $this->img->FilledRectangle($this->img->left_margin+1,
+        $this->img->height-$this->img->bottom_margin,
+        $this->img->width-1-$hadj,
+        $this->img->height-1-$hadj);
+        $this->img->FilledRectangle($this->img->width-$this->img->right_margin,
+        $this->img->top_margin+1,
+        $this->img->width-1-$hadj,
+        $this->img->height-$this->img->bottom_margin-1);
     }
 
     function FillPlotArea() {
-        $this->img->PushColor($this->plotarea_color);
-        $this->img->FilledRectangle($this->img->left_margin,
-                                    $this->img->top_margin,
-                                    $this->img->width-$this->img->right_margin,
-                                    $this->img->height-$this->img->bottom_margin);      
-        $this->img->PopColor();
-    }
-    
+        $this->img->PushColor($this->plotarea_color);
+        $this->img->FilledRectangle($this->img->left_margin,
+        $this->img->top_margin,
+        $this->img->width-$this->img->right_margin,
+        $this->img->height-$this->img->bottom_margin);
+        $this->img->PopColor();
+    }
+
     // Stroke the plot area with either a solid color or a background image
     function StrokePlotArea() {
-        // Note: To be consistent we really should take a possible shadow
-        // into account. However, that causes some problem for the LinearScale class
-        // since in the current design it does not have any links to class Graph which
-        // means it has no way of compensating for the adjusted plotarea in case of a 
-        // shadow. So, until I redesign LinearScale we can't compensate for this.
-        // So just set the two adjustment parameters to zero for now.
-        $boxadj = 0; //$this->doframe ? $this->frame_weight : 0 ;
-        $adj = 0; //$this->doshadow ? $this->shadow_width : 0 ;
-
-        if( $this->background_image != "" || $this->background_cflag != "" ) {
-            $this->StrokeFrameBackground();
-        }
-        else {
-            $aa = $this->img->SetAngle(0);
-            $this->StrokeFrame();
-            $aa = $this->img->SetAngle($aa);
-            $this->StrokeBackgroundGrad();
-            if( $this->bkg_gradtype < 0 || 
-                ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_MARGIN) ) {
-                $this->FillPlotArea();
-            }
-        }       
-    }   
+        // Note: To be consistent we really should take a possible shadow
+        // into account. However, that causes some problem for the LinearScale class
+        // since in the current design it does not have any links to class Graph which
+        // means it has no way of compensating for the adjusted plotarea in case of a
+        // shadow. So, until I redesign LinearScale we can't compensate for this.
+        // So just set the two adjustment parameters to zero for now.
+        $boxadj = 0; //$this->doframe ? $this->frame_weight : 0 ;
+        $adj = 0; //$this->doshadow ? $this->shadow_width : 0 ;
+
+        if( $this->background_image != '' || $this->background_cflag != '' ) {
+            $this->StrokeFrameBackground();
+        }
+        else {
+            $aa = $this->img->SetAngle(0);
+            $this->StrokeFrame();
+            $aa = $this->img->SetAngle($aa);
+            $this->StrokeBackgroundGrad(); 
+            if( $this->bkg_gradtype < 0 || ($this->bkg_gradtype > 0 && $this->bkg_gradstyle==BGRAD_MARGIN) ) {
+                $this->FillPlotArea();
+            }
+            $this->StrokePlotGrad();
+        }
+    }
 
     function StrokeIcons() {
-        $n = count($this->iIcons);
-        for( $i=0; $i < $n; ++$i ) {
-            $this->iIcons[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
-        }
-    }
-        
+        $n = count($this->iIcons);
+        for( $i=0; $i < $n; ++$i ) {
+            $this->iIcons[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
+        }
+    }
+
     function StrokePlotBox() {
-        // Should we draw a box around the plot area?
-        if( $this->boxed ) {
-            $this->img->SetLineWeight(1);
-            $this->img->SetLineStyle('solid');
-            $this->img->SetColor($this->box_color);
-            for($i=0; $i < $this->box_weight; ++$i ) {
-                $this->img->Rectangle(
-                    $this->img->left_margin-$i,$this->img->top_margin-$i,
-                    $this->img->width-$this->img->right_margin+$i,
-                    $this->img->height-$this->img->bottom_margin+$i);
-            }
-        }                                               
-    }           
+        // Should we draw a box around the plot area?
+        if( $this->boxed ) {
+            $this->img->SetLineWeight(1);
+            $this->img->SetLineStyle('solid');
+            $this->img->SetColor($this->box_color);
+            for($i=0; $i < $this->box_weight; ++$i ) {
+                $this->img->Rectangle(
+                $this->img->left_margin-$i,$this->img->top_margin-$i,
+                $this->img->width-$this->img->right_margin+$i,
+                $this->img->height-$this->img->bottom_margin+$i);
+            }
+        }
+    }
 
     function SetTitleBackgroundFillStyle($aStyle,$aColor1='black',$aColor2='white') {
-        $this->titlebkg_fillstyle = $aStyle;
-        $this->titlebkg_scolor1 = $aColor1;
-        $this->titlebkg_scolor2 = $aColor2;
+        $this->titlebkg_fillstyle = $aStyle;
+        $this->titlebkg_scolor1 = $aColor1;
+        $this->titlebkg_scolor2 = $aColor2;
     }
 
     function SetTitleBackground($aBackColor='gray', $aStyle=TITLEBKG_STYLE1, $aFrameStyle=TITLEBKG_FRAME_NONE, $aFrameColor='black', $aFrameWeight=1, $aBevelHeight=3, $aEnable=true) {
-        $this->titlebackground = $aEnable;
-        $this->titlebackground_color = $aBackColor;
-        $this->titlebackground_style = $aStyle;
-        $this->titlebackground_framecolor = $aFrameColor;
-        $this->titlebackground_framestyle = $aFrameStyle;
-        $this->titlebackground_frameweight = $aFrameWeight;     
-        $this->titlebackground_bevelheight = $aBevelHeight ;
+        $this->titlebackground = $aEnable;
+        $this->titlebackground_color = $aBackColor;
+        $this->titlebackground_style = $aStyle;
+        $this->titlebackground_framecolor = $aFrameColor;
+        $this->titlebackground_framestyle = $aFrameStyle;
+        $this->titlebackground_frameweight = $aFrameWeight;
+        $this->titlebackground_bevelheight = $aBevelHeight ;
     }
 
@@ -2542 +2794 @@
     function StrokeTitles() {
 
-        $margin=3;
-
-        if( $this->titlebackground ) {
-
-            // Find out height
-            $this->title->margin += 2 ;
-            $h = $this->title->GetTextHeight($this->img)+$this->title->margin+$margin;
-            if( $this->subtitle->t != "" && !$this->subtitle->hide ) {
-                $h += $this->subtitle->GetTextHeight($this->img)+$margin+
-                    $this->subtitle->margin;
-                $h += 2;
-            }
-            if( $this->subsubtitle->t != "" && !$this->subsubtitle->hide ) {
-                $h += $this->subsubtitle->GetTextHeight($this->img)+$margin+
-                    $this->subsubtitle->margin;
-                $h += 2;
-            }
-            $this->img->PushColor($this->titlebackground_color);
-            if( $this->titlebackground_style === TITLEBKG_STYLE1 ) {
-                // Inside the frame
-                if( $this->framebevel ) {
-                    $x1 = $y1 = $this->framebeveldepth + 1 ;
-                    $x2 = $this->img->width - $this->framebeveldepth - 2 ; 
-                    $this->title->margin += $this->framebeveldepth + 1 ;
-                    $h += $y1 ;
-                    $h += 2;
-                }
-                else {
-                    $x1 = $y1 = $this->frame_weight;
-                    $x2 = $this->img->width - 2*$x1;
-                }
-            }
-            elseif( $this->titlebackground_style === TITLEBKG_STYLE2 ) {
-                // Cover the frame as well
-                $x1 = $y1 = 0;
-                $x2 = $this->img->width - 1 ;
-            }
-            elseif( $this->titlebackground_style === TITLEBKG_STYLE3 ) {
-                // Cover the frame as well (the difference is that
-                // for style==3 a bevel frame border is on top
-                // of the title background)
-                $x1 = $y1 = 0;
-                $x2 = $this->img->width - 1 ;
-                $h += $this->framebeveldepth ;
-                $this->title->margin += $this->framebeveldepth ;
-            }
-            else {
-                JpGraphError::RaiseL(25043);//('Unknown title background style.');
-            }
-
-            if( $this->titlebackground_framestyle === 3 ) {
-                $h += $this->titlebackground_bevelheight*2 + 1  ;
-                $this->title->margin += $this->titlebackground_bevelheight ;
-            }
-
-            if( $this->doshadow ) {
-                $x2 -= $this->shadow_width ;
-            }
-            
-            $indent=0;
-            if( $this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL ) {
-                $ind = $this->titlebackground_bevelheight;
-            }
-
-            if( $this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_HSTRIPED ) {
-                $this->img->FilledRectangle2($x1+$ind,$y1+$ind,$x2-$ind,$h-$ind,
-                                             $this->titlebkg_scolor1,
-                                             $this->titlebkg_scolor2);
-            }
-            elseif( $this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_VSTRIPED ) {
-                $this->img->FilledRectangle2($x1+$ind,$y1+$ind,$x2-$ind,$h-$ind,
-                                             $this->titlebkg_scolor1,
-                                             $this->titlebkg_scolor2,2);
-            }
-            else {
-                // Solid fill
-                $this->img->FilledRectangle($x1,$y1,$x2,$h);
-            }
-            $this->img->PopColor();
-
-            $this->img->PushColor($this->titlebackground_framecolor);
-            $this->img->SetLineWeight($this->titlebackground_frameweight);
-            if( $this->titlebackground_framestyle == TITLEBKG_FRAME_FULL ) {
-                // Frame background
-                $this->img->Rectangle($x1,$y1,$x2,$h);
-            }
-            elseif( $this->titlebackground_framestyle == TITLEBKG_FRAME_BOTTOM ) {
-                // Bottom line only
-                $this->img->Line($x1,$h,$x2,$h);
-            }
-            elseif( $this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL ) {
-                $this->img->Bevel($x1,$y1,$x2,$h,$this->titlebackground_bevelheight);
-            }
-            $this->img->PopColor();
-
-            // This is clumsy. But we neeed to stroke the whole graph frame if it is
-            // set to bevel to get the bevel shading on top of the text background
-            if( $this->framebevel && $this->doframe && 
-                $this->titlebackground_style === 3 ) {
-                $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
-                                  $this->framebeveldepth,
-                                  $this->framebevelcolor1,$this->framebevelcolor2);
-                if( $this->framebevelborder ) {
-                    $this->img->SetColor($this->framebevelbordercolor);
-                    $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
-                }
-            }
-        }
-
-        // Stroke title
-        $y = $this->title->margin; 
-        if( $this->title->halign == 'center' ) 
-            $this->title->Center(0,$this->img->width,$y);
-        elseif( $this->title->halign == 'left' ) {
-            $this->title->SetPos($this->title->margin+2,$y);
-        }
-        elseif( $this->title->halign == 'right' ) {
-            $indent = 0;
-            if( $this->doshadow ) 
-                $indent = $this->shadow_width+2;
-            $this->title->SetPos($this->img->width-$this->title->margin-$indent,$y,'right');        
-        }
-        $this->title->Stroke($this->img);
-                
-        // ... and subtitle
-        $y += $this->title->GetTextHeight($this->img) + $margin + $this->subtitle->margin;
-        if( $this->subtitle->halign == 'center' ) 
-            $this->subtitle->Center(0,$this->img->width,$y);
-        elseif( $this->subtitle->halign == 'left' ) {
-            $this->subtitle->SetPos($this->subtitle->margin+2,$y);
-        }
-        elseif( $this->subtitle->halign == 'right' ) {
-            $indent = 0;
-            if( $this->doshadow ) 
-                $indent = $this->shadow_width+2;
-            $this->subtitle->SetPos($this->img->width-$this->subtitle->margin-$indent,$y,'right'); 
-        }
-        $this->subtitle->Stroke($this->img);
-
-        // ... and subsubtitle
-        $y += $this->subtitle->GetTextHeight($this->img) + $margin + $this->subsubtitle->margin;
-        if( $this->subsubtitle->halign == 'center' ) 
-            $this->subsubtitle->Center(0,$this->img->width,$y);
-        elseif( $this->subsubtitle->halign == 'left' ) {
-            $this->subsubtitle->SetPos($this->subsubtitle->margin+2,$y);
-        }
-        elseif( $this->subsubtitle->halign == 'right' ) {
-            $indent = 0;
-            if( $this->doshadow ) 
-                $indent = $this->shadow_width+2;
-            $this->subsubtitle->SetPos($this->img->width-$this->subsubtitle->margin-$indent,$y,'right'); 
-        }
-        $this->subsubtitle->Stroke($this->img);
-
-        // ... and fancy title
-        $this->tabtitle->Stroke($this->img);
+        $margin=3;
+
+        if( $this->titlebackground ) {
+            // Find out height
+            $this->title->margin += 2 ;
+            $h = $this->title->GetTextHeight($this->img)+$this->title->margin+$margin;
+            if( $this->subtitle->t != '' && !$this->subtitle->hide ) {
+                $h += $this->subtitle->GetTextHeight($this->img)+$margin+
+                $this->subtitle->margin;
+                $h += 2;
+            }
+            if( $this->subsubtitle->t != '' && !$this->subsubtitle->hide ) {
+                $h += $this->subsubtitle->GetTextHeight($this->img)+$margin+
+                $this->subsubtitle->margin;
+                $h += 2;
+            }
+            $this->img->PushColor($this->titlebackground_color);
+            if( $this->titlebackground_style === TITLEBKG_STYLE1 ) {
+                // Inside the frame
+                if( $this->framebevel ) {
+                    $x1 = $y1 = $this->framebeveldepth + 1 ;
+                    $x2 = $this->img->width - $this->framebeveldepth - 2 ;
+                    $this->title->margin += $this->framebeveldepth + 1 ;
+                    $h += $y1 ;
+                    $h += 2;
+                }
+                else {
+                    $x1 = $y1 = $this->frame_weight;
+                    $x2 = $this->img->width - $this->frame_weight-1;
+                }
+            }
+            elseif( $this->titlebackground_style === TITLEBKG_STYLE2 ) {
+                // Cover the frame as well
+                $x1 = $y1 = 0;
+                $x2 = $this->img->width - 1 ;
+            }
+            elseif( $this->titlebackground_style === TITLEBKG_STYLE3 ) {
+                // Cover the frame as well (the difference is that
+                // for style==3 a bevel frame border is on top
+                // of the title background)
+                $x1 = $y1 = 0;
+                $x2 = $this->img->width - 1 ;
+                $h += $this->framebeveldepth ;
+                $this->title->margin += $this->framebeveldepth ;
+            }
+            else {
+                JpGraphError::RaiseL(25043);//('Unknown title background style.');
+            }
+
+            if( $this->titlebackground_framestyle === 3 ) {
+                $h += $this->titlebackground_bevelheight*2 + 1  ;
+                $this->title->margin += $this->titlebackground_bevelheight ;
+            }
+
+            if( $this->doshadow ) {
+                $x2 -= $this->shadow_width ;
+            }
+
+            $indent=0;
+            if( $this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL ) {
+                $indent = $this->titlebackground_bevelheight;
+            }
+
+            if( $this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_HSTRIPED ) {
+                $this->img->FilledRectangle2($x1+$indent,$y1+$indent,$x2-$indent,$h-$indent,
+                $this->titlebkg_scolor1,
+                $this->titlebkg_scolor2);
+            }
+            elseif( $this->titlebkg_fillstyle==TITLEBKG_FILLSTYLE_VSTRIPED ) {
+                $this->img->FilledRectangle2($x1+$indent,$y1+$indent,$x2-$indent,$h-$indent,
+                $this->titlebkg_scolor1,
+                $this->titlebkg_scolor2,2);
+            }
+            else {
+                // Solid fill
+                $this->img->FilledRectangle($x1,$y1,$x2,$h);
+            }
+            $this->img->PopColor();
+
+            $this->img->PushColor($this->titlebackground_framecolor);
+            $this->img->SetLineWeight($this->titlebackground_frameweight);
+            if( $this->titlebackground_framestyle == TITLEBKG_FRAME_FULL ) {
+                // Frame background
+                $this->img->Rectangle($x1,$y1,$x2,$h);
+            }
+            elseif( $this->titlebackground_framestyle == TITLEBKG_FRAME_BOTTOM ) {
+                // Bottom line only
+                $this->img->Line($x1,$h,$x2,$h);
+            }
+            elseif( $this->titlebackground_framestyle == TITLEBKG_FRAME_BEVEL ) {
+                $this->img->Bevel($x1,$y1,$x2,$h,$this->titlebackground_bevelheight);
+            }
+            $this->img->PopColor();
+
+            // This is clumsy. But we neeed to stroke the whole graph frame if it is
+            // set to bevel to get the bevel shading on top of the text background
+            if( $this->framebevel && $this->doframe && $this->titlebackground_style === 3 ) {
+                $this->img->Bevel(1,1,$this->img->width-2,$this->img->height-2,
+                $this->framebeveldepth,
+                $this->framebevelcolor1,$this->framebevelcolor2);
+                if( $this->framebevelborder ) {
+                    $this->img->SetColor($this->framebevelbordercolor);
+                    $this->img->Rectangle(0,0,$this->img->width-1,$this->img->height-1);
+                }
+            }
+        }
+
+        // Stroke title
+        $y = $this->title->margin;
+        if( $this->title->halign == 'center' ) {
+            $this->title->Center(0,$this->img->width,$y);
+        }
+        elseif( $this->title->halign == 'left' ) {
+            $this->title->SetPos($this->title->margin+2,$y);
+        }
+        elseif( $this->title->halign == 'right' ) {
+            $indent = 0;
+            if( $this->doshadow ) {
+                $indent = $this->shadow_width+2;
+            }
+            $this->title->SetPos($this->img->width-$this->title->margin-$indent,$y,'right');
+        }
+        $this->title->Stroke($this->img);
+
+        // ... and subtitle
+        $y += $this->title->GetTextHeight($this->img) + $margin + $this->subtitle->margin;
+        if( $this->subtitle->halign == 'center' ) {
+            $this->subtitle->Center(0,$this->img->width,$y);
+        }
+        elseif( $this->subtitle->halign == 'left' ) {
+            $this->subtitle->SetPos($this->subtitle->margin+2,$y);
+        }
+        elseif( $this->subtitle->halign == 'right' ) {
+            $indent = 0;
+            if( $this->doshadow )
+            $indent = $this->shadow_width+2;
+            $this->subtitle->SetPos($this->img->width-$this->subtitle->margin-$indent,$y,'right');
+        }
+        $this->subtitle->Stroke($this->img);
+
+        // ... and subsubtitle
+        $y += $this->subtitle->GetTextHeight($this->img) + $margin + $this->subsubtitle->margin;
+        if( $this->subsubtitle->halign == 'center' ) {
+            $this->subsubtitle->Center(0,$this->img->width,$y);
+        }
+        elseif( $this->subsubtitle->halign == 'left' ) {
+            $this->subsubtitle->SetPos($this->subsubtitle->margin+2,$y);
+        }
+        elseif( $this->subsubtitle->halign == 'right' ) {
+            $indent = 0;
+            if( $this->doshadow )
+            $indent = $this->shadow_width+2;
+            $this->subsubtitle->SetPos($this->img->width-$this->subsubtitle->margin-$indent,$y,'right');
+        }
+        $this->subsubtitle->Stroke($this->img);
+
+        // ... and fancy title
+        $this->tabtitle->Stroke($this->img);
 
     }
 
     function StrokeTexts() {
-        // Stroke any user added text objects
-        if( $this->texts != null ) {
-            for($i=0; $i < count($this->texts); ++$i) {
-                $this->texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
-            }
-        }
-
-        if( $this->y2texts != null && $this->y2scale != null ) {
-            for($i=0; $i < count($this->y2texts); ++$i) {
-                $this->y2texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->y2scale);
-            }
-        }
+        // Stroke any user added text objects
+        if( $this->texts != null ) {
+            for($i=0; $i < count($this->texts); ++$i) {
+                $this->texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
+            }
+        }
+
+        if( $this->y2texts != null && $this->y2scale != null ) {
+            for($i=0; $i < count($this->y2texts); ++$i) {
+                $this->y2texts[$i]->StrokeWithScale($this->img,$this->xscale,$this->y2scale);
+            }
+        }
 
     }
 
     function StrokeTables() {
-        if( $this->iTables != null ) {
-            $n = count($this->iTables);
-            for( $i=0; $i < $n; ++$i ) {
-                $this->iTables[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
-            }
-        }
+        if( $this->iTables != null ) {
+            $n = count($this->iTables);
+            for( $i=0; $i < $n; ++$i ) {
+                $this->iTables[$i]->StrokeWithScale($this->img,$this->xscale,$this->yscale);
+            }
+        }
     }
 
     function DisplayClientSideaImageMapAreas() {
-        // Debug stuff - display the outline of the image map areas
-        $csim='';
-        foreach ($this->plots as $p) {
-            $csim.= $p->GetCSIMareas();
-        }
-        $csim .= $this->legend->GetCSIMareas();
-        if (preg_match_all("/area shape=\"(\w+)\" coords=\"([0-9\, ]+)\"/", $csim, $coords)) {
-            $this->img->SetColor($this->csimcolor);
-            $n = count($coords[0]);
-            for ($i=0; $i < $n; $i++) {
-                if ($coords[1][$i]=="poly") {
-                    preg_match_all('/\s*([0-9]+)\s*,\s*([0-9]+)\s*,*/',$coords[2][$i],$pts);
-                    $this->img->SetStartPoint($pts[1][count($pts[0])-1],$pts[2][count($pts[0])-1]);
-                    $m = count($pts[0]);
-                    for ($j=0; $j < $m; $j++) {
-                        $this->img->LineTo($pts[1][$j],$pts[2][$j]);
-                    }
-                } else if ($coords[1][$i]=="rect") {
-                    $pts = preg_split('/,/', $coords[2][$i]);
-                    $this->img->SetStartPoint($pts[0],$pts[1]);
-                    $this->img->LineTo($pts[2],$pts[1]);
-                    $this->img->LineTo($pts[2],$pts[3]);
-                    $this->img->LineTo($pts[0],$pts[3]);
-                    $this->img->LineTo($pts[0],$pts[1]);                                        
-                }
-            }
-        }
+        // Debug stuff - display the outline of the image map areas
+        $csim='';
+        foreach ($this->plots as $p) {
+            $csim.= $p->GetCSIMareas();
+        }
+        $csim .= $this->legend->GetCSIMareas();
+        if (preg_match_all("/area shape=\"(\w+)\" coords=\"([0-9\, ]+)\"/", $csim, $coords)) {
+            $this->img->SetColor($this->csimcolor);
+            $n = count($coords[0]);
+            for ($i=0; $i < $n; $i++) {
+                if ( $coords[1][$i] == 'poly' ) {
+                    preg_match_all('/\s*([0-9]+)\s*,\s*([0-9]+)\s*,*/',$coords[2][$i],$pts);
+                    $this->img->SetStartPoint($pts[1][count($pts[0])-1],$pts[2][count($pts[0])-1]);
+                    $m = count($pts[0]);
+                    for ($j=0; $j < $m; $j++) {
+                        $this->img->LineTo($pts[1][$j],$pts[2][$j]);
+                    }
+                } elseif ( $coords[1][$i] == 'rect' ) {
+                    $pts = preg_split('/,/', $coords[2][$i]);
+                    $this->img->SetStartPoint($pts[0],$pts[1]);
+                    $this->img->LineTo($pts[2],$pts[1]);
+                    $this->img->LineTo($pts[2],$pts[3]);
+                    $this->img->LineTo($pts[0],$pts[3]);
+                    $this->img->LineTo($pts[0],$pts[1]);
+                }
+            }
+        }
     }
 
     // Text scale offset in world coordinates
     function SetTextScaleOff($aOff) {
-        $this->text_scale_off = $aOff;
-        $this->xscale->text_scale_off = $aOff;
+        $this->text_scale_off = $aOff;
+        $this->xscale->text_scale_off = $aOff;
     }
 
     // Text width of bar to be centered in absolute pixels
     function SetTextScaleAbsCenterOff($aOff) {
-        $this->text_scale_abscenteroff = $aOff;
+        $this->text_scale_abscenteroff = $aOff;
     }
 
     // Get Y min and max values for added lines
     function GetLinesYMinMax( $aLines ) {
-        $n = count($aLines);
-        if( $n == 0 ) return false;
-        $min = $aLines[0]->scaleposition ;
-        $max = $min ;
-        $flg = false;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $aLines[$i]->direction == HORIZONTAL ) {
-                $flg = true ;
-                $v = $aLines[$i]->scaleposition ;
-                if( $min > $v ) $min = $v ;
-                if( $max < $v ) $max = $v ;
-            }
-        }
-        return $flg ? array($min,$max) : false ;
+        $n = is_array($aLines) ? count($aLines) : 0;
+        if( $n == 0 ) return false;
+        $min = $aLines[0]->scaleposition ;
+        $max = $min ;
+        $flg = false;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $aLines[$i]->direction == HORIZONTAL ) {
+                $flg = true ;
+                $v = $aLines[$i]->scaleposition ;
+                if( $min > $v ) $min = $v ;
+                if( $max < $v ) $max = $v ;
+            }
+        }
+        return $flg ? array($min,$max) : false ;
     }
 
     // Get X min and max values for added lines
     function GetLinesXMinMax( $aLines ) {
-        $n = count($aLines);
-        if( $n == 0 ) return false ;
-        $min = $aLines[0]->scaleposition ;
-        $max = $min ;
-        $flg = false;
-        for( $i=0; $i < $n; ++$i ) {
-            if( $aLines[$i]->direction == VERTICAL ) {
-                $flg = true ;
-                $v = $aLines[$i]->scaleposition ;
-                if( $min > $v ) $min = $v ;
-                if( $max < $v ) $max = $v ;
-            }
-        }
-        return $flg ? array($min,$max) : false ;
+        $n = is_array($aLines) ? count($aLines) : 0;
+        if( $n == 0 ) return false ;
+        $min = $aLines[0]->scaleposition ;
+        $max = $min ;
+        $flg = false;
+        for( $i=0; $i < $n; ++$i ) {
+            if( $aLines[$i]->direction == VERTICAL ) {
+                $flg = true ;
+                $v = $aLines[$i]->scaleposition ;
+                if( $min > $v ) $min = $v ;
+                if( $max < $v ) $max = $v ;
+            }
+        }
+        return $flg ? array($min,$max) : false ;
     }
 
     // Get min and max values for all included plots
     function GetPlotsYMinMax($aPlots) {
-        $n = count($aPlots);
-        $i=0;
-        do { 
-            list($xmax,$max) = $aPlots[$i]->Max();
-        } while( ++$i < $n && !is_numeric($max) );
-
-        $i=0;
-        do { 
-            list($xmin,$min) = $aPlots[$i]->Min();
-        } while( ++$i < $n && !is_numeric($min) );
-        
-        if( !is_numeric($min) || !is_numeric($max) ) {
-            JpGraphError::RaiseL(25044);//('Cannot use autoscaling since it is impossible to determine a valid min/max value  of the Y-axis (only null values).');
-        }
-
-        for($i=0; $i < $n; ++$i ) {
-            list($xmax,$ymax)=$aPlots[$i]->Max();
-            list($xmin,$ymin)=$aPlots[$i]->Min();
-            if (is_numeric($ymax)) $max=max($max,$ymax);
-            if (is_numeric($ymin)) $min=min($min,$ymin);
-        }
-        if( $min == '' ) $min = 0;
-        if( $max == '' ) $max = 0;
-        if( $min == 0 && $max == 0 ) {
-            // Special case if all values are 0
-            $min=0;$max=1;                      
-        }
-        return array($min,$max);
+        $n = count($aPlots);
+        $i=0;
+        do {
+            list($xmax,$max) = $aPlots[$i]->Max();
+        } while( ++$i < $n && !is_numeric($max) );
+
+        $i=0;
+        do {
+            list($xmin,$min) = $aPlots[$i]->Min();
+        } while( ++$i < $n && !is_numeric($min) );
+
+        if( !is_numeric($min) || !is_numeric($max) ) {
+            JpGraphError::RaiseL(25044);//('Cannot use autoscaling since it is impossible to determine a valid min/max value  of the Y-axis (only null values).');
+        }
+
+        for($i=0; $i < $n; ++$i ) {
+            list($xmax,$ymax)=$aPlots[$i]->Max();
+            list($xmin,$ymin)=$aPlots[$i]->Min();
+            if (is_numeric($ymax)) $max=max($max,$ymax);
+            if (is_numeric($ymin)) $min=min($min,$ymin);
+        }
+        if( $min == '' ) $min = 0;
+        if( $max == '' ) $max = 0;
+        if( $min == 0 && $max == 0 ) {
+            // Special case if all values are 0
+            $min=0;$max=1;
+        }
+        return array($min,$max);
+    }
+
+    function hasLinePlotAndBarPlot() {
+        $has_line = false;
+        $has_bar  = false;
+
+        foreach ($this->plots as $plot) {
+            if ($plot instanceof LinePlot) {
+                $has_line = true;
+            }
+            if ($plot instanceof BarPlot) {
+                $has_bar = true;
+            }
+        }
+
+        if ($has_line && $has_bar) {
+            return true;
+        }
+
+        return false;
+    }
+
+    function SetTheme($graph_theme) {
+
+        if (!($this instanceof PieGraph)) {
+            if (!$this->isAfterSetScale) {
+                JpGraphError::RaiseL(25133);//('Use Graph::SetTheme() after Graph::SetScale().');
+            }
+        }
+
+        if ($this->graph_theme) {
+            $this->ClearTheme();
+        }
+        $this->graph_theme = $graph_theme;
+        $this->graph_theme->ApplyGraph($this);
+    }
+
+    function ClearTheme() {
+        $this->graph_theme = null;
+
+        $this->isRunningClear = true;
+
+        $this->__construct(
+                $this->inputValues['aWidth'],
+                $this->inputValues['aHeight'],
+                $this->inputValues['aCachedName'],
+                $this->inputValues['aTimeout'],
+                $this->inputValues['aInline']
+            );
+ 
+        if (!($this instanceof PieGraph)) {
+            if ($this->isAfterSetScale) {
+                $this->SetScale(
+                        $this->inputValues['aAxisType'],
+                        $this->inputValues['aYMin'],
+                        $this->inputValues['aYMax'],
+                        $this->inputValues['aXMin'],
+                        $this->inputValues['aXMax']
+                    );       
+            }
+        }
+
+        $this->isRunningClear = false;
+    }
+
+    function SetSupersampling($do = false, $scale = 2) {
+        if ($do) {
+            define('SUPERSAMPLING_SCALE', $scale);
+           // $this->img->scale = $scale;
+        } else {
+            define('SUPERSAMPLING_SCALE', 1);
+            //$this->img->scale = 0;
+        }
     }
 
@@ -2842 +3169 @@
 //===================================================
 class LineProperty {
-    public $iWeight=1, $iColor="black",$iStyle="solid",$iShow=true;
-        
-//---------------
-// PUBLIC METHODS       
+    public $iWeight=1, $iColor='black', $iStyle='solid', $iShow=false;
+
+    function __construct($aWeight=1,$aColor='black',$aStyle='solid') {
+        $this->iWeight = $aWeight;
+        $this->iColor = $aColor;
+        $this->iStyle = $aStyle;
+    }
+
     function SetColor($aColor) {
-        $this->iColor = $aColor;
-    }
-        
+        $this->iColor = $aColor;
+    }
+
     function SetWeight($aWeight) {
-        $this->iWeight = $aWeight;
-    }
-        
+        $this->iWeight = $aWeight;
+    }
+
     function SetStyle($aStyle) {
-        $this->iStyle = $aStyle;
-    }
-                
+        $this->iStyle = $aStyle;
+    }
+
     function Show($aShow=true) {
-        $this->iShow=$aShow;
-    }
-        
+        $this->iShow=$aShow;
+    }
+
     function Stroke($aImg,$aX1,$aY1,$aX2,$aY2) {
-        if( $this->iShow ) {
-            $aImg->PushColor($this->iColor);
-            $oldls = $aImg->line_style;
-            $oldlw = $aImg->line_weight;
-            $aImg->SetLineWeight($this->iWeight);
-            $aImg->SetLineStyle($this->iStyle);                 
-            $aImg->StyleLine($aX1,$aY1,$aX2,$aY2);
-            $aImg->PopColor($this->iColor);
-            $aImg->line_style = $oldls;
-            $aImg->line_weight = $oldlw;
-
-        }
+        if( $this->iShow ) {
+            $aImg->PushColor($this->iColor);
+            $oldls = $aImg->line_style;
+            $oldlw = $aImg->line_weight;
+            $aImg->SetLineWeight($this->iWeight);
+            $aImg->SetLineStyle($this->iStyle);
+            $aImg->StyleLine($aX1,$aY1,$aX2,$aY2);
+            $aImg->PopColor($this->iColor);
+            $aImg->line_style = $oldls;
+            $aImg->line_weight = $oldlw;
+
+        }
     }
 }
 
+//===================================================
+// CLASS GraphTabTitle
+// Description: Draw "tab" titles on top of graphs
+//===================================================
 class GraphTabTitle extends Text{
     private $corner = 6 , $posx = 7, $posy = 4;
     private $fillcolor='lightyellow',$bordercolor='black';
     private $align = 'left', $width=TABTITLE_WIDTHFIT;
-    function GraphTabTitle() {
-        $this->t = '';
-        $this->font_style = FS_BOLD;
-        $this->hide = true;
-        $this->color = 'darkred';
+    function __construct() {
+        $this->t = '';
+        $this->font_style = FS_BOLD;
+        $this->hide = true;
+        $this->color = 'darkred';
     }
 
     function SetColor($aTxtColor,$aFillColor='lightyellow',$aBorderColor='black') {
-        $this->color = $aTxtColor;
-        $this->fillcolor = $aFillColor;
-        $this->bordercolor = $aBorderColor;
+        $this->color = $aTxtColor;
+        $this->fillcolor = $aFillColor;
+        $this->bordercolor = $aBorderColor;
     }
 
     function SetFillColor($aFillColor) {
-        $this->fillcolor = $aFillColor;
+        $this->fillcolor = $aFillColor;
     }
 
     function SetTabAlign($aAlign) {
-        $this->align = $aAlign;
-    }
-    
+        $this->align = $aAlign;
+    }
+
     function SetWidth($aWidth) {
-        $this->width = $aWidth ;
+        $this->width = $aWidth ;
     }
 
     function Set($t) {
-        $this->t = $t;
-        $this->hide = false;
+        $this->t = $t;
+        $this->hide = false;
     }
 
     function SetCorner($aD) {
-        $this->corner = $aD ;
+        $this->corner = $aD ;
     }
 
     function Stroke($aImg,$aDummy1=null,$aDummy2=null) {
-        if( $this->hide ) 
-            return;
-        $this->boxed = false;
-        $w = $this->GetWidth($aImg) + 2*$this->posx;
-        $h = $this->GetTextHeight($aImg) + 2*$this->posy;
-
-        $x = $aImg->left_margin;
-        $y = $aImg->top_margin;
-
-        if( $this->width === TABTITLE_WIDTHFIT ) {
-            if( $this->align == 'left' ) {
-                $p = array($x,                $y,
-                           $x,                $y-$h+$this->corner,
-                           $x + $this->corner,$y-$h,
-                           $x + $w - $this->corner, $y-$h,
-                           $x + $w, $y-$h+$this->corner,
-                           $x + $w, $y);
-            }
-            elseif( $this->align == 'center' ) {
-                $x += round($aImg->plotwidth/2) - round($w/2);
-                $p = array($x, $y,
-                           $x, $y-$h+$this->corner,
-                           $x + $this->corner, $y-$h,
-                           $x + $w - $this->corner, $y-$h,
-                           $x + $w, $y-$h+$this->corner,
-                           $x + $w, $y);
-            }
-            else {
-                $x += $aImg->plotwidth -$w;
-                $p = array($x, $y,
-                           $x, $y-$h+$this->corner,
-                           $x + $this->corner,$y-$h,
-                           $x + $w - $this->corner, $y-$h,
-                           $x + $w, $y-$h+$this->corner,
-                           $x + $w, $y);
-            }
-        }
-        else {
-            if( $this->width === TABTITLE_WIDTHFULL )
-                $w = $aImg->plotwidth ;
-            else
-                $w = $this->width ;
-
-            // Make the tab fit the width of the plot area
-            $p = array($x,                $y,
-                       $x,                $y-$h+$this->corner,
-                       $x + $this->corner,$y-$h,
-                       $x + $w - $this->corner, $y-$h,
-                       $x + $w, $y-$h+$this->corner,
-                       $x + $w, $y);
-            
-        }
-        if( $this->halign == 'left' ) {
-            $aImg->SetTextAlign('left','bottom');
-            $x += $this->posx;
-            $y -= $this->posy;
-        }
-        elseif( $this->halign == 'center' ) {
-            $aImg->SetTextAlign('center','bottom');
-            $x += $w/2; 
-            $y -= $this->posy;
-        }
-        else {
-            $aImg->SetTextAlign('right','bottom');
-            $x += $w - $this->posx;
-            $y -= $this->posy;
-        }
-
-        $aImg->SetColor($this->fillcolor);
-        $aImg->FilledPolygon($p);
-
-        $aImg->SetColor($this->bordercolor);
-        $aImg->Polygon($p,true);
-        
-        $aImg->SetColor($this->color);
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $aImg->StrokeText($x,$y,$this->t,0,'center');
+        if( $this->hide )
+            return;
+        $this->boxed = false;
+        $w = $this->GetWidth($aImg) + 2*$this->posx;
+        $h = $this->GetTextHeight($aImg) + 2*$this->posy;
+
+        $x = $aImg->left_margin;
+        $y = $aImg->top_margin;
+
+        if( $this->width === TABTITLE_WIDTHFIT ) {
+            if( $this->align == 'left' ) {
+                $p = array($x,                $y,
+                $x,                $y-$h+$this->corner,
+                $x + $this->corner,$y-$h,
+                $x + $w - $this->corner, $y-$h,
+                $x + $w, $y-$h+$this->corner,
+                $x + $w, $y);
+            }
+            elseif( $this->align == 'center' ) {
+                $x += round($aImg->plotwidth/2) - round($w/2);
+                $p = array($x, $y,
+                $x, $y-$h+$this->corner,
+                $x + $this->corner, $y-$h,
+                $x + $w - $this->corner, $y-$h,
+                $x + $w, $y-$h+$this->corner,
+                $x + $w, $y);
+            }
+            else {
+                $x += $aImg->plotwidth -$w;
+                $p = array($x, $y,
+                $x, $y-$h+$this->corner,
+                $x + $this->corner,$y-$h,
+                $x + $w - $this->corner, $y-$h,
+                $x + $w, $y-$h+$this->corner,
+                $x + $w, $y);
+            }
+        }
+        else {
+            if( $this->width === TABTITLE_WIDTHFULL ) {
+                $w = $aImg->plotwidth ;
+            }
+            else {
+                $w = $this->width ;
+            }
+
+            // Make the tab fit the width of the plot area
+            $p = array($x, $y,
+            $x, $y-$h+$this->corner,
+            $x + $this->corner,$y-$h,
+            $x + $w - $this->corner, $y-$h,
+            $x + $w, $y-$h+$this->corner,
+            $x + $w, $y);
+
+        }
+        if( $this->halign == 'left' ) {
+            $aImg->SetTextAlign('left','bottom');
+            $x += $this->posx;
+            $y -= $this->posy;
+        }
+        elseif( $this->halign == 'center' ) {
+            $aImg->SetTextAlign('center','bottom');
+            $x += $w/2;
+            $y -= $this->posy;
+        }
+        else {
+            $aImg->SetTextAlign('right','bottom');
+            $x += $w - $this->posx;
+            $y -= $this->posy;
+        }
+
+        $aImg->SetColor($this->fillcolor);
+        $aImg->FilledPolygon($p);
+
+        $aImg->SetColor($this->bordercolor);
+        $aImg->Polygon($p,true);
+
+        $aImg->SetColor($this->color);
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $aImg->StrokeText($x,$y,$this->t,0,'center');
     }
 
@@ -3003 +3340 @@
 //===================================================
 class SuperScriptText extends Text {
-    private $iSuper="";
-    private $sfont_family="",$sfont_style="",$sfont_size=8;
+    private $iSuper='';
+    private $sfont_family='',$sfont_style='',$sfont_size=8;
     private $iSuperMargin=2,$iVertOverlap=4,$iSuperScale=0.65;
     private $iSDir=0;
     private $iSimple=false;
 
-    function SuperScriptText($aTxt="",$aSuper="",$aXAbsPos=0,$aYAbsPos=0) {
-        parent::Text($aTxt,$aXAbsPos,$aYAbsPos);
-        $this->iSuper = $aSuper;
+    function __construct($aTxt='',$aSuper='',$aXAbsPos=0,$aYAbsPos=0) {
+        parent::__construct($aTxt,$aXAbsPos,$aYAbsPos);
+        $this->iSuper = $aSuper;
     }
 
     function FromReal($aVal,$aPrecision=2) {
-        // Convert a floating point number to scientific notation
-        $neg=1.0;
-        if( $aVal < 0 ) {
-            $neg = -1.0;
-            $aVal = -$aVal;
-        }
-                
-        $l = floor(log10($aVal));
-        $a = sprintf("%0.".$aPrecision."f",round($aVal / pow(10,$l),$aPrecision));
-        $a *= $neg;
-        if( $this->iSimple && ($a == 1 || $a==-1) ) $a = '';
-        
-        if( $a != '' )
-            $this->t = $a.' * 10';
-        else {
-            if( $neg == 1 )
-                $this->t = '10';
-            else
-                $this->t = '-10';
-        }
-        $this->iSuper = $l;
-    }
-
-    function Set($aTxt,$aSuper="") {
-        $this->t = $aTxt;
-        $this->iSuper = $aSuper;
+        // Convert a floating point number to scientific notation
+        $neg=1.0;
+        if( $aVal < 0 ) {
+            $neg = -1.0;
+            $aVal = -$aVal;
+        }
+
+        $l = floor(log10($aVal));
+        $a = sprintf("%0.".$aPrecision."f",round($aVal / pow(10,$l),$aPrecision));
+        $a *= $neg;
+        if( $this->iSimple && ($a == 1 || $a==-1) ) $a = '';
+
+        if( $a != '' ) {
+            $this->t = $a.' * 10';
+        }
+        else {
+            if( $neg == 1 ) {
+                $this->t = '10';
+            }
+            else {
+                $this->t = '-10';
+            }
+        }
+        $this->iSuper = $l;
+    }
+
+    function Set($aTxt,$aSuper='') {
+        $this->t = $aTxt;
+        $this->iSuper = $aSuper;
     }
 
     function SetSuperFont($aFontFam,$aFontStyle=FS_NORMAL,$aFontSize=8) {
-        $this->sfont_family = $aFontFam;
-        $this->sfont_style = $aFontStyle;
-        $this->sfont_size = $aFontSize;
+        $this->sfont_family = $aFontFam;
+        $this->sfont_style = $aFontStyle;
+        $this->sfont_size = $aFontSize;
     }
 
     // Total width of text
     function GetWidth($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $w = $aImg->GetTextWidth($this->t);
-        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-        $w += $aImg->GetTextWidth($this->iSuper);
-        $w += $this->iSuperMargin;
-        return $w;
-    }
-        
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $w = $aImg->GetTextWidth($this->t);
+        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
+        $w += $aImg->GetTextWidth($this->iSuper);
+        $w += $this->iSuperMargin;
+        return $w;
+    }
+
     // Hight of font (approximate the height of the text)
     function GetFontHeight($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);  
-        $h = $aImg->GetFontHeight();
-        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-        $h += $aImg->GetFontHeight();
-        return $h;
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $h = $aImg->GetFontHeight();
+        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
+        $h += $aImg->GetFontHeight();
+        return $h;
     }
 
     // Hight of text
     function GetTextHeight($aImg) {
-        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $h = $aImg->GetTextHeight($this->t);
-        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
-        $h += $aImg->GetTextHeight($this->iSuper);
-        return $h;
+        $aImg->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $h = $aImg->GetTextHeight($this->t);
+        $aImg->SetFont($this->sfont_family,$this->sfont_style,$this->sfont_size);
+        $h += $aImg->GetTextHeight($this->iSuper);
+        return $h;
     }
 
     function Stroke($aImg,$ax=-1,$ay=-1) {
-        
+
         // To position the super script correctly we need different
-        // cases to handle the alignmewnt specified since that will
-        // determine how we can interpret the x,y coordinates
-        
-        $w = parent::GetWidth($aImg);
-        $h = parent::GetTextHeight($aImg);
-        switch( $this->valign ) {
-            case 'top':
-                $sy = $this->y;
-                break;
-            case 'center':
-                $sy = $this->y - $h/2;
-                break;
-            case 'bottom':
-                $sy = $this->y - $h;
-                break;
-            default:
-                JpGraphError::RaiseL(25052);//('PANIC: Internal error in SuperScript::Stroke(). Unknown vertical alignment for text');
-                break;
-        }
-
-        switch( $this->halign ) {
-            case 'left':
-                $sx = $this->x + $w;
-                break;
-            case 'center':
-                $sx = $this->x + $w/2;
-                break;
-            case 'right':
-                $sx = $this->x;
-                break;
-            default:
-                JpGraphError::RaiseL(25053);//('PANIC: Internal error in SuperScript::Stroke(). Unknown horizontal alignment for text');
-                break;
-        }
-
-        $sx += $this->iSuperMargin;
-        $sy += $this->iVertOverlap;
-
-        // Should we automatically determine the font or
-        // has the user specified it explicetly?
-        if( $this->sfont_family == "" ) {
-            if( $this->font_family <= FF_FONT2 ) {
-                if( $this->font_family == FF_FONT0 ) {
-                    $sff = FF_FONT0;
-                }
-                elseif( $this->font_family == FF_FONT1 ) {
-                    if( $this->font_style == FS_NORMAL )
-                        $sff = FF_FONT0;
-                    else
-                        $sff = FF_FONT1;
-                }
-                else {
-                    $sff = FF_FONT1;
-                }
-                $sfs = $this->font_style;
-                $sfz = $this->font_size;
-            }
-            else {
-                // TTF fonts
-                $sff = $this->font_family;
-                $sfs = $this->font_style;
-                $sfz = floor($this->font_size*$this->iSuperScale);              
-                if( $sfz < 8 ) $sfz = 8;
-            }       
-            $this->sfont_family = $sff;
-            $this->sfont_style = $sfs;
-            $this->sfont_size = $sfz;       
-        } 
-        else {
-            $sff = $this->sfont_family;
-            $sfs = $this->sfont_style;
-            $sfz = $this->sfont_size;       
-        }
-
-        parent::Stroke($aImg,$ax,$ay);
-
-
-        // For the builtin fonts we need to reduce the margins
-        // since the bounding bx reported for the builtin fonts
-        // are much larger than for the TTF fonts.
-        if( $sff <= FF_FONT2 ) {
-            $sx -= 2;
-            $sy += 3;
-        }
-
-        $aImg->SetTextAlign('left','bottom');   
-        $aImg->SetFont($sff,$sfs,$sfz);
-        $aImg->PushColor($this->color); 
-        $aImg->StrokeText($sx,$sy,$this->iSuper,$this->iSDir,'left');
-        $aImg->PopColor();      
+        // cases to handle the alignmewnt specified since that will
+        // determine how we can interpret the x,y coordinates
+
+        $w = parent::GetWidth($aImg);
+        $h = parent::GetTextHeight($aImg);
+        switch( $this->valign ) {
+            case 'top':
+                $sy = $this->y;
+                break;
+            case 'center':
+                $sy = $this->y - $h/2;
+                break;
+            case 'bottom':
+                $sy = $this->y - $h;
+                break;
+            default:
+                JpGraphError::RaiseL(25052);//('PANIC: Internal error in SuperScript::Stroke(). Unknown vertical alignment for text');
+                break;
+        }
+
+        switch( $this->halign ) {
+            case 'left':
+                $sx = $this->x + $w;
+                break;
+            case 'center':
+                $sx = $this->x + $w/2;
+                break;
+            case 'right':
+                $sx = $this->x;
+                break;
+            default:
+                JpGraphError::RaiseL(25053);//('PANIC: Internal error in SuperScript::Stroke(). Unknown horizontal alignment for text');
+                break;
+        }
+
+        $sx += $this->iSuperMargin;
+        $sy += $this->iVertOverlap;
+
+        // Should we automatically determine the font or
+        // has the user specified it explicetly?
+        if( $this->sfont_family == '' ) {
+            if( $this->font_family <= FF_FONT2 ) {
+                if( $this->font_family == FF_FONT0 ) {
+                    $sff = FF_FONT0;
+                }
+                elseif( $this->font_family == FF_FONT1 ) {
+                    if( $this->font_style == FS_NORMAL ) {
+                        $sff = FF_FONT0;
+                    }
+                    else {
+                        $sff = FF_FONT1;
+                    }
+                }
+                else {
+                    $sff = FF_FONT1;
+                }
+                $sfs = $this->font_style;
+                $sfz = $this->font_size;
+            }
+            else {
+                // TTF fonts
+                $sff = $this->font_family;
+                $sfs = $this->font_style;
+                $sfz = floor($this->font_size*$this->iSuperScale);
+                if( $sfz < 8 ) $sfz = 8;
+            }
+            $this->sfont_family = $sff;
+            $this->sfont_style = $sfs;
+            $this->sfont_size = $sfz;
+        }
+        else {
+            $sff = $this->sfont_family;
+            $sfs = $this->sfont_style;
+            $sfz = $this->sfont_size;
+        }
+
+        parent::Stroke($aImg,$ax,$ay);
+
+        // For the builtin fonts we need to reduce the margins
+        // since the bounding bx reported for the builtin fonts
+        // are much larger than for the TTF fonts.
+        if( $sff <= FF_FONT2 ) {
+            $sx -= 2;
+            $sy += 3;
+        }
+
+        $aImg->SetTextAlign('left','bottom');
+        $aImg->SetFont($sff,$sfs,$sfz);
+        $aImg->PushColor($this->color);
+        $aImg->StrokeText($sx,$sy,$this->iSuper,$this->iSDir,'left');
+        $aImg->PopColor();
     }
 }
@@ -3181 +3522 @@
     protected $img;
     protected $scale;
-    protected $grid_color='#DDDDDD',$grid_mincolor='#DDDDDD';
-    protected $type="solid";
-    protected $show=false, $showMinor=false,$weight=1;
+    protected $majorcolor='#CCCCCC',$minorcolor='#DDDDDD';
+    protected $majortype='solid',$minortype='solid';
+    protected $show=false, $showMinor=false,$majorweight=1,$minorweight=1;
     protected $fill=false,$fillcolor=array('#EFEFEF','#BBCCFF');
-//---------------
-// CONSTRUCTOR
-    function Grid($aAxis) {
-        $this->scale = $aAxis->scale;
-        $this->img = $aAxis->img;
-    }
-//---------------
-// PUBLIC METHODS
+
+    function __construct($aAxis) {
+        $this->scale = $aAxis->scale;
+        $this->img = $aAxis->img;
+    }
+
     function SetColor($aMajColor,$aMinColor=false) {
-        $this->grid_color=$aMajColor;
-        if( $aMinColor === false ) 
-            $aMinColor = $aMajColor ;
-        $this->grid_mincolor = $aMinColor;
-    }
-        
-    function SetWeight($aWeight) {
-        $this->weight=$aWeight;
-    }
-        
+        $this->majorcolor=$aMajColor;
+        if( $aMinColor === false ) {
+            $aMinColor = $aMajColor ;
+        }
+        $this->minorcolor = $aMinColor;
+    }
+
+    function SetWeight($aMajorWeight,$aMinorWeight=1) {
+        $this->majorweight=$aMajorWeight;
+        $this->minorweight=$aMinorWeight;
+    }
+
     // Specify if grid should be dashed, dotted or solid
-    function SetLineStyle($aType) {
-        $this->type = $aType;
-    }
-        
+    function SetLineStyle($aMajorType,$aMinorType='solid') {
+        $this->majortype = $aMajorType;
+        $this->minortype = $aMinorType;
+    }
+
+    function SetStyle($aMajorType,$aMinorType='solid') {
+        $this->SetLineStyle($aMajorType,$aMinorType);
+    }
+
     // Decide if both major and minor grid should be displayed
     function Show($aShowMajor=true,$aShowMinor=false) {
-        $this->show=$aShowMajor;
-        $this->showMinor=$aShowMinor;
-    }
-    
+        $this->show=$aShowMajor;
+        $this->showMinor=$aShowMinor;
+    }
+
     function SetFill($aFlg=true,$aColor1='lightgray',$aColor2='lightblue') {
-        $this->fill = $aFlg;
-        $this->fillcolor = array( $aColor1, $aColor2 );
-    }
-        
+        $this->fill = $aFlg;
+        $this->fillcolor = array( $aColor1, $aColor2 );
+    }
+
     // Display the grid
     function Stroke() {
-        if( $this->showMinor && !$this->scale->textscale ) {
-            $tmp = $this->grid_color;
-            $this->grid_color = $this->grid_mincolor;
-            $this->DoStroke($this->scale->ticks->ticks_pos);
-
-            $this->grid_color = $tmp;
-            $this->DoStroke($this->scale->ticks->maj_ticks_pos);
-        }
-        else {
-            $this->DoStroke($this->scale->ticks->maj_ticks_pos);
-        }
-    }
-        
-//--------------
-// Private methods      
+        if( $this->showMinor && !$this->scale->textscale ) {
+            $this->DoStroke($this->scale->ticks->ticks_pos,$this->minortype,$this->minorcolor,$this->minorweight);
+            $this->DoStroke($this->scale->ticks->maj_ticks_pos,$this->majortype,$this->majorcolor,$this->majorweight);
+        }
+        else {
+            $this->DoStroke($this->scale->ticks->maj_ticks_pos,$this->majortype,$this->majorcolor,$this->majorweight);
+        }
+    }
+
+    //--------------
+    // Private methods
     // Draw the grid
-    function DoStroke($aTicksPos) {
-        if( !$this->show )
-            return;     
-        $nbrgrids = count($aTicksPos);  
-
-        if( $this->scale->type=="y" ) {
-            $xl=$this->img->left_margin;
-            $xr=$this->img->width-$this->img->right_margin;
-            
-            if( $this->fill ) {
-                // Draw filled areas
-                $y2 = $aTicksPos[0];
-                $i=1;
-                while( $i < $nbrgrids ) {
-                    $y1 = $y2;
-                    $y2 = $aTicksPos[$i++];
-                    $this->img->SetColor($this->fillcolor[$i & 1]);
-                    $this->img->FilledRectangle($xl,$y1,$xr,$y2);
-                }
-            }
-
-            $this->img->SetColor($this->grid_color);
-            $this->img->SetLineWeight($this->weight);
-
-            // Draw grid lines
-            switch( $this->type ) {
-                case "solid":  $style = LINESTYLE_SOLID; break;
-                case "dotted": $style = LINESTYLE_DOTTED; break;
-                case "dashed": $style = LINESTYLE_DASHED; break;
-                case "longdashed": $style = LINESTYLE_LONGDASH; break;
-                default:
-                    $style = LINESTYLE_SOLID; break;
-            }
-
-            for($i=0; $i < $nbrgrids; ++$i) {
-                $y=$aTicksPos[$i];
-                $this->img->StyleLine($xl,$y,$xr,$y,$style);
-            }
-        }
-        elseif( $this->scale->type=="x" ) {     
-            $yu=$this->img->top_margin;
-            $yl=$this->img->height-$this->img->bottom_margin;
-            $limit=$this->img->width-$this->img->right_margin;
-
-            if( $this->fill ) {
-                // Draw filled areas
-                $x2 = $aTicksPos[0];
-                $i=1;
-                while( $i < $nbrgrids ) {
-                    $x1 = $x2;
-                    $x2 = min($aTicksPos[$i++],$limit) ;
-                    $this->img->SetColor($this->fillcolor[$i & 1]);
-                    $this->img->FilledRectangle($x1,$yu,$x2,$yl);
-                }
-            }
-
-            $this->img->SetColor($this->grid_color);
-            $this->img->SetLineWeight($this->weight);
-
-            // We must also test for limit since we might have
-            // an offset and the number of ticks is calculated with
-            // assumption offset==0 so we might end up drawing one
-            // to many gridlines
-            $i=0;
-            $x=$aTicksPos[$i];      
-            while( $i<count($aTicksPos) && ($x=$aTicksPos[$i]) <= $limit ) {
-                if( $this->type == "solid" )                            
-                    $this->img->Line($x,$yl,$x,$yu);
-                elseif( $this->type == "dotted" )
-                    $this->img->DashedLine($x,$yl,$x,$yu,1,6);
-                elseif( $this->type == "dashed" )
-                    $this->img->DashedLine($x,$yl,$x,$yu,2,4);
-                elseif( $this->type == "longdashed" )
-                    $this->img->DashedLine($x,$yl,$x,$yu,8,6);  
-                ++$i;  
-            }
-        }       
-        else {
-            JpGraphError::RaiseL(25054,$this->scale->type);//('Internal error: Unknown grid axis ['.$this->scale->type.']');
-        }
-        return true;
+    function DoStroke($aTicksPos,$aType,$aColor,$aWeight) {
+        if( !$this->show ) return;
+        $nbrgrids = count($aTicksPos);
+
+        if( $this->scale->type == 'y' ) {
+            $xl=$this->img->left_margin;
+            $xr=$this->img->width-$this->img->right_margin;
+
+            if( $this->fill ) {
+                // Draw filled areas
+                $y2 = !empty($aTicksPos) ? $aTicksPos[0] : null;
+                $i=1;
+                while( $i < $nbrgrids ) {
+                    $y1 = $y2;
+                    $y2 = $aTicksPos[$i++];
+                    $this->img->SetColor($this->fillcolor[$i & 1]);
+                    $this->img->FilledRectangle($xl,$y1,$xr,$y2);
+                }
+            }
+
+            $this->img->SetColor($aColor);
+            $this->img->SetLineWeight($aWeight);
+
+            // Draw grid lines
+            switch( $aType ) {
+                case 'solid':  $style = LINESTYLE_SOLID; break;
+                case 'dotted': $style = LINESTYLE_DOTTED; break;
+                case 'dashed': $style = LINESTYLE_DASHED; break;
+                case 'longdashed': $style = LINESTYLE_LONGDASH; break;
+                default:
+                    $style = LINESTYLE_SOLID; break;
+            }
+
+            for($i=0; $i < $nbrgrids; ++$i) {
+                $y=$aTicksPos[$i];
+                $this->img->StyleLine($xl,$y,$xr,$y,$style,true);
+            }
+        }
+        elseif( $this->scale->type == 'x' ) {
+            $yu=$this->img->top_margin;
+            $yl=$this->img->height-$this->img->bottom_margin;
+            $limit=$this->img->width-$this->img->right_margin;
+
+            if( $this->fill ) {
+                // Draw filled areas
+                $x2 = $aTicksPos[0];
+                $i=1;
+                while( $i < $nbrgrids ) {
+                    $x1 = $x2;
+                    $x2 = min($aTicksPos[$i++],$limit) ;
+                    $this->img->SetColor($this->fillcolor[$i & 1]);
+                    $this->img->FilledRectangle($x1,$yu,$x2,$yl);
+                }
+            }
+
+            $this->img->SetColor($aColor);
+            $this->img->SetLineWeight($aWeight);
+
+            // We must also test for limit since we might have
+            // an offset and the number of ticks is calculated with
+            // assumption offset==0 so we might end up drawing one
+            // to many gridlines
+            $i=0;
+            $x=$aTicksPos[$i];
+            while( $i<count($aTicksPos) && ($x=$aTicksPos[$i]) <= $limit ) {
+                if    ( $aType == 'solid' )      $this->img->Line($x,$yl,$x,$yu);
+                elseif( $aType == 'dotted' )     $this->img->DashedLineForGrid($x,$yl,$x,$yu,1,6);
+                elseif( $aType == 'dashed' )     $this->img->DashedLineForGrid($x,$yl,$x,$yu,2,4);
+                elseif( $aType == 'longdashed' ) $this->img->DashedLineForGrid($x,$yl,$x,$yu,8,6);
+                ++$i;
+            }
+        }
+        else {
+            JpGraphError::RaiseL(25054,$this->scale->type);//('Internal error: Unknown grid axis ['.$this->scale->type.']');
+        }
+        return true;
     }
 } // Class
@@ -3328 +3665 @@
 // several occasion must know wheter it's an X or Y axis.
 // This was a design decision to make the code easier to
-// follow. 
+// follow.
 //===================================================
 class AxisPrototype {
-    public $scale=null; 
+    public $scale=null;
     public $img=null;
     public $hide=false,$hide_labels=false;
     public $title=null;
-    public $font_family=FF_FONT1,$font_style=FS_NORMAL,$font_size=12,$label_angle=0;
+    public $font_family=FF_DEFAULT,$font_style=FS_NORMAL,$font_size=8,$label_angle=0;
     public $tick_step=1;
     public $pos = false;
@@ -3348 +3685 @@
     protected $labelPos=0;   // Which side of the axis should the labels be?
     protected $title_adjust,$title_margin,$title_side=SIDE_LEFT;
-    protected $tick_label_margin=7;
+    protected $tick_label_margin=5;
     protected $label_halign = '',$label_valign = '', $label_para_align='left';
     protected $hide_line=false;
     protected $iDeltaAbsPos=0;
 
-//---------------
-// CONSTRUCTOR
-    function Axis($img,$aScale,$color=array(0,0,0)) {
-        $this->img = $img;
-        $this->scale = $aScale;
-        $this->color = $color;
-        $this->title=new Text("");
-                
-        if( $aScale->type=="y" ) {
-            $this->title_margin = 25;
-            $this->title_adjust="middle";
-            $this->title->SetOrientation(90);
-            $this->tick_label_margin=7;
-            $this->labelPos=SIDE_LEFT;
-        }
-        else {
-            $this->title_margin = 5;
-            $this->title_adjust="high";
-            $this->title->SetOrientation(0);                    
-            $this->tick_label_margin=7;
-            $this->labelPos=SIDE_DOWN;
-            $this->title_side=SIDE_DOWN;
-        }
-    }
-//---------------
-// PUBLIC METHODS       
-        
+    function __construct($img,$aScale,$color = array(0,0,0)) {
+        $this->img = $img;
+        $this->scale = $aScale;
+        $this->color = $color;
+        $this->title=new Text('');
+
+        if( $aScale->type == 'y' ) {
+            $this->title_margin = 25;
+            $this->title_adjust = 'middle';
+            $this->title->SetOrientation(90);
+            $this->tick_label_margin=7;
+            $this->labelPos=SIDE_LEFT;
+        }
+        else {
+            $this->title_margin = 5;
+            $this->title_adjust = 'high';
+            $this->title->SetOrientation(0);
+            $this->tick_label_margin=5;
+            $this->labelPos=SIDE_DOWN;
+            $this->title_side=SIDE_DOWN;
+        }
+    }
+
     function SetLabelFormat($aFormStr) {
-        $this->scale->ticks->SetLabelFormat($aFormStr);
+        $this->scale->ticks->SetLabelFormat($aFormStr);
     }
 
     function SetLabelFormatString($aFormStr,$aDate=false) {
-        $this->scale->ticks->SetLabelFormat($aFormStr,$aDate);
-    }
-        
+        $this->scale->ticks->SetLabelFormat($aFormStr,$aDate);
+    }
+
     function SetLabelFormatCallback($aFuncName) {
-        $this->scale->ticks->SetFormatCallback($aFuncName);
-    }
-
-    function SetLabelAlign($aHAlign,$aVAlign="top",$aParagraphAlign='left') {
-        $this->label_halign = $aHAlign;
-        $this->label_valign = $aVAlign;
-        $this->label_para_align = $aParagraphAlign;
-    }           
+        $this->scale->ticks->SetFormatCallback($aFuncName);
+    }
+
+    function SetLabelAlign($aHAlign,$aVAlign='top',$aParagraphAlign='left') {
+        $this->label_halign = $aHAlign;
+        $this->label_valign = $aVAlign;
+        $this->label_para_align = $aParagraphAlign;
+    }
 
     // Don't display the first label
     function HideFirstTickLabel($aShow=false) {
-        $this->show_first_label=$aShow;
+        $this->show_first_label=$aShow;
     }
 
     function HideLastTickLabel($aShow=false) {
-        $this->show_last_label=$aShow;
+        $this->show_last_label=$aShow;
     }
 
     // Manually specify the major and (optional) minor tick position and labels
     function SetTickPositions($aMajPos,$aMinPos=NULL,$aLabels=NULL) {
-        $this->scale->ticks->SetTickPositions($aMajPos,$aMinPos,$aLabels);
+        $this->scale->ticks->SetTickPositions($aMajPos,$aMinPos,$aLabels);
     }
 
     // Manually specify major tick positions and optional labels
     function SetMajTickPositions($aMajPos,$aLabels=NULL) {
-        $this->scale->ticks->SetTickPositions($aMajPos,NULL,$aLabels);
+        $this->scale->ticks->SetTickPositions($aMajPos,NULL,$aLabels);
     }
 
     // Hide minor or major tick marks
     function HideTicks($aHideMinor=true,$aHideMajor=true) {
-        $this->scale->ticks->SupressMinorTickMarks($aHideMinor);
-        $this->scale->ticks->SupressTickMarks($aHideMajor);
+        $this->scale->ticks->SupressMinorTickMarks($aHideMinor);
+        $this->scale->ticks->SupressTickMarks($aHideMajor);
     }
 
     // Hide zero label
     function HideZeroLabel($aFlag=true) {
-        $this->scale->ticks->SupressZeroLabel();
-    }
-        
+        $this->scale->ticks->SupressZeroLabel();
+    }
+
     function HideFirstLastLabel() {
-        // The two first calls to ticks method will supress 
-        // automatically generated scale values. However, that
-        // will not affect manually specified value, e.g text-scales.
-        // therefor we also make a kludge here to supress manually
-        // specified scale labels.
-        $this->scale->ticks->SupressLast();
-        $this->scale->ticks->SupressFirst();
-        $this->show_first_label = false;
-        $this->show_last_label = false;
-    }
-        
+        // The two first calls to ticks method will supress
+        // automatically generated scale values. However, that
+        // will not affect manually specified value, e.g text-scales.
+        // therefor we also make a kludge here to supress manually
+        // specified scale labels.
+        $this->scale->ticks->SupressLast();
+        $this->scale->ticks->SupressFirst();
+        $this->show_first_label = false;
+        $this->show_last_label = false;
+    }
+
     // Hide the axis
     function Hide($aHide=true) {
-        $this->hide=$aHide;
+        $this->hide=$aHide;
     }
 
     // Hide the actual axis-line, but still print the labels
     function HideLine($aHide=true) {
-        $this->hide_line = $aHide;
+        $this->hide_line = $aHide;
     }
 
     function HideLabels($aHide=true) {
-        $this->hide_labels = $aHide;
-    }
-    
+        $this->hide_labels = $aHide;
+    }
 
     // Weight of axis
     function SetWeight($aWeight) {
-        $this->weight = $aWeight;
+        $this->weight = $aWeight;
     }
 
     // Axis color
     function SetColor($aColor,$aLabelColor=false) {
-        $this->color = $aColor;
-        if( !$aLabelColor ) $this->label_color = $aColor;
-        else $this->label_color = $aLabelColor;
-    }
-        
+        $this->color = $aColor;
+        if( !$aLabelColor ) $this->label_color = $aColor;
+        else $this->label_color = $aLabelColor;
+    }
+
     // Title on axis
-    function SetTitle($aTitle,$aAdjustAlign="high") {
-        $this->title->Set($aTitle);
-        $this->title_adjust=$aAdjustAlign;
-    }
-        
+    function SetTitle($aTitle,$aAdjustAlign='high') {
+        $this->title->Set($aTitle);
+        $this->title_adjust=$aAdjustAlign;
+    }
+
     // Specify distance from the axis
     function SetTitleMargin($aMargin) {
-        $this->title_margin=$aMargin;
-    }
-        
+        $this->title_margin=$aMargin;
+    }
+
     // Which side of the axis should the axis title be?
     function SetTitleSide($aSideOfAxis) {
-        $this->title_side = $aSideOfAxis;
-    }
-
-    // Utility function to set the direction for tick marks
-    function SetTickDirection($aDir) {
-        // Will be deprecated from 1.7          
-        if( ERR_DEPRECATED )
-            JpGraphError::RaiseL(25055);//('Axis::SetTickDirection() is deprecated. Use Axis::SetTickSide() instead');
-        $this->scale->ticks->SetSide($aDir);
-    }
-    
+        $this->title_side = $aSideOfAxis;
+    }
+
     function SetTickSide($aDir) {
-        $this->scale->ticks->SetSide($aDir);
-    }
-        
+        $this->scale->ticks->SetSide($aDir);
+    }
+
+    function SetTickSize($aMajSize,$aMinSize=3) {
+        $this->scale->ticks->SetSize($aMajSize,$aMinSize=3);
+    }
+
     // Specify text labels for the ticks. One label for each data point
     function SetTickLabels($aLabelArray,$aLabelColorArray=null) {
-        $this->ticks_label = $aLabelArray;
-        $this->ticks_label_colors = $aLabelColorArray;
-    }
-        
-    // How far from the axis should the labels be drawn
-    function SetTickLabelMargin($aMargin) {
-        if( ERR_DEPRECATED )            
-            JpGraphError::RaiseL(25056);//('SetTickLabelMargin() is deprecated. Use Axis::SetLabelMargin() instead.');
-        $this->tick_label_margin=$aMargin;
+        $this->ticks_label = $aLabelArray;
+        $this->ticks_label_colors = $aLabelColorArray;
     }
 
     function SetLabelMargin($aMargin) {
-        $this->tick_label_margin=$aMargin;
-    }
-        
+        $this->tick_label_margin=$aMargin;
+    }
+
     // Specify that every $step of the ticks should be displayed starting
     // at $start
-    // DEPRECATED FUNCTION: USE SetTextTickInterval() INSTEAD
-    function SetTextTicks($step,$start=0) {
-        JpGraphError::RaiseL(25057);//(" SetTextTicks() is deprecated. Use SetTextTickInterval() instead.");            
-    }
-
-    // Specify that every $step of the ticks should be displayed starting
-    // at $start        
     function SetTextTickInterval($aStep,$aStart=0) {
-        $this->scale->ticks->SetTextLabelStart($aStart);
-        $this->tick_step=$aStep;
-    }
-         
-    // Specify that every $step tick mark should have a label 
+        $this->scale->ticks->SetTextLabelStart($aStart);
+        $this->tick_step=$aStep;
+    }
+
+    // Specify that every $step tick mark should have a label
     // should be displayed starting
     function SetTextLabelInterval($aStep) {
-        if( $aStep < 1 )
-            JpGraphError::RaiseL(25058);//(" Text label interval must be specified >= 1.");
-        $this->label_step=$aStep;
-    }
-        
-    // Which side of the axis should the labels be on?
-    function SetLabelPos($aSidePos) {
-        // This will be deprecated from 1.7
-        if( ERR_DEPRECATED )            
-            JpGraphError::RaiseL(25059);//('SetLabelPos() is deprecated. Use Axis::SetLabelSide() instead.');
-        $this->labelPos=$aSidePos;
-    }
-    
+        if( $aStep < 1 ) {
+            JpGraphError::RaiseL(25058);//(" Text label interval must be specified >= 1.");
+        }
+        $this->label_step=$aStep;
+    }
+
     function SetLabelSide($aSidePos) {
-        $this->labelPos=$aSidePos;
+        $this->labelPos=$aSidePos;
     }
 
     // Set the font
     function SetFont($aFamily,$aStyle=FS_NORMAL,$aSize=10) {
-        $this->font_family = $aFamily;
-        $this->font_style = $aStyle;
-        $this->font_size = $aSize;
+        $this->font_family = $aFamily;
+        $this->font_style = $aStyle;
+        $this->font_size = $aSize;
     }
 
     // Position for axis line on the "other" scale
     function SetPos($aPosOnOtherScale) {
-        $this->pos=$aPosOnOtherScale;
-    }
-
-    // Set the position of the axis to be X-pixels delta to the right 
+        $this->pos=$aPosOnOtherScale;
+    }
+
+    // Set the position of the axis to be X-pixels delta to the right
     // of the max X-position (used to position the multiple Y-axis)
     function SetPosAbsDelta($aDelta) {
-      $this->iDeltaAbsPos=$aDelta;
-    }
-        
+        $this->iDeltaAbsPos=$aDelta;
+    }
+
     // Specify the angle for the tick labels
     function SetLabelAngle($aAngle) {
-        $this->label_angle = $aAngle;
-    }   
+        $this->label_angle = $aAngle;
+    }
 
 } // Class
@@ -3578 +3885 @@
 // several occasion must know wheter it's an X or Y axis.
 // This was a design decision to make the code easier to
-// follow. 
+// follow.
 //===================================================
 class Axis extends AxisPrototype {
 
-    function Axis($img,$aScale,$color=array(0,0,0)) {
-        parent::Axis($img,$aScale,$color);
-    }
-        
+    function __construct($img,$aScale,$color='black') {
+        parent::__construct($img,$aScale,$color);
+    }
+
     // Stroke the axis.
-    function Stroke($aOtherAxisScale,$aStrokeLabels=true) {             
-        if( $this->hide ) return;               
-        if( is_numeric($this->pos) ) {
-            $pos=$aOtherAxisScale->Translate($this->pos);
-        }
-        else {  // Default to minimum of other scale if pos not set             
-            if( ($aOtherAxisScale->GetMinVal() >= 0 && $this->pos==false) || $this->pos=="min" ) {
-                $pos = $aOtherAxisScale->scale_abs[0];
-            }
-            elseif($this->pos == "max") {
-                $pos = $aOtherAxisScale->scale_abs[1];
-            }
-            else { // If negative set x-axis at 0
-                $this->pos=0;
-                $pos=$aOtherAxisScale->Translate(0);
-            }
-        }
-        $pos += $this->iDeltaAbsPos;    
-        $this->img->SetLineWeight($this->weight);
-        $this->img->SetColor($this->color);             
-        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-        if( $this->scale->type == "x" ) {
-            if( !$this->hide_line ) 
-                $this->img->FilledRectangle($this->img->left_margin,$pos,
-                                            $this->img->width-$this->img->right_margin,$pos+$this->weight-1);
-            if( $this->title_side == SIDE_DOWN ) {
-                $y = $pos + $this->img->GetFontHeight() + $this->title_margin + $this->title->margin;
-                $yalign = 'top';
-            }
-            else {
-                $y = $pos - $this->img->GetFontHeight() - $this->title_margin - $this->title->margin;
-                $yalign = 'bottom';
-            }
-
-            if( $this->title_adjust=='high' )
-                $this->title->SetPos($this->img->width-$this->img->right_margin,$y,'right',$yalign);
-            elseif( $this->title_adjust=='middle' || $this->title_adjust=='center' ) 
-                $this->title->SetPos(($this->img->width-$this->img->left_margin-$this->img->right_margin)/2+$this->img->left_margin,$y,'center',$yalign);
-            elseif($this->title_adjust=='low')
-                $this->title->SetPos($this->img->left_margin,$y,'left',$yalign);
-            else {      
-                JpGraphError::RaiseL(25060,$this->title_adjust);//('Unknown alignment specified for X-axis title. ('.$this->title_adjust.')');
-            }
-        }
-        elseif( $this->scale->type == "y" ) {
-            // Add line weight to the height of the axis since
-            // the x-axis could have a width>1 and we want the axis to fit nicely together.
-            if( !$this->hide_line ) 
-                $this->img->FilledRectangle($pos-$this->weight+1,$this->img->top_margin,
-                                            $pos,$this->img->height-$this->img->bottom_margin+$this->weight-1);
-            $x=$pos ;
-            if( $this->title_side == SIDE_LEFT ) {
-                $x -= $this->title_margin;
-                $x -= $this->title->margin;
-                $halign="right";
-            }
-            else {
-                $x += $this->title_margin;
-                $x += $this->title->margin;
-                $halign="left";
-            }
-            // If the user has manually specified an hor. align
-            // then we override the automatic settings with this
-            // specifed setting. Since default is 'left' we compare
-            // with that. (This means a manually set 'left' align
-            // will have no effect.)
-            if( $this->title->halign != 'left' ) 
-                $halign = $this->title->halign;
-            if( $this->title_adjust=="high" ) 
-                $this->title->SetPos($x,$this->img->top_margin,$halign,"top"); 
-            elseif($this->title_adjust=="middle" || $this->title_adjust=="center")  
-                $this->title->SetPos($x,($this->img->height-$this->img->top_margin-$this->img->bottom_margin)/2+$this->img->top_margin,$halign,"center");
-            elseif($this->title_adjust=="low")
-                $this->title->SetPos($x,$this->img->height-$this->img->bottom_margin,$halign,"bottom");
-            else        
-                JpGraphError::RaiseL(25061,$this->title_adjust);//('Unknown alignment specified for Y-axis title. ('.$this->title_adjust.')');
-                
-        }
-        $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
-        if( $aStrokeLabels ) {
-            if( !$this->hide_labels )
-                $this->StrokeLabels($pos);
-            $this->title->Stroke($this->img);
-        }
-    }
-
-//---------------
-// PRIVATE METHODS      
+    function Stroke($aOtherAxisScale,$aStrokeLabels=true) {
+        if( $this->hide )
+            return;
+        if( is_numeric($this->pos) ) {
+            $pos=$aOtherAxisScale->Translate($this->pos);
+        }
+        else { // Default to minimum of other scale if pos not set
+            if( ($aOtherAxisScale->GetMinVal() >= 0 && $this->pos==false) || $this->pos == 'min' ) {
+                $pos = $aOtherAxisScale->scale_abs[0];
+            }
+            elseif($this->pos == "max") {
+                $pos = $aOtherAxisScale->scale_abs[1];
+            }
+            else { // If negative set x-axis at 0
+                $this->pos=0;
+                $pos=$aOtherAxisScale->Translate(0);
+            }
+        }
+
+        $pos += $this->iDeltaAbsPos;
+        $this->img->SetLineWeight($this->weight);
+        $this->img->SetColor($this->color);
+        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
+
+        if( $this->scale->type == "x" ) {
+            if( !$this->hide_line ) {
+                // Stroke X-axis
+                $this->img->FilledRectangle(
+                    $this->img->left_margin,
+                    $pos,
+                    $this->img->width - $this->img->right_margin,
+                    $pos + $this->weight-1
+                );
+            }
+            if( $this->title_side == SIDE_DOWN ) {
+                $y = $pos + $this->img->GetFontHeight() + $this->title_margin + $this->title->margin;
+                $yalign = 'top';
+            }
+            else {
+                $y = $pos - $this->img->GetFontHeight() - $this->title_margin - $this->title->margin;
+                $yalign = 'bottom';
+            }
+
+            if( $this->title_adjust=='high' ) {
+                $this->title->SetPos($this->img->width-$this->img->right_margin,$y,'right',$yalign);
+            }
+            elseif( $this->title_adjust=='middle' || $this->title_adjust=='center' ) {
+                $this->title->SetPos(($this->img->width-$this->img->left_margin-$this->img->right_margin)/2+$this->img->left_margin,$y,'center',$yalign);
+            }
+            elseif($this->title_adjust=='low') {
+                $this->title->SetPos($this->img->left_margin,$y,'left',$yalign);
+            }
+            else {
+                JpGraphError::RaiseL(25060,$this->title_adjust);//('Unknown alignment specified for X-axis title. ('.$this->title_adjust.')');
+            }
+        }
+        elseif( $this->scale->type == "y" ) {
+            // Add line weight to the height of the axis since
+            // the x-axis could have a width>1 and we want the axis to fit nicely together.
+            if( !$this->hide_line ) {
+                // Stroke Y-axis
+                $this->img->FilledRectangle(
+                    $pos - $this->weight + 1, 
+                    $this->img->top_margin,
+                    $pos,
+                    $this->img->height - $this->img->bottom_margin + $this->weight - 1
+                );
+            }
+
+            $x=$pos ;
+            if( $this->title_side == SIDE_LEFT ) {
+                $x -= $this->title_margin;
+                $x -= $this->title->margin;
+                $halign = 'right';
+            }
+            else {
+                $x += $this->title_margin;
+                $x += $this->title->margin;
+                $halign = 'left';
+            }
+            // If the user has manually specified an hor. align
+            // then we override the automatic settings with this
+            // specifed setting. Since default is 'left' we compare
+            // with that. (This means a manually set 'left' align
+            // will have no effect.)
+            if( $this->title->halign != 'left' ) {
+                $halign = $this->title->halign;
+            }
+            if( $this->title_adjust == 'high' ) {
+                $this->title->SetPos($x,$this->img->top_margin,$halign,'top');
+            }
+            elseif($this->title_adjust=='middle' || $this->title_adjust=='center') {
+                $this->title->SetPos($x,($this->img->height-$this->img->top_margin-$this->img->bottom_margin)/2+$this->img->top_margin,$halign,"center");
+            }
+            elseif($this->title_adjust=='low') {
+                $this->title->SetPos($x,$this->img->height-$this->img->bottom_margin,$halign,'bottom');
+            }
+            else {
+                JpGraphError::RaiseL(25061,$this->title_adjust);//('Unknown alignment specified for Y-axis title. ('.$this->title_adjust.')');
+            }
+        }
+        $this->scale->ticks->Stroke($this->img,$this->scale,$pos);
+        if( $aStrokeLabels ) {
+            if( !$this->hide_labels ) {
+                $this->StrokeLabels($pos);
+            }
+            $this->title->Stroke($this->img);
+        }
+    }
+
+    //---------------
+    // PRIVATE METHODS
     // Draw all the tick labels on major tick marks
     function StrokeLabels($aPos,$aMinor=false,$aAbsLabel=false) {
 
-        $this->img->SetColor($this->label_color);
-        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
-        $yoff=$this->img->GetFontHeight()/2;
-
-        // Only draw labels at major tick marks
-        $nbr = count($this->scale->ticks->maj_ticks_label);
-
-        // We have the option to not-display the very first mark
-        // (Usefull when the first label might interfere with another
-        // axis.)
-        $i = $this->show_first_label ? 0 : 1 ;
-        if( !$this->show_last_label ) --$nbr;
-        // Now run through all labels making sure we don't overshoot the end
-        // of the scale.        
-        $ncolor=0;
-        if( isset($this->ticks_label_colors) )
-            $ncolor=count($this->ticks_label_colors);
-        while( $i<$nbr ) {
-            // $tpos holds the absolute text position for the label
-            $tpos=$this->scale->ticks->maj_ticklabels_pos[$i];
-
-            // Note. the $limit is only used for the x axis since we
-            // might otherwise overshoot if the scale has been centered
-            // This is due to us "loosing" the last tick mark if we center.
-            if( $this->scale->type=="x" && $tpos > $this->img->width-$this->img->right_margin+1 ) {
-                return; 
-            }
-            // we only draw every $label_step label
-            if( ($i % $this->label_step)==0 ) {
-
-                // Set specific label color if specified
-                if( $ncolor > 0 )
-                    $this->img->SetColor($this->ticks_label_colors[$i % $ncolor]);
-                
-                // If the label has been specified use that and in other case
-                // just label the mark with the actual scale value 
-                $m=$this->scale->ticks->GetMajor();
-                                
-                // ticks_label has an entry for each data point and is the array
-                // that holds the labels set by the user. If the user hasn't 
-                // specified any values we use whats in the automatically asigned
-                // labels in the maj_ticks_label
-                if( isset($this->ticks_label[$i*$m]) )
-                    $label=$this->ticks_label[$i*$m];
-                else {
-                    if( $aAbsLabel ) 
-                        $label=abs($this->scale->ticks->maj_ticks_label[$i]);
-                    else
-                        $label=$this->scale->ticks->maj_ticks_label[$i];
-                    if( $this->scale->textscale && $this->scale->ticks->label_formfunc == '' ) {
-                        ++$label;
-                    }
-                }
-                                        
-                if( $this->scale->type == "x" ) {
-                    if( $this->labelPos == SIDE_DOWN ) {
-                        if( $this->label_angle==0 || $this->label_angle==90 ) {
-                            if( $this->label_halign=='' && $this->label_valign=='')
-                                $this->img->SetTextAlign('center','top');
-                            else
-                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                            
-                        }
-                        else {
-                            if( $this->label_halign=='' && $this->label_valign=='')
-                                $this->img->SetTextAlign("right","top");
-                            else
-                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                        }
-                        $this->img->StrokeText($tpos,$aPos+$this->tick_label_margin+1,$label,
-                                               $this->label_angle,$this->label_para_align);
-                    }
-                    else {
-                        if( $this->label_angle==0 || $this->label_angle==90 ) {
-                            if( $this->label_halign=='' && $this->label_valign=='')
-                                $this->img->SetTextAlign("center","bottom");
-                            else
-                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                        }
-                        else {
-                            if( $this->label_halign=='' && $this->label_valign=='')
-                                $this->img->SetTextAlign("right","bottom");
-                            else
-                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                        }
-                        $this->img->StrokeText($tpos,$aPos-$this->tick_label_margin-1,$label,
-                                               $this->label_angle,$this->label_para_align);
-                    }
-                }
-                else {
-                    // scale->type == "y"
-                    //if( $this->label_angle!=0 ) 
-                    //JpGraphError::Raise(" Labels at an angle are not supported on Y-axis");
-                    if( $this->labelPos == SIDE_LEFT ) { // To the left of y-axis                                       
-                        if( $this->label_halign=='' && $this->label_valign=='') 
-                            $this->img->SetTextAlign("right","center");
-                        else
-                            $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                        $this->img->StrokeText($aPos-$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align); 
-                    }
-                    else { // To the right of the y-axis
-                        if( $this->label_halign=='' && $this->label_valign=='') 
-                            $this->img->SetTextAlign("left","center");
-                        else
-                            $this->img->SetTextAlign($this->label_halign,$this->label_valign);
-                        $this->img->StrokeText($aPos+$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align); 
-                    }
-                }
-            }
-            ++$i;       
-        }                                                               
-    }                       
+        if( is_array($this->label_color) && count($this->label_color) > 3 ) {
+            $this->ticks_label_colors = $this->label_color;
+            $this->img->SetColor($this->label_color[0]);
+        }
+        else {
+            $this->img->SetColor($this->label_color);
+        }
+        $this->img->SetFont($this->font_family,$this->font_style,$this->font_size);
+        $yoff=$this->img->GetFontHeight()/2;
+
+        // Only draw labels at major tick marks
+        $nbr = count($this->scale->ticks->maj_ticks_label);
+
+        // We have the option to not-display the very first mark
+        // (Usefull when the first label might interfere with another
+        // axis.)
+        $i = $this->show_first_label ? 0 : 1 ;
+        if( !$this->show_last_label ) {
+            --$nbr;
+        }
+        // Now run through all labels making sure we don't overshoot the end
+        // of the scale.
+        $ncolor=0;
+        if( isset($this->ticks_label_colors) ) {
+            $ncolor=count($this->ticks_label_colors);
+        }
+        while( $i < $nbr ) {
+            // $tpos holds the absolute text position for the label
+            $tpos=$this->scale->ticks->maj_ticklabels_pos[$i];
+
+            // Note. the $limit is only used for the x axis since we
+            // might otherwise overshoot if the scale has been centered
+            // This is due to us "loosing" the last tick mark if we center.
+            if( $this->scale->type == 'x' && $tpos > $this->img->width-$this->img->right_margin+1 ) {
+                return;
+            }
+            // we only draw every $label_step label
+            if( ($i % $this->label_step)==0 ) {
+
+                // Set specific label color if specified
+                if( $ncolor > 0 ) {
+                    $this->img->SetColor($this->ticks_label_colors[$i % $ncolor]);
+                }
+
+                // If the label has been specified use that and in other case
+                // just label the mark with the actual scale value
+                $m=$this->scale->ticks->GetMajor();
+
+                // ticks_label has an entry for each data point and is the array
+                // that holds the labels set by the user. If the user hasn't
+                // specified any values we use whats in the automatically asigned
+                // labels in the maj_ticks_label
+                if( isset($this->ticks_label[$i*$m]) ) {
+                    $label=$this->ticks_label[$i*$m];
+                }
+                else {
+                    if( $aAbsLabel ) {
+                        $label=abs($this->scale->ticks->maj_ticks_label[$i]);
+                    }
+                    else {
+                        $label=$this->scale->ticks->maj_ticks_label[$i];
+                    }
+
+                    // We number the scale from 1 and not from 0 so increase by one
+                    if( $this->scale->textscale && 
+                        $this->scale->ticks->label_formfunc == '' &&
+                        ! $this->scale->ticks->HaveManualLabels() ) {
+
+                        ++$label;
+                        
+                    }
+                }
+
+                if( $this->scale->type == "x" ) {
+                    if( $this->labelPos == SIDE_DOWN ) {
+                        if( $this->label_angle==0 || $this->label_angle==90 ) {
+                            if( $this->label_halign=='' && $this->label_valign=='') {
+                                $this->img->SetTextAlign('center','top');
+                            }
+                            else {
+                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                            }
+
+                        }
+                        else {
+                            if( $this->label_halign=='' && $this->label_valign=='') {
+                                $this->img->SetTextAlign("right","top");
+                            }
+                            else {
+                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                            }
+                        }
+                        $this->img->StrokeText($tpos,$aPos+$this->tick_label_margin,$label,
+                        $this->label_angle,$this->label_para_align);
+                    }
+                    else {
+                        if( $this->label_angle==0 || $this->label_angle==90 ) {
+                            if( $this->label_halign=='' && $this->label_valign=='') {
+                                $this->img->SetTextAlign("center","bottom");
+                            }
+                            else {
+                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                            }
+                        }
+                        else {
+                            if( $this->label_halign=='' && $this->label_valign=='') {
+                                $this->img->SetTextAlign("right","bottom");
+                            }
+                            else {
+                                $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                            }
+                        }
+                        $this->img->StrokeText($tpos,$aPos-$this->tick_label_margin-1,$label,
+                        $this->label_angle,$this->label_para_align);
+                    }
+                }
+                else {
+                    // scale->type == "y"
+                    //if( $this->label_angle!=0 )
+                    //JpGraphError::Raise(" Labels at an angle are not supported on Y-axis");
+                    if( $this->labelPos == SIDE_LEFT ) { // To the left of y-axis
+                        if( $this->label_halign=='' && $this->label_valign=='') {
+                            $this->img->SetTextAlign("right","center");
+                        }
+                        else {
+                            $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                        }
+                        $this->img->StrokeText($aPos-$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align);
+                    }
+                    else { // To the right of the y-axis
+                        if( $this->label_halign=='' && $this->label_valign=='') {
+                            $this->img->SetTextAlign("left","center");
+                        }
+                        else {
+                            $this->img->SetTextAlign($this->label_halign,$this->label_valign);
+                        }
+                        $this->img->StrokeText($aPos+$this->tick_label_margin,$tpos,$label,$this->label_angle,$this->label_para_align);
+                    }
+                }
+            }
+            ++$i;
+        }
+    }
 
 }
@@ -3805 +4167 @@
     public $direction=1; // Should ticks be in(=1) the plot area or outside (=-1)
     public $supress_last=false,$supress_tickmarks=false,$supress_minor_tickmarks=false;
-    public $maj_ticks_pos = array(), $maj_ticklabels_pos = array(), 
-           $ticks_pos = array(), $maj_ticks_label = array();
+    public $maj_ticks_pos = array(), $maj_ticklabels_pos = array(),
+           $ticks_pos = array(), $maj_ticks_label = array();
     public $precision;
 
@@ -3813 +4175 @@
     protected $is_set=false;
     protected $supress_zerolabel=false,$supress_first=false;
-    protected $mincolor="",$majcolor="";
+    protected $mincolor='',$majcolor='';
     protected $weight=1;
     protected $label_usedateformat=FALSE;
 
-//---------------
-// CONSTRUCTOR
-    function Ticks($aScale) {
-        $this->scale=$aScale;
-        $this->precision = -1;
-    }
-
-//---------------
-// PUBLIC METHODS       
+    function __construct($aScale) {
+        $this->scale=$aScale;
+        $this->precision = -1;
+    }
+
     // Set format string for automatic labels
     function SetLabelFormat($aFormatString,$aDate=FALSE) {
-        $this->label_formatstr=$aFormatString;
-        $this->label_usedateformat=$aDate;
-    }
-        
+        $this->label_formatstr=$aFormatString;
+        $this->label_usedateformat=$aDate;
+    }
+
     function SetLabelDateFormat($aFormatString) {
-        $this->label_dateformatstr=$aFormatString;
-    }
-        
+        $this->label_dateformatstr=$aFormatString;
+    }
+
     function SetFormatCallback($aCallbackFuncName) {
-        $this->label_formfunc = $aCallbackFuncName;
-    }
-        
+        $this->label_formfunc = $aCallbackFuncName;
+    }
+
     // Don't display the first zero label
     function SupressZeroLabel($aFlag=true) {
-        $this->supress_zerolabel=$aFlag;
-    }
-        
+        $this->supress_zerolabel=$aFlag;
+    }
+
     // Don't display minor tick marks
     function SupressMinorTickMarks($aHide=true) {
-        $this->supress_minor_tickmarks=$aHide;
-    }
-        
+        $this->supress_minor_tickmarks=$aHide;
+    }
+
     // Don't display major tick marks
     function SupressTickMarks($aHide=true) {
-        $this->supress_tickmarks=$aHide;
-    }
-        
+        $this->supress_tickmarks=$aHide;
+    }
+
     // Hide the first tick mark
     function SupressFirst($aHide=true) {
-        $this->supress_first=$aHide;
-    }
-        
+        $this->supress_first=$aHide;
+    }
+
     // Hide the last tick mark
     function SupressLast($aHide=true) {
-        $this->supress_last=$aHide;
+        $this->supress_last=$aHide;
     }
 
     // Size (in pixels) of minor tick marks
     function GetMinTickAbsSize() {
-        return $this->minor_abs_size;
-    }
-        
+        return $this->minor_abs_size;
+    }
+
     // Size (in pixels) of major tick marks
     function GetMajTickAbsSize() {
-        return $this->major_abs_size;           
-    }
-        
+        return $this->major_abs_size;
+    }
+
     function SetSize($aMajSize,$aMinSize=3) {
-        $this->major_abs_size = $aMajSize;              
-        $this->minor_abs_size = $aMinSize;              
+        $this->major_abs_size = $aMajSize;
+        $this->minor_abs_size = $aMinSize;
     }
 
     // Have the ticks been specified
     function IsSpecified() {
-        return $this->is_set;
-    }
-                
-    // Specify number of decimals in automatic labels
-    // Deprecated from 1.4. Use SetFormatString() instead
-    function SetPrecision($aPrecision) {        
-        if( ERR_DEPRECATED )
-            JpGraphError::RaiseL(25063);//('Ticks::SetPrecision() is deprecated. Use Ticks::SetLabelFormat() (or Ticks::SetFormatCallback()) instead');
-        $this->precision=$aPrecision;
+        return $this->is_set;
     }
 
     function SetSide($aSide) {
-        $this->direction=$aSide;
-    }
-        
+        $this->direction=$aSide;
+    }
+
     // Which side of the axis should the ticks be on
     function SetDirection($aSide=SIDE_RIGHT) {
-        $this->direction=$aSide;
-    }
-        
+        $this->direction=$aSide;
+    }
+
     // Set colors for major and minor tick marks
-    function SetMarkColor($aMajorColor,$aMinorColor="") {
-        $this->SetColor($aMajorColor,$aMinorColor);
-    }
-    
-    function SetColor($aMajorColor,$aMinorColor="") {
-        $this->majcolor=$aMajorColor;
-                
-        // If not specified use same as major
-        if( $aMinorColor=="" ) 
-            $this->mincolor=$aMajorColor;
-        else
-            $this->mincolor=$aMinorColor;
-    }
-        
+    function SetMarkColor($aMajorColor,$aMinorColor='') {
+        $this->SetColor($aMajorColor,$aMinorColor);
+    }
+
+    function SetColor($aMajorColor,$aMinorColor='') {
+        $this->majcolor=$aMajorColor;
+
+        // If not specified use same as major
+        if( $aMinorColor == '' ) {
+            $this->mincolor=$aMajorColor;
+        }
+        else {
+            $this->mincolor=$aMinorColor;
+        }
+    }
+
     function SetWeight($aWeight) {
-        $this->weight=$aWeight;
-    }
-        
+        $this->weight=$aWeight;
+    }
+
 } // Class
 
@@ -3936 +4288 @@
     private $iAdjustForDST = false; // If a date falls within the DST period add one hour to the diaplyed time
 
-//---------------
-// CONSTRUCTOR
-    function LinearTicks() {
-        $this->precision = -1;
-    }
-
-//---------------
-// PUBLIC METHODS       
-        
-        
+    function __construct() {
+        $this->precision = -1;
+    }
+
     // Return major step size in world coordinates
     function GetMajor() {
-        return $this->major_step;
-    }
-        
+        return $this->major_step;
+    }
+
     // Return minor step size in world coordinates
     function GetMinor() {
-        return $this->minor_step;
-    }
-        
+        return $this->minor_step;
+    }
+
     // Set Minor and Major ticks (in world coordinates)
     function Set($aMajStep,$aMinStep=false) {
-        if( $aMinStep==false ) 
-            $aMinStep=$aMajStep;
-        
-        if( $aMajStep <= 0 || $aMinStep <= 0 ) {
-            JpGraphError::RaiseL(25064);
-//(" Minor or major step size is 0. Check that you haven't got an accidental SetTextTicks(0) in your code. If this is not the case you might have stumbled upon a bug in JpGraph. Please report this and if possible include the data that caused the problem.");
-        }
-                
-        $this->major_step=$aMajStep;
-        $this->minor_step=$aMinStep;
-        $this->is_set = true;
+        if( $aMinStep==false ) {
+            $aMinStep=$aMajStep;
+        }
+
+        if( $aMajStep <= 0 || $aMinStep <= 0 ) {
+            JpGraphError::RaiseL(25064);
+            //(" Minor or major step size is 0. Check that you haven't got an accidental SetTextTicks(0) in your code. If this is not the case you might have stumbled upon a bug in JpGraph. Please report this and if possible include the data that caused the problem.");
+        }
+
+        $this->major_step=$aMajStep;
+        $this->minor_step=$aMinStep;
+        $this->is_set = true;
     }
 
     function SetMajTickPositions($aMajPos,$aLabels=NULL) {
-        $this->SetTickPositions($aMajPos,NULL,$aLabels);
+        $this->SetTickPositions($aMajPos,NULL,$aLabels);
     }
 
     function SetTickPositions($aMajPos,$aMinPos=NULL,$aLabels=NULL) {
-        if( !is_array($aMajPos) || ($aMinPos!==NULL && !is_array($aMinPos)) ) {
-            JpGraphError::RaiseL(25065);//('Tick positions must be specifued as an array()');
-            return;
-        }
-        $n=count($aMajPos);
-        if( is_array($aLabels) && (count($aLabels) != $n) ) {
-            JpGraphError::RaiseL(25066);//('When manually specifying tick positions and labels the number of labels must be the same as the number of specified ticks.');
-            return;
-        }
-        $this->iManualTickPos = $aMajPos;
-        $this->iManualMinTickPos = $aMinPos;
-        $this->iManualTickLabels = $aLabels;
-    }
-
-    // Specify all the tick positions manually and possible also the exact labels 
-    function _doManualTickPos($aScale) { 
-        $n=count($this->iManualTickPos);
-        $m=count($this->iManualMinTickPos);
-        $doLbl=count($this->iManualTickLabels) > 0;
-
-        $this->maj_ticks_pos = array();
-        $this->maj_ticklabels_pos = array();
-        $this->ticks_pos = array();
-
-        // Now loop through the supplied positions and translate them to screen coordinates
-        // and store them in the maj_label_positions
-        $minScale = $aScale->scale[0];
-        $maxScale = $aScale->scale[1];
-        $j=0;
-        for($i=0; $i < $n ; ++$i ) {
-            // First make sure that the first tick is not lower than the lower scale value
-            if( !isset($this->iManualTickPos[$i])  || 
-                $this->iManualTickPos[$i] < $minScale  || $this->iManualTickPos[$i] > $maxScale) {
-                continue;
-            }
-
-
-            $this->maj_ticks_pos[$j] = $aScale->Translate($this->iManualTickPos[$i]);
-            $this->maj_ticklabels_pos[$j] = $this->maj_ticks_pos[$j];   
-
-            // Set the minor tick marks the same as major if not specified
-            if( $m <= 0 ) {
-                $this->ticks_pos[$j] = $this->maj_ticks_pos[$j];
-            }
-
-            if( $doLbl ) { 
-                $this->maj_ticks_label[$j] = $this->iManualTickLabels[$i];
-            }
-            else {
-                $this->maj_ticks_label[$j]=$this->_doLabelFormat($this->iManualTickPos[$i],$i,$n);
-            }
-            ++$j;
-        }
-
-        // Some sanity check
-        if( count($this->maj_ticks_pos) < 2 ) {
-            JpGraphError::RaiseL(25067);//('Your manually specified scale and ticks is not correct. The scale seems to be too small to hold any of the specified tickl marks.');
-        }
-
-        // Setup the minor tick marks
-        $j=0;
-        for($i=0; $i < $m; ++$i ) {
-            if(  empty($this->iManualMinTickPos[$i]) || 
-                 $this->iManualMinTickPos[$i] < $minScale  || $this->iManualMinTickPos[$i] > $maxScale) 
-                continue;
-            $this->ticks_pos[$j] = $aScale->Translate($this->iManualMinTickPos[$i]);
-            ++$j;
-        }
+        if( !is_array($aMajPos) || ($aMinPos!==NULL && !is_array($aMinPos)) ) {
+            JpGraphError::RaiseL(25065);//('Tick positions must be specifued as an array()');
+            return;
+        }
+        $n=count($aMajPos);
+        if( is_array($aLabels) && (count($aLabels) != $n) ) {
+            JpGraphError::RaiseL(25066);//('When manually specifying tick positions and labels the number of labels must be the same as the number of specified ticks.');
+        }
+        $this->iManualTickPos = $aMajPos;
+        $this->iManualMinTickPos = $aMinPos;
+        $this->iManualTickLabels = $aLabels;
+    }
+
+    function HaveManualLabels() {
+        return is_array($this->iManualTickLabels) ? count($this->iManualTickLabels) > 0 : false;
+    }
+
+    // Specify all the tick positions manually and possible also the exact labels
+    function _doManualTickPos($aScale) {
+        $n=count($this->iManualTickPos);
+        $m= is_array($this->iManualMinTickPos) ? count($this->iManualMinTickPos) : 0;
+        $doLbl= is_array($this->iManualTickLabels) ? count($this->iManualTickLabels) > 0 : false;
+
+        $this->maj_ticks_pos = array();
+        $this->maj_ticklabels_pos = array();
+        $this->ticks_pos = array();
+
+        // Now loop through the supplied positions and translate them to screen coordinates
+        // and store them in the maj_label_positions
+        $minScale = $aScale->scale[0];
+        $maxScale = $aScale->scale[1];
+        $j=0;
+        for($i=0; $i < $n ; ++$i ) {
+            // First make sure that the first tick is not lower than the lower scale value
+            if( !isset($this->iManualTickPos[$i]) || $this->iManualTickPos[$i] < $minScale  || $this->iManualTickPos[$i] > $maxScale) {
+                continue;
+            }
+
+            $this->maj_ticks_pos[$j] = $aScale->Translate($this->iManualTickPos[$i]);
+            $this->maj_ticklabels_pos[$j] = $this->maj_ticks_pos[$j];
+
+            // Set the minor tick marks the same as major if not specified
+            if( $m <= 0 ) {
+                $this->ticks_pos[$j] = $this->maj_ticks_pos[$j];
+            }
+            if( $doLbl ) {
+                $this->maj_ticks_label[$j] = $this->iManualTickLabels[$i];
+            }
+            else {
+                $this->maj_ticks_label[$j]=$this->_doLabelFormat($this->iManualTickPos[$i],$i,$n);
+            }
+            ++$j;
+        }
+
+        // Some sanity check
+        if( count($this->maj_ticks_pos) < 2 ) {
+            JpGraphError::RaiseL(25067);//('Your manually specified scale and ticks is not correct. The scale seems to be too small to hold any of the specified tickl marks.');
+        }
+
+        // Setup the minor tick marks
+        $j=0;
+        for($i=0; $i < $m; ++$i ) {
+            if(  empty($this->iManualMinTickPos[$i]) || $this->iManualMinTickPos[$i] < $minScale  || $this->iManualMinTickPos[$i] > $maxScale) {
+                continue;
+            }
+            $this->ticks_pos[$j] = $aScale->Translate($this->iManualMinTickPos[$i]);
+            ++$j;
+        }
     }
 
     function _doAutoTickPos($aScale) {
-        $maj_step_abs = $aScale->scale_factor*$this->major_step;                
-        $min_step_abs = $aScale->scale_factor*$this->minor_step;                
-
-        if( $min_step_abs==0 || $maj_step_abs==0 ) {
-            JpGraphError::RaiseL(25068);//("A plot has an illegal scale. This could for example be that you are trying to use text autoscaling to draw a line plot with only one point or that the plot area is too small. It could also be that no input data value is numeric (perhaps only '-' or 'x')");
-        }
-        // We need to make this an int since comparing it below
-        // with the result from round() can give wrong result, such that
-        // (40 < 40) == TRUE !!!
-        $limit = (int)$aScale->scale_abs[1];    
-
-        if( $aScale->textscale ) {
-            // This can only be true for a X-scale (horizontal)
-            // Define ticks for a text scale. This is slightly different from a 
-            // normal linear type of scale since the position might be adjusted
-            // and the labels start at on
-            $label = (float)$aScale->GetMinVal()+$this->text_label_start+$this->label_offset;   
-            $start_abs=$aScale->scale_factor*$this->text_label_start;
-            $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;       
-
-            $x = $aScale->scale_abs[0]+$start_abs+$this->xlabel_offset*$min_step_abs;   
-            for( $i=0; $label <= $aScale->GetMaxVal()+$this->label_offset; ++$i ) {
-                // Apply format to label
-                $this->maj_ticks_label[$i]=$this->_doLabelFormat($label,$i,$nbrmajticks);
-                $label+=$this->major_step;
-
-                // The x-position of the tick marks can be different from the labels.
-                // Note that we record the tick position (not the label) so that the grid
-                // happen upon tick marks and not labels.
-                $xtick=$aScale->scale_abs[0]+$start_abs+$this->xtick_offset*$min_step_abs+$i*$maj_step_abs;
-                $this->maj_ticks_pos[$i]=$xtick;
-                $this->maj_ticklabels_pos[$i] = round($x);                              
-                $x += $maj_step_abs;
-            }
-        }
-        else {
-            $label = $aScale->GetMinVal();      
-            $abs_pos = $aScale->scale_abs[0];
-            $j=0; $i=0;
-            $step = round($maj_step_abs/$min_step_abs);
-            if( $aScale->type == "x" ) {
-                // For a normal linear type of scale the major ticks will always be multiples
-                // of the minor ticks. In order to avoid any rounding issues the major ticks are
-                // defined as every "step" minor ticks and not calculated separately
-                $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1; 
-                while( round($abs_pos) <= $limit ) {
-                    $this->ticks_pos[] = round($abs_pos);
-                    $this->ticks_label[] = $label;
-                    if( $step== 0 || $i % $step == 0 && $j < $nbrmajticks ) {
-                        $this->maj_ticks_pos[$j] = round($abs_pos);
-                        $this->maj_ticklabels_pos[$j] = round($abs_pos);
-                        $this->maj_ticks_label[$j]=$this->_doLabelFormat($label,$j,$nbrmajticks);
-                        ++$j;
-                    }
-                    ++$i;
-                    $abs_pos += $min_step_abs;
-                    $label+=$this->minor_step;
-                }
-            }
-            elseif( $aScale->type == "y" ) {
-                $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal())/$this->major_step)+1;
-                while( round($abs_pos) >= $limit ) {
-                    $this->ticks_pos[$i] = round($abs_pos); 
-                    $this->ticks_label[$i]=$label;
-                    if( $step== 0 || $i % $step == 0 && $j < $nbrmajticks) {
-                        $this->maj_ticks_pos[$j] = round($abs_pos);
-                        $this->maj_ticklabels_pos[$j] = round($abs_pos);
-                        $this->maj_ticks_label[$j]=$this->_doLabelFormat($label,$j,$nbrmajticks);
-                        ++$j;
-                    }
-                    ++$i;
-                    $abs_pos += $min_step_abs;
-                    $label += $this->minor_step;
-                }       
-            }
-        }       
+        $maj_step_abs = $aScale->scale_factor*$this->major_step;
+        $min_step_abs = $aScale->scale_factor*$this->minor_step;
+
+        if( $min_step_abs==0 || $maj_step_abs==0 ) {
+            JpGraphError::RaiseL(25068);//("A plot has an illegal scale. This could for example be that you are trying to use text autoscaling to draw a line plot with only one point or that the plot area is too small. It could also be that no input data value is numeric (perhaps only '-' or 'x')");
+        }
+        // We need to make this an int since comparing it below
+        // with the result from round() can give wrong result, such that
+        // (40 < 40) == TRUE !!!
+        $limit = (int)$aScale->scale_abs[1];
+
+        if( $aScale->textscale ) {
+            // This can only be true for a X-scale (horizontal)
+            // Define ticks for a text scale. This is slightly different from a
+            // normal linear type of scale since the position might be adjusted
+            // and the labels start at on
+            $label = (float)$aScale->GetMinVal()+$this->text_label_start+$this->label_offset;
+            $start_abs=$aScale->scale_factor*$this->text_label_start;
+            $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
+
+            $x = $aScale->scale_abs[0]+$start_abs+$this->xlabel_offset*$min_step_abs;
+            for( $i=0; $label <= $aScale->GetMaxVal()+$this->label_offset; ++$i ) {
+                // Apply format to label
+                $this->maj_ticks_label[$i]=$this->_doLabelFormat($label,$i,$nbrmajticks);
+                $label+=$this->major_step;
+
+                // The x-position of the tick marks can be different from the labels.
+                // Note that we record the tick position (not the label) so that the grid
+                // happen upon tick marks and not labels.
+                $xtick=$aScale->scale_abs[0]+$start_abs+$this->xtick_offset*$min_step_abs+$i*$maj_step_abs;
+                $this->maj_ticks_pos[$i]=$xtick;
+                $this->maj_ticklabels_pos[$i] = round($x);
+                $x += $maj_step_abs;
+            }
+        }
+        else {
+            $label = $aScale->GetMinVal();
+            $abs_pos = $aScale->scale_abs[0];
+            $j=0; $i=0;
+            $step = round($maj_step_abs/$min_step_abs);
+            if( $aScale->type == "x" ) {
+                // For a normal linear type of scale the major ticks will always be multiples
+                // of the minor ticks. In order to avoid any rounding issues the major ticks are
+                // defined as every "step" minor ticks and not calculated separately
+                $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
+                while( round($abs_pos) <= $limit ) {
+                    $this->ticks_pos[] = round($abs_pos);
+                    $this->ticks_label[] = $label;
+                    if( $step== 0 || $i % $step == 0 && $j < $nbrmajticks ) {
+                        $this->maj_ticks_pos[$j] = round($abs_pos);
+                        $this->maj_ticklabels_pos[$j] = round($abs_pos);
+                        $this->maj_ticks_label[$j]=$this->_doLabelFormat($label,$j,$nbrmajticks);
+                        ++$j;
+                    }
+                    ++$i;
+                    $abs_pos += $min_step_abs;
+                    $label+=$this->minor_step;
+                }
+            }
+            elseif( $aScale->type == "y" ) {
+                //@todo  s=2:20,12  s=1:50,6  $this->major_step:$nbr
+                // abs_point,limit s=1:270,80 s=2:540,160
+             // $this->major_step = 50;
+                $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal())/$this->major_step)+1;
+//                $step = 5;
+                while( round($abs_pos) >= $limit ) {
+                    $this->ticks_pos[$i] = round($abs_pos);
+                    $this->ticks_label[$i]=$label;
+                    if( $step== 0 || $i % $step == 0 && $j < $nbrmajticks) {
+                        $this->maj_ticks_pos[$j] = round($abs_pos);
+                        $this->maj_ticklabels_pos[$j] = round($abs_pos);
+                        $this->maj_ticks_label[$j]=$this->_doLabelFormat($label,$j,$nbrmajticks);
+                        ++$j;
+                    }
+                    ++$i;
+                    $abs_pos += $min_step_abs;
+                    $label += $this->minor_step;
+                }
+            }
+        }
     }
 
     function AdjustForDST($aFlg=true) {
-        $this->iAdjustForDST = $aFlg;
+        $this->iAdjustForDST = $aFlg;
     }
 
@@ -4132 +4483 @@
     function _doLabelFormat($aVal,$aIdx,$aNbrTicks) {
 
-        // If precision hasn't been specified set it to a sensible value
-        if( $this->precision==-1 ) { 
-            $t = log10($this->minor_step);
-            if( $t > 0 )
-                $precision = 0;
-            else
-                $precision = -floor($t);
-        }
-        else
-            $precision = $this->precision;
-
-        if( $this->label_formfunc != '' ) {
-            $f=$this->label_formfunc;
-            $l = call_user_func($f,$aVal);
-        }       
-        elseif( $this->label_formatstr != '' || $this->label_dateformatstr != '' ) {
-            if( $this->label_usedateformat ) {
-                // Adjust the value to take daylight savings into account
-                if (date("I",$aVal)==1 && $this->iAdjustForDST ) // DST
-                    $aVal+=3600;
-
-                $l = date($this->label_formatstr,$aVal);
-                if( $this->label_formatstr == 'W' ) {
-                    // If we use week formatting then add a single 'w' in front of the
-                    // week number to differentiate it from dates
-                    $l = 'w'.$l;
-                }
-            }
-            else {
-                if( $this->label_dateformatstr !== '' ) {
-                    // Adjust the value to take daylight savings into account
-                    if (date("I",$aVal)==1 && $this->iAdjustForDST ) // DST
-                        $aVal+=3600;
-
-                    $l = date($this->label_dateformatstr,$aVal);
-                    if( $this->label_formatstr == 'W' ) {
-                        // If we use week formatting then add a single 'w' in front of the
-                        // week number to differentiate it from dates
-                        $l = 'w'.$l;
-                    }
-                }
-                else
-                    $l = sprintf($this->label_formatstr,$aVal);
-            }
-        }
-        else {
-            $l = sprintf('%01.'.$precision.'f',round($aVal,$precision));
-        }
-        
-        if( ($this->supress_zerolabel && $l==0) ||  ($this->supress_first && $aIdx==0) ||
-            ($this->supress_last  && $aIdx==$aNbrTicks-1) ) {
-            $l='';
-        }
-        return $l;
+        // If precision hasn't been specified set it to a sensible value
+        if( $this->precision==-1 ) {
+            $t = log10($this->minor_step);
+            if( $t > 0 || $t === 0.0) {
+                $precision = 0;
+            }
+            else {
+                $precision = -floor($t);
+            }
+        }
+        else {
+            $precision = $this->precision;
+        }
+
+        if( $this->label_formfunc != '' ) {
+            $f=$this->label_formfunc;
+            if( $this->label_formatstr == '' ) {
+                $l = call_user_func($f,$aVal);
+            }
+            else {
+                $l = sprintf($this->label_formatstr, call_user_func($f,$aVal));
+            }
+        }
+        elseif( $this->label_formatstr != '' || $this->label_dateformatstr != '' ) {
+            if( $this->label_usedateformat ) {
+                // Adjust the value to take daylight savings into account
+                if (date("I",$aVal)==1 && $this->iAdjustForDST ) {
+                    // DST
+                    $aVal+=3600;
+                }
+
+                $l = date($this->label_formatstr,$aVal);
+                if( $this->label_formatstr == 'W' ) {
+                    // If we use week formatting then add a single 'w' in front of the
+                    // week number to differentiate it from dates
+                    $l = 'w'.$l;
+                }
+            }
+            else {
+                if( $this->label_dateformatstr !== '' ) {
+                    // Adjust the value to take daylight savings into account
+                    if (date("I",$aVal)==1 && $this->iAdjustForDST ) {
+                        // DST
+                        $aVal+=3600;
+                    }
+
+                    $l = date($this->label_dateformatstr,$aVal);
+                    if( $this->label_formatstr == 'W' ) {
+                        // If we use week formatting then add a single 'w' in front of the
+                        // week number to differentiate it from dates
+                        $l = 'w'.$l;
+                    }
+                }
+                else {
+                    $l = sprintf($this->label_formatstr,$aVal);
+                }
+            }
+        }
+        else {
+            $l = sprintf('%01.'.$precision.'f',round($aVal,$precision));
+        }
+
+        if( ($this->supress_zerolabel && $l==0) ||  ($this->supress_first && $aIdx==0) || ($this->supress_last  && $aIdx==$aNbrTicks-1) ) {
+            $l='';
+        }
+        return $l;
     }
 
     // Stroke ticks on either X or Y axis
     function _StrokeTicks($aImg,$aScale,$aPos) {
-        $hor = $aScale->type == 'x';
-        $aImg->SetLineWeight($this->weight);
-
-        // We need to make this an int since comparing it below
-        // with the result from round() can give wrong result, such that
-        // (40 < 40) == TRUE !!!        
-        $limit = (int)$aScale->scale_abs[1];
-                
-        // A text scale doesn't have any minor ticks
-        if( !$aScale->textscale ) {
-            // Stroke minor ticks
-            $yu = $aPos - $this->direction*$this->GetMinTickAbsSize();
-            $xr = $aPos + $this->direction*$this->GetMinTickAbsSize();
-            $n = count($this->ticks_pos);
-            for($i=0; $i < $n; ++$i ) {
-                if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
-                    if( $this->mincolor!="" ) $aImg->PushColor($this->mincolor);
-                    if( $hor ) {
-                        //if( $this->ticks_pos[$i] <= $limit ) 
-                        $aImg->Line($this->ticks_pos[$i],$aPos,$this->ticks_pos[$i],$yu); 
-                    }
-                    else {
-                        //if( $this->ticks_pos[$i] >= $limit ) 
-                        $aImg->Line($aPos,$this->ticks_pos[$i],$xr,$this->ticks_pos[$i]); 
-                    }
-                    if( $this->mincolor!="" ) $aImg->PopColor();
-                }
-            }
-        }
-
-        // Stroke major ticks
-        $yu = $aPos - $this->direction*$this->GetMajTickAbsSize();
-        $xr = $aPos + $this->direction*$this->GetMajTickAbsSize();
-        $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
-        $n = count($this->maj_ticks_pos);
-        for($i=0; $i < $n ; ++$i ) {
-            if(!($this->xtick_offset > 0 && $i==$nbrmajticks-1) && !$this->supress_tickmarks) {
-                if( $this->majcolor!="" ) $aImg->PushColor($this->majcolor);
-                if( $hor ) {
-                    //if( $this->maj_ticks_pos[$i] <= $limit ) 
-                    $aImg->Line($this->maj_ticks_pos[$i],$aPos,$this->maj_ticks_pos[$i],$yu); 
-                }
-                else {
-                    //if( $this->maj_ticks_pos[$i] >= $limit ) 
-                    $aImg->Line($aPos,$this->maj_ticks_pos[$i],$xr,$this->maj_ticks_pos[$i]); 
-                }
-                if( $this->majcolor!="" ) $aImg->PopColor();
-            }
-        }
-        
+        $hor = $aScale->type == 'x';
+        $aImg->SetLineWeight($this->weight);
+
+        // We need to make this an int since comparing it below
+        // with the result from round() can give wrong result, such that
+        // (40 < 40) == TRUE !!!
+        $limit = (int)$aScale->scale_abs[1];
+
+        // A text scale doesn't have any minor ticks
+        if( !$aScale->textscale ) {
+            // Stroke minor ticks
+            $yu = $aPos - $this->direction*$this->GetMinTickAbsSize();
+            $xr = $aPos + $this->direction*$this->GetMinTickAbsSize();
+            $n = count($this->ticks_pos);
+            for($i=0; $i < $n; ++$i ) {
+                if( !$this->supress_tickmarks && !$this->supress_minor_tickmarks) {
+                    if( $this->mincolor != '') {
+                        $aImg->PushColor($this->mincolor);
+                    }
+                    if( $hor ) {
+                        //if( $this->ticks_pos[$i] <= $limit )
+                        $aImg->Line($this->ticks_pos[$i],$aPos,$this->ticks_pos[$i],$yu);
+                    }
+                    else {
+                        //if( $this->ticks_pos[$i] >= $limit )
+                        $aImg->Line($aPos,$this->ticks_pos[$i],$xr,$this->ticks_pos[$i]);
+                    }
+                    if( $this->mincolor != '' ) {
+                        $aImg->PopColor();
+                    }
+                }
+            }
+        }
+
+        // Stroke major ticks
+        $yu = $aPos - $this->direction*$this->GetMajTickAbsSize();
+        $xr = $aPos + $this->direction*$this->GetMajTickAbsSize();
+        $nbrmajticks=round(($aScale->GetMaxVal()-$aScale->GetMinVal()-$this->text_label_start )/$this->major_step)+1;
+        $n = count($this->maj_ticks_pos);
+        for($i=0; $i < $n ; ++$i ) {
+            if(!($this->xtick_offset > 0 && $i==$nbrmajticks-1) && !$this->supress_tickmarks) {
+                if( $this->majcolor != '') {
+                    $aImg->PushColor($this->majcolor);
+                }
+                if( $hor ) {
+                    //if( $this->maj_ticks_pos[$i] <= $limit )
+                    $aImg->Line($this->maj_ticks_pos[$i],$aPos,$this->maj_ticks_pos[$i],$yu);
+                }
+                else {
+                    //if( $this->maj_ticks_pos[$i] >= $limit )
+                    $aImg->Line($aPos,$this->maj_ticks_pos[$i],$xr,$this->maj_ticks_pos[$i]);
+                }
+                if( $this->majcolor != '') {
+                    $aImg->PopColor();
+                }
+            }
+        }
+
     }
 
     // Draw linear ticks
     function Stroke($aImg,$aScale,$aPos) {
-        if( $this->iManualTickPos != NULL ) 
-            $this->_doManualTickPos($aScale);
-        else 
-            $this->_doAutoTickPos($aScale);
-        $this->_StrokeTicks($aImg,$aScale,$aPos, $aScale->type == 'x' );
-    }
-
-//---------------
-// PRIVATE METHODS
+        if( $this->iManualTickPos != NULL ) {
+            $this->_doManualTickPos($aScale);
+        }
+        else {
+            $this->_doAutoTickPos($aScale);
+        }
+        $this->_StrokeTicks($aImg,$aScale,$aPos, $aScale->type == 'x' );
+    }
+
+    //---------------
+    // PRIVATE METHODS
     // Spoecify the offset of the displayed tick mark with the tick "space"
-    // Legal values for $o is [0,1] used to adjust where the tick marks and label 
+    // Legal values for $o is [0,1] used to adjust where the tick marks and label
     // should be positioned within the major tick-size
     // $lo specifies the label offset and $to specifies the tick offset
@@ -4260 +4633 @@
     // tick but have the labels displayed halfway under the bars.
     function SetXLabelOffset($aLabelOff,$aTickOff=-1) {
-        $this->xlabel_offset=$aLabelOff;
-        if( $aTickOff==-1 )     // Same as label offset
-            $this->xtick_offset=$aLabelOff;
-        else
-            $this->xtick_offset=$aTickOff;
-        if( $aLabelOff>0 )
-            $this->SupressLast();       // The last tick wont fit
+        $this->xlabel_offset=$aLabelOff;
+        if( $aTickOff==-1 ) {
+            // Same as label offset
+            $this->xtick_offset=$aLabelOff;
+        }
+        else {
+            $this->xtick_offset=$aTickOff;
+        }
+        if( $aLabelOff>0 ) {
+            $this->SupressLast(); // The last tick wont fit
+        }
     }
 
     // Which tick label should we start with?
     function SetTextLabelStart($aTextLabelOff) {
-        $this->text_label_start=$aTextLabelOff;
-    }
-        
+        $this->text_label_start=$aTextLabelOff;
+    }
+
 } // Class
 
 //===================================================
 // CLASS LinearScale
-// Description: Handle linear scaling between screen and world 
+// Description: Handle linear scaling between screen and world
 //===================================================
 class LinearScale {
@@ -4297 +4674 @@
     public $auto_ticks=false; // When using manual scale should the ticks be automatically set?
     public $world_abs_size; // Plot area size in pixels (Needed public in jpgraph_radar.php)
-    public $world_size; // Plot area size in world coordinates
     public $intscale=false; // Restrict autoscale to integers
     protected $autoscale_min=false; // Forced minimum value, auto determine max
     protected $autoscale_max=false; // Forced maximum value, auto determine min
     private $gracetop=0,$gracebottom=0;
-//---------------
-// CONSTRUCTOR
-    function LinearScale($aMin=0,$aMax=0,$aType="y") {
-        assert($aType=="x" || $aType=="y" );
-        assert($aMin<=$aMax);
-                
-        $this->type=$aType;
-        $this->scale=array($aMin,$aMax);                
-        $this->world_size=$aMax-$aMin;  
-        $this->ticks = new LinearTicks();
-    }
-
-//---------------
-// PUBLIC METHODS       
+
+    private $_world_size; // Plot area size in world coordinates
+
+    function __construct($aMin=0,$aMax=0,$aType='y') {
+        assert($aType=='x' || $aType=='y' );
+        assert($aMin<=$aMax);
+
+        $this->type=$aType;
+        $this->scale=array($aMin,$aMax);
+        $this->world_size=$aMax-$aMin;
+        $this->ticks = new LinearTicks();
+    }
+
     // Check if scale is set or if we should autoscale
     // We should do this is either scale or ticks has not been set
     function IsSpecified() {
-        if( $this->GetMinVal()==$this->GetMaxVal() ) {          // Scale not set
-            return false;
-        }
-        return true;
-    }
-        
-    // Set the minimum data value when the autoscaling is used. 
+        if( $this->GetMinVal()==$this->GetMaxVal() ) {  // Scale not set
+            return false;
+        }
+        return true;
+    }
+
+    // Set the minimum data value when the autoscaling is used.
     // Usefull if you want a fix minimum (like 0) but have an
     // automatic maximum
     function SetAutoMin($aMin) {
-        $this->autoscale_min=$aMin;
-    }
-
-    // Set the minimum data value when the autoscaling is used. 
+        $this->autoscale_min=$aMin;
+    }
+
+    // Set the minimum data value when the autoscaling is used.
     // Usefull if you want a fix minimum (like 0) but have an
     // automatic maximum
     function SetAutoMax($aMax) {
-        $this->autoscale_max=$aMax;
+        $this->autoscale_max=$aMax;
     }
 
@@ -4342 +4717 @@
     // still be set automatically?
     function SetAutoTicks($aFlag=true) {
-        $this->auto_ticks = $aFlag;
+        $this->auto_ticks = $aFlag;
     }
 
     // Specify scale "grace" value (top and bottom)
     function SetGrace($aGraceTop,$aGraceBottom=0) {
-        if( $aGraceTop<0 || $aGraceBottom < 0  )
-            JpGraphError::RaiseL(25069);//(" Grace must be larger then 0");
-        $this->gracetop=$aGraceTop;
-        $this->gracebottom=$aGraceBottom;
-    }
-        
+        if( $aGraceTop<0 || $aGraceBottom < 0  ) {
+            JpGraphError::RaiseL(25069);//(" Grace must be larger then 0");
+        }
+        $this->gracetop=$aGraceTop;
+        $this->gracebottom=$aGraceBottom;
+    }
+
     // Get the minimum value in the scale
     function GetMinVal() {
-        return $this->scale[0];
-    }
-        
+        return $this->scale[0];
+    }
+
     // get maximum value for scale
     function GetMaxVal() {
-        return $this->scale[1];
-    }
-                
-    // Specify a new min/max value for sclae    
+        return $this->scale[1];
+    }
+
+    // Specify a new min/max value for sclae
     function Update($aImg,$aMin,$aMax) {
-        $this->scale=array($aMin,$aMax);                
-        $this->world_size=$aMax-$aMin;          
-        $this->InitConstants($aImg);                                    
-    }
-        
+        $this->scale=array($aMin,$aMax);
+        $this->world_size=$aMax-$aMin;
+        $this->InitConstants($aImg);
+    }
+
     // Translate between world and screen
     function Translate($aCoord) {
-        if( !is_numeric($aCoord) ) {
-            if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x' ) 
-                JpGraphError::RaiseL(25070);//('Your data contains non-numeric values.');
-            return 0;
-        }
-        else {
-            return $this->off+($aCoord - $this->scale[0]) * $this->scale_factor; 
-        }
-    }
-        
+        if( !is_numeric($aCoord) ) {
+            if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x' ) {
+                JpGraphError::RaiseL(25070);//('Your data contains non-numeric values.');
+            }
+            return 0;
+        }
+        else {
+            return round($this->off+($aCoord - $this->scale[0]) * $this->scale_factor);
+        }
+    }
+
     // Relative translate (don't include offset) usefull when we just want
     // to know the relative position (in pixels) on the axis
     function RelTranslate($aCoord) {
-        if( !is_numeric($aCoord) ) {
-            if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x'  ) 
-                JpGraphError::RaiseL(25070);//('Your data contains non-numeric values.');
-            return 0;
-        }
-        else { 
-            return ($aCoord - $this->scale[0]) * $this->scale_factor; 
-        }
-    }
-        
+        if( !is_numeric($aCoord) ) {
+            if( $aCoord != '' && $aCoord != '-' && $aCoord != 'x'  ) {
+                JpGraphError::RaiseL(25070);//('Your data contains non-numeric values.');
+            }
+            return 0;
+        }
+        else {
+            return ($aCoord - $this->scale[0]) * $this->scale_factor;
+        }
+    }
+
     // Restrict autoscaling to only use integers
     function SetIntScale($aIntScale=true) {
-        $this->intscale=$aIntScale;
-    }
-        
+        $this->intscale=$aIntScale;
+    }
+
     // Calculate an integer autoscale
     function IntAutoScale($img,$min,$max,$maxsteps,$majend=true) {
-        // Make sure limits are integers
-        $min=floor($min);
-        $max=ceil($max);
-        if( abs($min-$max)==0 ) {
-            --$min; ++$max;
-        }
-        $maxsteps = floor($maxsteps);
-                
-        $gracetop=round(($this->gracetop/100.0)*abs($max-$min));
-        $gracebottom=round(($this->gracebottom/100.0)*abs($max-$min));
-        if( is_numeric($this->autoscale_min) ) {
-            $min = ceil($this->autoscale_min);
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
-            }
-        }
-
-        if( is_numeric($this->autoscale_max) ) {
-            $max = ceil($this->autoscale_max);
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
-            }
-        }
-
-        if( abs($min-$max ) == 0 ) {
-            ++$max;
-            --$min;
-        }
-                        
-        $min -= $gracebottom;
-        $max += $gracetop;              
-
-        // First get tickmarks as multiples of 1, 10, ...       
-        if( $majend ) {
-            list($num1steps,$adj1min,$adj1max,$maj1step) = 
-                $this->IntCalcTicks($maxsteps,$min,$max,1);
-        }
-        else {
-            $adj1min = $min;
-            $adj1max = $max;
-            list($num1steps,$maj1step) = 
-                $this->IntCalcTicksFreeze($maxsteps,$min,$max,1);
-        }
-
-        if( abs($min-$max) > 2 ) {
-            // Then get tick marks as 2:s 2, 20, ...
-            if( $majend ) {
-                list($num2steps,$adj2min,$adj2max,$maj2step) = 
-                    $this->IntCalcTicks($maxsteps,$min,$max,5);
-            }
-            else {
-                $adj2min = $min;
-                $adj2max = $max;
-                list($num2steps,$maj2step) = 
-                    $this->IntCalcTicksFreeze($maxsteps,$min,$max,5);
-            }
-        }
-        else {
-            $num2steps = 10000; // Dummy high value so we don't choose this
-        }
-        
-        if( abs($min-$max) > 5 ) {      
-            // Then get tickmarks as 5:s 5, 50, 500, ...
-            if( $majend ) {
-                list($num5steps,$adj5min,$adj5max,$maj5step) = 
-                    $this->IntCalcTicks($maxsteps,$min,$max,2);
-            }
-            else {
-                $adj5min = $min;
-                $adj5max = $max;
-                list($num5steps,$maj5step) = 
-                    $this->IntCalcTicksFreeze($maxsteps,$min,$max,2);
-            }
-        }
-        else {
-            $num5steps = 10000; // Dummy high value so we don't choose this             
-        }
-        
-        // Check to see whichof 1:s, 2:s or 5:s fit better with
-        // the requested number of major ticks          
-        $match1=abs($num1steps-$maxsteps);              
-        $match2=abs($num2steps-$maxsteps);
-        if( !empty($maj5step) && $maj5step > 1 )
-            $match5=abs($num5steps-$maxsteps);
-        else
-            $match5=10000;      // Dummy high value 
-                
-        // Compare these three values and see which is the closest match
-        // We use a 0.6 weight to gravitate towards multiple of 5:s 
-        if( $match1 < $match2 ) {
-            if( $match1 < $match5 )
-                $r=1;                   
-            else 
-                $r=3;
-        }
-        else {
-            if( $match2 < $match5 )
-                $r=2;                   
-            else 
-                $r=3;           
-        }       
-        // Minsteps are always the same as maxsteps for integer scale
-        switch( $r ) {
-            case 1:
-                $this->ticks->Set($maj1step,$maj1step);
-                $this->Update($img,$adj1min,$adj1max);
-                break;                  
-            case 2:
-                $this->ticks->Set($maj2step,$maj2step);
-                $this->Update($img,$adj2min,$adj2max);          
-                break;                                                                  
-            case 3:
-                $this->ticks->Set($maj5step,$maj5step);         
-                $this->Update($img,$adj5min,$adj5max);
-                break;                  
-            default:
-                JpGraphError::RaiseL(25073,$r);//('Internal error. Integer scale algorithm comparison out of bound (r=$r)');
-        }               
-    }
-        
-        
+        // Make sure limits are integers
+        $min=floor($min);
+        $max=ceil($max);
+        if( abs($min-$max)==0 ) {
+            --$min; ++$max;
+        }
+        $maxsteps = floor($maxsteps);
+
+        $gracetop=round(($this->gracetop/100.0)*abs($max-$min));
+        $gracebottom=round(($this->gracebottom/100.0)*abs($max-$min));
+        if( is_numeric($this->autoscale_min) ) {
+            $min = ceil($this->autoscale_min);
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
+            }
+        }
+
+        if( is_numeric($this->autoscale_max) ) {
+            $max = ceil($this->autoscale_max);
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
+            }
+        }
+
+        if( abs($min-$max ) == 0 ) {
+            ++$max;
+            --$min;
+        }
+
+        $min -= $gracebottom;
+        $max += $gracetop;
+
+        // First get tickmarks as multiples of 1, 10, ...
+        if( $majend ) {
+            list($num1steps,$adj1min,$adj1max,$maj1step) = $this->IntCalcTicks($maxsteps,$min,$max,1);
+        }
+        else {
+            $adj1min = $min;
+            $adj1max = $max;
+            list($num1steps,$maj1step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,1);
+        }
+
+        if( abs($min-$max) > 2 ) {
+            // Then get tick marks as 2:s 2, 20, ...
+            if( $majend ) {
+                list($num2steps,$adj2min,$adj2max,$maj2step) = $this->IntCalcTicks($maxsteps,$min,$max,5);
+            }
+            else {
+                $adj2min = $min;
+                $adj2max = $max;
+                list($num2steps,$maj2step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,5);
+            }
+        }
+        else {
+            $num2steps = 10000; // Dummy high value so we don't choose this
+        }
+
+        if( abs($min-$max) > 5 ) {
+            // Then get tickmarks as 5:s 5, 50, 500, ...
+            if( $majend ) {
+                list($num5steps,$adj5min,$adj5max,$maj5step) = $this->IntCalcTicks($maxsteps,$min,$max,2);
+            }
+            else {
+                $adj5min = $min;
+                $adj5max = $max;
+                list($num5steps,$maj5step) = $this->IntCalcTicksFreeze($maxsteps,$min,$max,2);
+            }
+        }
+        else {
+            $num5steps = 10000; // Dummy high value so we don't choose this
+        }
+
+        // Check to see whichof 1:s, 2:s or 5:s fit better with
+        // the requested number of major ticks
+        $match1=abs($num1steps-$maxsteps);
+        $match2=abs($num2steps-$maxsteps);
+        if( !empty($maj5step) && $maj5step > 1 ) {
+            $match5=abs($num5steps-$maxsteps);
+        }
+        else {
+            $match5=10000;  // Dummy high value
+        }
+
+        // Compare these three values and see which is the closest match
+        // We use a 0.6 weight to gravitate towards multiple of 5:s
+        if( $match1 < $match2 ) {
+            if( $match1 < $match5 ) $r=1;
+            else  $r=3;
+        }
+        else {
+            if( $match2 < $match5 ) $r=2;
+            else $r=3;
+        }
+        // Minsteps are always the same as maxsteps for integer scale
+        switch( $r ) {
+            case 1:
+                $this->ticks->Set($maj1step,$maj1step);
+                $this->Update($img,$adj1min,$adj1max);
+                break;
+            case 2:
+                $this->ticks->Set($maj2step,$maj2step);
+                $this->Update($img,$adj2min,$adj2max);
+                break;
+            case 3:
+                $this->ticks->Set($maj5step,$maj5step);
+                $this->Update($img,$adj5min,$adj5max);
+                break;
+            default:
+                JpGraphError::RaiseL(25073,$r);//('Internal error. Integer scale algorithm comparison out of bound (r=$r)');
+        }
+    }
+
+
     // Calculate autoscale. Used if user hasn't given a scale and ticks
     // $maxsteps is the maximum number of major tickmarks allowed.
     function AutoScale($img,$min,$max,$maxsteps,$majend=true) {
-        if( $this->intscale ) { 
-            $this->IntAutoScale($img,$min,$max,$maxsteps,$majend);
-            return;
-        }
-        if( abs($min-$max) < 0.00001 ) {
-            // We need some difference to be able to autoscale
-            // make it 5% above and 5% below value
-            if( $min==0 && $max==0 ) {          // Special case
-                $min=-1; $max=1;
-            }
-            else {
-                $delta = (abs($max)+abs($min))*0.005;
-                $min -= $delta;
-                $max += $delta;
-            }
-        }
-                
-        $gracetop=($this->gracetop/100.0)*abs($max-$min);
-        $gracebottom=($this->gracebottom/100.0)*abs($max-$min);
-        if( is_numeric($this->autoscale_min) ) {
-            $min = $this->autoscale_min;
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
-            }
-            if( abs($min-$max ) < 0.00001 )
-                $max *= 1.2;
-        }
-
-        if( is_numeric($this->autoscale_max) ) {
-            $max = $this->autoscale_max;
-            if( $min >= $max ) {
-                JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
-            }
-            if( abs($min-$max ) < 0.00001 )
-                $min *= 0.8;
-        }
-
-        $min -= $gracebottom;
-        $max += $gracetop;
-
-
-        // First get tickmarks as multiples of 0.1, 1, 10, ...  
-        if( $majend ) {
-            list($num1steps,$adj1min,$adj1max,$min1step,$maj1step) = 
-                $this->CalcTicks($maxsteps,$min,$max,1,2);
-        }
-        else {
-            $adj1min=$min;
-            $adj1max=$max;
-            list($num1steps,$min1step,$maj1step) = 
-                $this->CalcTicksFreeze($maxsteps,$min,$max,1,2,false);
-        }
-                
-        // Then get tick marks as 2:s 0.2, 2, 20, ...
-        if( $majend ) {
-            list($num2steps,$adj2min,$adj2max,$min2step,$maj2step) = 
-                $this->CalcTicks($maxsteps,$min,$max,5,2);
-        }
-        else {
-            $adj2min=$min;
-            $adj2max=$max;
-            list($num2steps,$min2step,$maj2step) = 
-                $this->CalcTicksFreeze($maxsteps,$min,$max,5,2,false);
-        }
-                
-        // Then get tickmarks as 5:s 0.05, 0.5, 5, 50, ...
-        if( $majend ) {
-            list($num5steps,$adj5min,$adj5max,$min5step,$maj5step) = 
-                $this->CalcTicks($maxsteps,$min,$max,2,5);              
-        }
-        else {
-            $adj5min=$min;
-            $adj5max=$max;
-            list($num5steps,$min5step,$maj5step) = 
-                $this->CalcTicksFreeze($maxsteps,$min,$max,2,5,false);
-        }
-
-        // Check to see whichof 1:s, 2:s or 5:s fit better with
-        // the requested number of major ticks          
-        $match1=abs($num1steps-$maxsteps);              
-        $match2=abs($num2steps-$maxsteps);
-        $match5=abs($num5steps-$maxsteps);
-        // Compare these three values and see which is the closest match
-        // We use a 0.8 weight to gravitate towards multiple of 5:s 
-        $r=$this->MatchMin3($match1,$match2,$match5,0.8);
-        switch( $r ) {
-            case 1:
-                $this->Update($img,$adj1min,$adj1max);
-                $this->ticks->Set($maj1step,$min1step);
-                break;                  
-            case 2:
-                $this->Update($img,$adj2min,$adj2max);          
-                $this->ticks->Set($maj2step,$min2step);
-                break;                                                                  
-            case 3:
-                $this->Update($img,$adj5min,$adj5max);
-                $this->ticks->Set($maj5step,$min5step);         
-                break;                  
-        }
-    }
-
-//---------------
-// PRIVATE METHODS      
+
+        if( !is_numeric($min) || !is_numeric($max) ) {
+            JpGraphError::Raise(25044);
+        }
+
+        if( $this->intscale ) {
+            $this->IntAutoScale($img,$min,$max,$maxsteps,$majend);
+            return;
+        }
+        if( abs($min-$max) < 0.00001 ) {
+            // We need some difference to be able to autoscale
+            // make it 5% above and 5% below value
+            if( $min==0 && $max==0 ) {  // Special case
+                $min=-1; $max=1;
+            }
+            else {
+                $delta = (abs($max)+abs($min))*0.005;
+                $min -= $delta;
+                $max += $delta;
+            }
+        }
+
+        $gracetop=($this->gracetop/100.0)*abs($max-$min);
+        $gracebottom=($this->gracebottom/100.0)*abs($max-$min);
+        if( is_numeric($this->autoscale_min) ) {
+            $min = $this->autoscale_min;
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25071);//('You have specified a min value with SetAutoMin() which is larger than the maximum value used for the scale. This is not possible.');
+            }
+            if( abs($min-$max ) < 0.001 ) {
+                $max *= 1.2;
+            }
+        }
+
+        if( is_numeric($this->autoscale_max) ) {
+            $max = $this->autoscale_max;
+            if( $min >= $max ) {
+                JpGraphError::RaiseL(25072);//('You have specified a max value with SetAutoMax() which is smaller than the miminum value used for the scale. This is not possible.');
+            }
+            if( abs($min-$max ) < 0.001 ) {
+                $min *= 0.8;
+            }
+        }
+
+        $min -= $gracebottom;
+        $max += $gracetop;
+
+        // First get tickmarks as multiples of 0.1, 1, 10, ...
+        if( $majend ) {
+            list($num1steps,$adj1min,$adj1max,$min1step,$maj1step) = $this->CalcTicks($maxsteps,$min,$max,1,2);
+        }
+        else {
+            $adj1min=$min;
+            $adj1max=$max;
+            list($num1steps,$min1step,$maj1step) = $this->CalcTicksFreeze($maxsteps,$min,$max,1,2,false);
+        }
+
+        // Then get tick marks as 2:s 0.2, 2, 20, ...
+        if( $majend ) {
+            list($num2steps,$adj2min,$adj2max,$min2step,$maj2step) = $this->CalcTicks($maxsteps,$min,$max,5,2);
+        }
+        else {
+            $adj2min=$min;
+            $adj2max=$max;
+            list($num2steps,$min2step,$maj2step) = $this->CalcTicksFreeze($maxsteps,$min,$max,5,2,false);
+        }
+
+        // Then get tickmarks as 5:s 0.05, 0.5, 5, 50, ...
+        if( $majend ) {
+            list($num5steps,$adj5min,$adj5max,$min5step,$maj5step) = $this->CalcTicks($maxsteps,$min,$max,2,5);
+        }
+        else {
+            $adj5min=$min;
+            $adj5max=$max;
+            list($num5steps,$min5step,$maj5step) = $this->CalcTicksFreeze($maxsteps,$min,$max,2,5,false);
+        }
+
+        // Check to see whichof 1:s, 2:s or 5:s fit better with
+        // the requested number of major ticks
+        $match1=abs($num1steps-$maxsteps);
+        $match2=abs($num2steps-$maxsteps);
+        $match5=abs($num5steps-$maxsteps);
+
+        // Compare these three values and see which is the closest match
+        // We use a 0.8 weight to gravitate towards multiple of 5:s
+        $r=$this->MatchMin3($match1,$match2,$match5,0.8);
+        switch( $r ) {
+            case 1:
+                $this->Update($img,$adj1min,$adj1max);
+                $this->ticks->Set($maj1step,$min1step);
+                break;
+            case 2:
+                $this->Update($img,$adj2min,$adj2max);
+                $this->ticks->Set($maj2step,$min2step);
+                break;
+            case 3:
+                $this->Update($img,$adj5min,$adj5max);
+                $this->ticks->Set($maj5step,$min5step);
+                break;
+        }
+    }
+
+    //---------------
+    // PRIVATE METHODS
 
     // This method recalculates all constants that are depending on the
@@ -4635 +5006 @@
     // that image. Should really be installed as an observer of that image.
     function InitConstants($img) {
-        if( $this->type=="x" ) {
-            $this->world_abs_size=$img->width - $img->left_margin - $img->right_margin;
-            $this->off=$img->left_margin;
-            $this->scale_factor = 0;
-            if( $this->world_size > 0 )
-                $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
-        }
-        else { // y scale
-            $this->world_abs_size=$img->height - $img->top_margin - $img->bottom_margin; 
-            $this->off=$img->top_margin+$this->world_abs_size;                  
-            $this->scale_factor = 0;                    
-            if( $this->world_size > 0 )                 
-                $this->scale_factor=-$this->world_abs_size/($this->world_size*1.0);     
-        }
-        $size = $this->world_size * $this->scale_factor;
-        $this->scale_abs=array($this->off,$this->off + $size);  
-    }
-        
+        if( $this->type=='x' ) {
+            $this->world_abs_size=$img->width - $img->left_margin - $img->right_margin;
+            $this->off=$img->left_margin;
+            $this->scale_factor = 0;
+            if( $this->world_size > 0 ) {
+                $this->scale_factor=$this->world_abs_size/($this->world_size*0.999999);
+            }
+        }
+        else { // y scale
+            $this->world_abs_size=$img->height - $img->top_margin - $img->bottom_margin;
+            $this->off=$img->top_margin+$this->world_abs_size;
+            $this->scale_factor = 0;
+            if( $this->world_size > 0 ) {
+                $this->scale_factor=-$this->world_abs_size/($this->world_size*0.999999);
+            }
+        }
+        $size = $this->world_size * $this->scale_factor;
+        $this->scale_abs=array($this->off,$this->off + $size);
+    }
+
     // Initialize the conversion constants for this scale
     // This tries to pre-calculate as much as possible to speed up the
     // actual conversion (with Translate()) later on
-    // $start   =scale start in absolute pixels (for x-scale this is an y-position
-    //                           and for an y-scale this is an x-position
-    // $len             =absolute length in pixels of scale                     
+    // $start =scale start in absolute pixels (for x-scale this is an y-position
+    //     and for an y-scale this is an x-position
+    // $len   =absolute length in pixels of scale
     function SetConstants($aStart,$aLen) {
-        $this->world_abs_size=$aLen;
-        $this->off=$aStart;
-                
-        if( $this->world_size<=0 ) {
-            // This should never ever happen !!
-            JpGraphError::RaiseL(25074);
-//("You have unfortunately stumbled upon a bug in JpGraph. It seems like the scale range is ".$this->world_size." [for ".$this->type." scale] <br> Please report Bug #01 to jpgraph@aditus.nu and include the script that gave this error. This problem could potentially be caused by trying to use \"illegal\" values in the input data arrays (like trying to send in strings or only NULL values) which causes the autoscaling to fail.");
-
-        }
-                
-        // scale_factor = number of pixels per world unit
-        $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
-                
-        // scale_abs = start and end points of scale in absolute pixels
-        $this->scale_abs=array($this->off,$this->off+$this->world_size*$this->scale_factor);            
-    }
-        
-        
+        $this->world_abs_size=$aLen;
+        $this->off=$aStart;
+
+        if( $this->world_size<=0 ) {
+            // This should never ever happen !!
+            JpGraphError::RaiseL(25074);
+            //("You have unfortunately stumbled upon a bug in JpGraph. It seems like the scale range is ".$this->world_size." [for ".$this->type." scale] <br> Please report Bug #01 to info@jpgraph.net and include the script that gave this error. This problem could potentially be caused by trying to use \"illegal\" values in the input data arrays (like trying to send in strings or only NULL values) which causes the autoscaling to fail.");
+        }
+
+        // scale_factor = number of pixels per world unit
+        $this->scale_factor=$this->world_abs_size/($this->world_size*1.0);
+
+        // scale_abs = start and end points of scale in absolute pixels
+        $this->scale_abs=array($this->off,$this->off+$this->world_size*$this->scale_factor);
+    }
+
+
     // Calculate number of ticks steps with a specific division
     // $a is the divisor of 10**x to generate the first maj tick intervall
@@ -4684 +5056 @@
     // $a=2, $b=5 give major ticks with multiple of 5:s ...,0.5,5,50,...
     // We return a vector of
-    //  [$numsteps,$adjmin,$adjmax,$minstep,$majstep]
+    //  [$numsteps,$adjmin,$adjmax,$minstep,$majstep]
     // If $majend==true then the first and last marks on the axis will be major
     // labeled tick marks otherwise it will be adjusted to the closest min tick mark
     function CalcTicks($maxsteps,$min,$max,$a,$b,$majend=true) {
-        $diff=$max-$min; 
-        if( $diff==0 )
-            $ld=0;
-        else
-            $ld=floor(log10($diff));
-
-        // Gravitate min towards zero if we are close           
-        if( $min>0 && $min < pow(10,$ld) ) $min=0;
-                
-        //$majstep=pow(10,$ld-1)/$a; 
-        $majstep=pow(10,$ld)/$a; 
-        $minstep=$majstep/$b;
-        
-        $adjmax=ceil($max/$minstep)*$minstep;
-        $adjmin=floor($min/$minstep)*$minstep;  
-        $adjdiff = $adjmax-$adjmin;
-        $numsteps=$adjdiff/$majstep; 
-        
-        while( $numsteps>$maxsteps ) {
-            $majstep=pow(10,$ld)/$a; 
-            $numsteps=$adjdiff/$majstep;
-            ++$ld;
-        }
-
-        $minstep=$majstep/$b;
-        $adjmin=floor($min/$minstep)*$minstep;  
-        $adjdiff = $adjmax-$adjmin;             
-        if( $majend ) {
-            $adjmin = floor($min/$majstep)*$majstep;    
-            $adjdiff = $adjmax-$adjmin;         
-            $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
-        }
-        else
-            $adjmax=ceil($max/$minstep)*$minstep;
-
-        return array($numsteps,$adjmin,$adjmax,$minstep,$majstep);
+        $diff=$max-$min;
+        if( $diff==0 ) {
+            $ld=0;
+        }
+        else {
+            $ld=floor(log10($diff));
+        }
+
+        // Gravitate min towards zero if we are close
+        if( $min>0 && $min < pow(10,$ld) ) $min=0;
+
+        //$majstep=pow(10,$ld-1)/$a;
+        $majstep=pow(10,$ld)/$a;
+        $minstep=$majstep/$b;
+
+        $adjmax=ceil($max/$minstep)*$minstep;
+        $adjmin=floor($min/$minstep)*$minstep;
+        $adjdiff = $adjmax-$adjmin;
+        $numsteps=$adjdiff/$majstep;
+
+        while( $numsteps>$maxsteps ) {
+            $majstep=pow(10,$ld)/$a;
+            $numsteps=$adjdiff/$majstep;
+            ++$ld;
+        }
+
+        $minstep=$majstep/$b;
+        $adjmin=floor($min/$minstep)*$minstep;
+        $adjdiff = $adjmax-$adjmin;
+        if( $majend ) {
+            $adjmin = floor($min/$majstep)*$majstep;
+            $adjdiff = $adjmax-$adjmin;
+            $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
+        }
+        else {
+            $adjmax=ceil($max/$minstep)*$minstep;
+        }
+
+        return array($numsteps,$adjmin,$adjmax,$minstep,$majstep);
     }
 
     function CalcTicksFreeze($maxsteps,$min,$max,$a,$b) {
-        // Same as CalcTicks but don't adjust min/max values
-        $diff=$max-$min; 
-        if( $diff==0 )
-            $ld=0;
-        else
-            $ld=floor(log10($diff));
-
-        //$majstep=pow(10,$ld-1)/$a; 
-        $majstep=pow(10,$ld)/$a; 
-        $minstep=$majstep/$b;
-        $numsteps=floor($diff/$majstep); 
-        
-        while( $numsteps > $maxsteps ) {
-            $majstep=pow(10,$ld)/$a; 
-            $numsteps=floor($diff/$majstep);
-            ++$ld;
-        }
-        $minstep=$majstep/$b;
-        return array($numsteps,$minstep,$majstep);
-    }
-
-        
+        // Same as CalcTicks but don't adjust min/max values
+        $diff=$max-$min;
+        if( $diff==0 ) {
+            $ld=0;
+        }
+        else {
+            $ld=floor(log10($diff));
+        }
+
+        //$majstep=pow(10,$ld-1)/$a;
+        $majstep=pow(10,$ld)/$a;
+        $minstep=$majstep/$b;
+        $numsteps=floor($diff/$majstep);
+
+        while( $numsteps > $maxsteps ) {
+            $majstep=pow(10,$ld)/$a;
+            $numsteps=floor($diff/$majstep);
+            ++$ld;
+        }
+        $minstep=$majstep/$b;
+        return array($numsteps,$minstep,$majstep);
+    }
+
+
     function IntCalcTicks($maxsteps,$min,$max,$a,$majend=true) {
-        $diff=$max-$min; 
-        if( $diff==0 )
-            JpGraphError::RaiseL(25075);//('Can\'t automatically determine ticks since min==max.');
-        else
-            $ld=floor(log10($diff));
-                
-        // Gravitate min towards zero if we are close           
-        if( $min>0 && $min < pow(10,$ld) ) $min=0;
-                
-        if( $ld == 0 ) $ld=1;
-        
-        if( $a == 1 ) 
-            $majstep = 1;
-        else
-            $majstep=pow(10,$ld)/$a; 
-        $adjmax=ceil($max/$majstep)*$majstep;
-
-        $adjmin=floor($min/$majstep)*$majstep;  
-        $adjdiff = $adjmax-$adjmin;
-        $numsteps=$adjdiff/$majstep; 
-        while( $numsteps>$maxsteps ) {
-            $majstep=pow(10,$ld)/$a; 
-            $numsteps=$adjdiff/$majstep;
-            ++$ld;
-        }
-                
-        $adjmin=floor($min/$majstep)*$majstep;  
-        $adjdiff = $adjmax-$adjmin;             
-        if( $majend ) {
-            $adjmin = floor($min/$majstep)*$majstep;    
-            $adjdiff = $adjmax-$adjmin;         
-            $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
-        }
-        else
-            $adjmax=ceil($max/$majstep)*$majstep;
-                        
-        return array($numsteps,$adjmin,$adjmax,$majstep);               
+        $diff=$max-$min;
+        if( $diff==0 ) {
+            JpGraphError::RaiseL(25075);//('Can\'t automatically determine ticks since min==max.');
+        }
+        else {
+            $ld=floor(log10($diff));
+        }
+
+        // Gravitate min towards zero if we are close
+        if( $min>0 && $min < pow(10,$ld) ) {
+            $min=0;
+        }
+        if( $ld == 0 ) {
+            $ld=1;
+        }
+        if( $a == 1 ) {
+            $majstep = 1;
+        }
+        else {
+            $majstep=pow(10,$ld)/$a;
+        }
+        $adjmax=ceil($max/$majstep)*$majstep;
+
+        $adjmin=floor($min/$majstep)*$majstep;
+        $adjdiff = $adjmax-$adjmin;
+        $numsteps=$adjdiff/$majstep;
+        while( $numsteps>$maxsteps ) {
+            $majstep=pow(10,$ld)/$a;
+            $numsteps=$adjdiff/$majstep;
+            ++$ld;
+        }
+
+        $adjmin=floor($min/$majstep)*$majstep;
+        $adjdiff = $adjmax-$adjmin;
+        if( $majend ) {
+            $adjmin = floor($min/$majstep)*$majstep;
+            $adjdiff = $adjmax-$adjmin;
+            $adjmax = ceil($adjdiff/$majstep)*$majstep+$adjmin;
+        }
+        else {
+            $adjmax=ceil($max/$majstep)*$majstep;
+        }
+
+        return array($numsteps,$adjmin,$adjmax,$majstep);
     }
 
 
     function IntCalcTicksFreeze($maxsteps,$min,$max,$a) {
-        // Same as IntCalcTick but don't change min/max values
-        $diff=$max-$min; 
-        if( $diff==0 )
-            JpGraphError::RaiseL(25075);//('Can\'t automatically determine ticks since min==max.');
-        else
-            $ld=floor(log10($diff));
-                
-        if( $ld == 0 ) $ld=1;
-        
-        if( $a == 1 ) 
-            $majstep = 1;
-        else
-            $majstep=pow(10,$ld)/$a; 
-
-        $numsteps=floor($diff/$majstep); 
-        while( $numsteps > $maxsteps ) {
-            $majstep=pow(10,$ld)/$a; 
-            $numsteps=floor($diff/$majstep);
-            ++$ld;
-        }
-                                        
-        return array($numsteps,$majstep);               
-    }
-
-
-        
+        // Same as IntCalcTick but don't change min/max values
+        $diff=$max-$min;
+        if( $diff==0 ) {
+            JpGraphError::RaiseL(25075);//('Can\'t automatically determine ticks since min==max.');
+        }
+        else {
+            $ld=floor(log10($diff));
+        }
+        if( $ld == 0 ) {
+            $ld=1;
+        }
+        if( $a == 1 ) {
+            $majstep = 1;
+        }
+        else {
+            $majstep=pow(10,$ld)/$a;
+        }
+
+        $numsteps=floor($diff/$majstep);
+        while( $numsteps > $maxsteps ) {
+            $majstep=pow(10,$ld)/$a;
+            $numsteps=floor($diff/$majstep);
+            ++$ld;
+        }
+
+        return array($numsteps,$majstep);
+    }
+
     // Determine the minimum of three values witha  weight for last value
     function MatchMin3($a,$b,$c,$weight) {
-        if( $a < $b ) {
-            if( $a < ($c*$weight) ) 
-                return 1; // $a smallest
-            else 
-                return 3; // $c smallest
-        }
-        elseif( $b < ($c*$weight) ) 
-            return 2; // $b smallest
-        return 3; // $c smallest
+        if( $a < $b ) {
+            if( $a < ($c*$weight) ) {
+                return 1; // $a smallest
+            }
+            else {
+                return 3; // $c smallest
+            }
+        }
+        elseif( $b < ($c*$weight) ) {
+            return 2; // $b smallest
+        }
+        return 3; // $c smallest
+    }
+
+    function __get($name) {
+        $variable_name = '_' . $name; 
+
+        if (isset($this->$variable_name)) {
+            return $this->$variable_name * SUPERSAMPLING_SCALE;
+        } else {
+            JpGraphError::RaiseL('25132', $name);
+        } 
+    }
+
+    function __set($name, $value) {
+        $this->{'_'.$name} = $value;
     }
 } // Class
@@ -4839 +5242 @@
     public $margin=5;
     public $show=false;
-    public $valign="",$halign="center";
-    public $format="%.1f",$negformat="";
-    private $ff=FF_FONT1,$fs=FS_NORMAL,$fsize=10;
+    public $valign='',$halign='center';
+    public $format='%.1f',$negformat='';
+    private $ff=FF_DEFAULT,$fs=FS_NORMAL,$fsize=8;
     private $iFormCallback='';
     private $angle=0;
-    private $color="navy",$negcolor="";
+    private $color='navy',$negcolor='';
     private $iHideZero=false;
+    public $txt=null;
+
+    function __construct() {
+                $this->txt = new Text();
+    }
 
     function Show($aFlag=true) {
-        $this->show=$aFlag;
-    }
-
-    function SetColor($aColor,$aNegcolor="") {
-        $this->color = $aColor;
-        $this->negcolor = $aNegcolor;
-    }
-
-    function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=10) {
-        $this->ff=$aFontFamily;
-        $this->fs=$aFontStyle;
-        $this->fsize=$aFontSize;
+        $this->show=$aFlag;
+    }
+
+    function SetColor($aColor,$aNegcolor='') {
+        $this->color = $aColor;
+        $this->negcolor = $aNegcolor;
+    }
+
+    function SetFont($aFontFamily,$aFontStyle=FS_NORMAL,$aFontSize=8) {
+        $this->ff=$aFontFamily;
+        $this->fs=$aFontStyle;
+        $this->fsize=$aFontSize;
     }
 
     function ApplyFont($aImg) {
-        $aImg->SetFont($this->ff,$this->fs,$this->fsize);
+        $aImg->SetFont($this->ff,$this->fs,$this->fsize);
     }
 
     function SetMargin($aMargin) {
-        $this->margin = $aMargin;
+        $this->margin = $aMargin;
     }
 
     function SetAngle($aAngle) {
-        $this->angle = $aAngle;
+        $this->angle = $aAngle;
     }
 
     function SetAlign($aHAlign,$aVAlign='') {
-        $this->halign = $aHAlign;
-        $this->valign = $aVAlign;
-    }
-
-    function SetFormat($aFormat,$aNegFormat="") {
-        $this->format= $aFormat;
-        $this->negformat= $aNegFormat;
+        $this->halign = $aHAlign;
+        $this->valign = $aVAlign;
+    }
+
+    function SetFormat($aFormat,$aNegFormat='') {
+        $this->format= $aFormat;
+        $this->negformat= $aNegFormat;
     }
 
     function SetFormatCallback($aFunc) {
-        $this->iFormCallback = $aFunc;
+        $this->iFormCallback = $aFunc;
     }
 
     function HideZero($aFlag=true) {
-        $this->iHideZero=$aFlag;
+        $this->iHideZero=$aFlag;
     }
 
     function Stroke($img,$aVal,$x,$y) {
-        
-        if( $this->show ) 
-        {
-            if( $this->negformat=="" ) $this->negformat=$this->format;
-            if( $this->negcolor=="" ) $this->negcolor=$this->color;
-
-            if( $aVal===NULL || (is_string($aVal) && ($aVal=="" || $aVal=="-" || $aVal=="x" ) ) ) 
-                return;
-
-            if( is_numeric($aVal) && $aVal==0 && $this->iHideZero ) {
-                return;
-            }
-
-            // Since the value is used in different cirumstances we need to check what
-            // kind of formatting we shall use. For example, to display values in a line
-            // graph we simply display the formatted value, but in the case where the user
-            // has already specified a text string we don't fo anything.
-            if( $this->iFormCallback != '' ) {
-                $f = $this->iFormCallback;
-                $sval = call_user_func($f,$aVal);
-            }
-            elseif( is_numeric($aVal) ) {
-                if( $aVal >= 0 )
-                    $sval=sprintf($this->format,$aVal);
-                else
-                    $sval=sprintf($this->negformat,$aVal);
-            }
-            else
-                $sval=$aVal;
-
-            $y = $y-sign($aVal)*$this->margin;
-
-            $txt = new Text($sval,$x,$y);
-            $txt->SetFont($this->ff,$this->fs,$this->fsize);
-            if( $this->valign == "" ) {
-                if( $aVal >= 0 )
-                    $valign = "bottom";
-                else
-                    $valign = "top";
-            }
-            else
-                $valign = $this->valign;
-            $txt->Align($this->halign,$valign);
-
-            $txt->SetOrientation($this->angle);
-            if( $aVal > 0 )
-                $txt->SetColor($this->color);
-            else
-                $txt->SetColor($this->negcolor);
-            $txt->Stroke($img);
-        }
+
+        if( $this->show )
+        {
+            if( $this->negformat=='' ) {
+                $this->negformat=$this->format;
+            }
+            if( $this->negcolor=='' ) {
+                $this->negcolor=$this->color;
+            }
+
+            if( $aVal===NULL || (is_string($aVal) && ($aVal=='' || $aVal=='-' || $aVal=='x' ) ) ) {
+                return;
+            }
+
+            if( is_numeric($aVal) && $aVal==0 && $this->iHideZero ) {
+                return;
+            }
+
+            // Since the value is used in different cirumstances we need to check what
+            // kind of formatting we shall use. For example, to display values in a line
+            // graph we simply display the formatted value, but in the case where the user
+            // has already specified a text string we don't fo anything.
+            if( $this->iFormCallback != '' ) {
+                $f = $this->iFormCallback;
+                $sval = call_user_func($f,$aVal);
+            }
+            elseif( is_numeric($aVal) ) {
+                if( $aVal >= 0 ) {
+                    $sval=sprintf($this->format,$aVal);
+                }
+                else {
+                    $sval=sprintf($this->negformat,$aVal);
+                }
+            }
+            else {
+                $sval=$aVal;
+            }
+
+            $y = $y-sign($aVal)*$this->margin;
+
+            $this->txt->Set($sval);
+            $this->txt->SetPos($x,$y);
+            $this->txt->SetFont($this->ff,$this->fs,$this->fsize);
+            if( $this->valign == '' ) {
+                if( $aVal >= 0 ) {
+                    $valign = "bottom";
+                }
+                else {
+                    $valign = "top";
+                }
+            }
+            else {
+                $valign = $this->valign;
+            }
+            $this->txt->Align($this->halign,$valign);
+
+            $this->txt->SetOrientation($this->angle);
+            if( $aVal > 0 ) {
+                $this->txt->SetColor($this->color);
+            }
+            else {
+                $this->txt->SetColor($this->negcolor);
+            }
+            $this->txt->Stroke($img);
+        }
     }
 }
@@ -4956 +5378 @@
     public $legend='';
     public $coords=array();
-    public $color="black";
+    public $color='black';
     public $hidelegend=false;
     public $line_weight=1;
     public $csimtargets=array(),$csimwintargets=array(); // Array of targets for CSIM
-    public $csimareas="";                       // Resultant CSIM area tags     
-    public $csimalts=null;                      // ALT:s for corresponding target
+    public $csimareas='';   // Resultant CSIM area tags
+    public $csimalts=null;   // ALT:s for corresponding target
     public $legendcsimtarget='',$legendcsimwintarget='';
     public $legendcsimalt='';
-    protected $weight=1;        
+    protected $weight=1;
     protected $center=false;
-//---------------
-// CONSTRUCTOR
-    function Plot($aDatay,$aDatax=false) {
-        $this->numpoints = count($aDatay);
-        if( $this->numpoints==0 )
-            JpGraphError::RaiseL(25121);//("Empty input data array specified for plot. Must have at least one data point.");
-        $this->coords[0]=$aDatay;
-        if( is_array($aDatax) ) {
-            $this->coords[1]=$aDatax;
-            $n = count($aDatax);
-            for($i=0; $i < $n; ++$i ) {
-                if( !is_numeric($aDatax[$i]) ) {
-                    JpGraphError::RaiseL(25070);
-                }
-            }
-        }
-        $this->value = new DisplayValue();
-    }
-
-//---------------
-// PUBLIC METHODS       
+
+    protected $inputValues;
+    protected $isRunningClear = false;
+
+    function __construct($aDatay,$aDatax=false) {
+        $this->numpoints = count($aDatay);
+        if( $this->numpoints==0 ) {
+            JpGraphError::RaiseL(25121);//("Empty input data array specified for plot. Must have at least one data point.");
+        }
+
+        if (!$this->isRunningClear) {
+            $this->inputValues = array();
+            $this->inputValues['aDatay'] = $aDatay;
+            $this->inputValues['aDatax'] = $aDatax;
+        }
+
+        $this->coords[0]=$aDatay;
+        if( is_array($aDatax) ) {
+            $this->coords[1]=$aDatax;
+            $n = count($aDatax);
+            for( $i=0; $i < $n; ++$i ) {
+                if( !is_numeric($aDatax[$i]) ) {
+                    JpGraphError::RaiseL(25070);
+                }
+            }
+        }
+        $this->value = new DisplayValue();
+    }
 
     // Stroke the plot
@@ -4992 +5421 @@
     // the subclasses
     function Stroke($aImg,$aXScale,$aYScale) {
-        JpGraphError::RaiseL(25122);//("JpGraph: Stroke() must be implemented by concrete subclass to class Plot");
+        JpGraphError::RaiseL(25122);//("JpGraph: Stroke() must be implemented by concrete subclass to class Plot");
     }
 
     function HideLegend($f=true) {
-        $this->hidelegend = $f;
+        $this->hidelegend = $f;
     }
 
     function DoLegend($graph) {
-        if( !$this->hidelegend )
-            $this->Legend($graph);
+        if( !$this->hidelegend )
+        $this->Legend($graph);
     }
 
     function StrokeDataValue($img,$aVal,$x,$y) {
-        $this->value->Stroke($img,$aVal,$x,$y);
-    }
-        
-    // Set href targets for CSIM        
+        $this->value->Stroke($img,$aVal,$x,$y);
+    }
+
+    // Set href targets for CSIM
     function SetCSIMTargets($aTargets,$aAlts='',$aWinTargets='') {
-        $this->csimtargets=$aTargets;
-        $this->csimwintargets=$aWinTargets;
-        $this->csimalts=$aAlts;         
-    }
-        
+        $this->csimtargets=$aTargets;
+        $this->csimwintargets=$aWinTargets;
+        $this->csimalts=$aAlts;
+    }
+
     // Get all created areas
     function GetCSIMareas() {
-        return $this->csimareas;
-    }   
-        
+        return $this->csimareas;
+    }
+
     // "Virtual" function which gets called before any scale
     // or axis are stroked used to do any plot specific adjustment
     function PreStrokeAdjust($aGraph) {
-        if( substr($aGraph->axtype,0,4) == "text" && (isset($this->coords[1])) )
-            JpGraphError::RaiseL(25123);//("JpGraph: You can't use a text X-scale with specified X-coords. Use a \"int\" or \"lin\" scale instead.");
-        return true;    
-    }
-        
+        if( substr($aGraph->axtype,0,4) == "text" && (isset($this->coords[1])) ) {
+            JpGraphError::RaiseL(25123);//("JpGraph: You can't use a text X-scale with specified X-coords. Use a \"int\" or \"lin\" scale instead.");
+        }
+        return true;
+    }
+
+    // Virtual function to the the concrete plot class to make any changes to the graph
+    // and scale before the stroke process begins
+    function PreScaleSetup($aGraph) {
+        // Empty
+    }
+
     // Get minimum values in plot
     function Min() {
-        if( isset($this->coords[1]) )
-            $x=$this->coords[1];
-        else
-            $x="";
-        if( $x != "" && count($x) > 0 ) {
-            $xm=min($x);
-        }
-        else 
-            $xm=0;
-        $y=$this->coords[0];
-        $cnt = count($y);
-        if( $cnt > 0 ) {
-            /*
-            if( ! isset($y[0]) ) {
-                JpGraphError('The input data array must have consecutive values from position 0 and forward. The given y-array starts with empty values (NULL)');
-            }
-            $ym = $y[0];
-            */
-            $i=0;
-            while( $i<$cnt && !is_numeric($ym=$y[$i]) )
-                $i++;
-            while( $i < $cnt) {
-                if( is_numeric($y[$i]) ) 
-                    $ym=min($ym,$y[$i]);
-                ++$i;
-            }                   
-        }
-        else 
-            $ym="";
-        return array($xm,$ym);
-    }
-        
+        if( isset($this->coords[1]) ) {
+            $x=$this->coords[1];
+        }
+        else {
+            $x='';
+        }
+        if( $x != '' && count($x) > 0 ) {
+            $xm=min($x);
+        }
+        else {
+            $xm=0;
+        }
+        $y=$this->coords[0];
+        $cnt = count($y);
+        if( $cnt > 0 ) {
+            $i=0;
+            while( $i<$cnt && !is_numeric($ym=$y[$i]) ) {
+                $i++;
+            }
+            while( $i < $cnt) {
+                if( is_numeric($y[$i]) ) {
+                    $ym=min($ym,$y[$i]);
+                }
+                ++$i;
+            }
+        }
+        else {
+            $ym='';
+        }
+        return array($xm,$ym);
+    }
+
     // Get maximum value in plot
     function Max() {
-        if( isset($this->coords[1]) )
-            $x=$this->coords[1];
-        else
-            $x="";
-
-        if( $x!="" && count($x) > 0 )
-            $xm=max($x);
-        else {
-            $xm = $this->numpoints-1;
-        }
-        $y=$this->coords[0];
-        if( count($y) > 0 ) {
-            /*
-            if( !isset($y[0]) ) {
-                JpGraphError::Raise('The input data array must have consecutive values from position 0 and forward. The given y-array starts with empty values (NULL)');
-//              $y[0] = 0;
-// Change in 1.5.1 Don't treat this as an error any more. Just silently convert to 0
-// Change in 1.17 Treat his as an error again !! This is the right way to do !!
-            }
-            */
-            $cnt = count($y);
-            $i=0;
-            while( $i<$cnt && !is_numeric($ym=$y[$i]) )
-                $i++;                           
-            while( $i < $cnt ) {
-                if( is_numeric($y[$i]) ) 
-                    $ym=max($ym,$y[$i]);
-                ++$i;
-            }
-        }
-        else 
-            $ym="";
-        return array($xm,$ym);
-    }
-        
+        if( isset($this->coords[1]) ) {
+            $x=$this->coords[1];
+        }
+        else {
+            $x='';
+        }
+
+        if( $x!='' && count($x) > 0 ) {
+            $xm=max($x);
+        }
+        else {
+            $xm = $this->numpoints-1;
+        }
+        $y=$this->coords[0];
+        if( count($y) > 0 ) {
+            $cnt = count($y);
+            $i=0;
+            while( $i<$cnt && !is_numeric($ym=$y[$i]) ) {
+                $i++;
+            }
+            while( $i < $cnt ) {
+                if( is_numeric($y[$i]) ) {
+                    $ym=max($ym,$y[$i]);
+                }
+                ++$i;
+            }
+        }
+        else {
+            $ym='';
+        }
+        return array($xm,$ym);
+    }
+
     function SetColor($aColor) {
-        $this->color=$aColor;
-    }
-        
+        $this->color=$aColor;
+    }
+
     function SetLegend($aLegend,$aCSIM='',$aCSIMAlt='',$aCSIMWinTarget='') {
-        $this->legend = $aLegend;
-        $this->legendcsimtarget = $aCSIM;
-        $this->legendcsimwintarget = $aCSIMWinTarget;
-        $this->legendcsimalt = $aCSIMAlt;
+        $this->legend = $aLegend;
+        $this->legendcsimtarget = $aCSIM;
+        $this->legendcsimwintarget = $aCSIMWinTarget;
+        $this->legendcsimalt = $aCSIMAlt;
     }
 
     function SetWeight($aWeight) {
-        $this->weight=$aWeight;
-    }
-                
+        $this->weight=$aWeight;
+    }
+
     function SetLineWeight($aWeight=1) {
-        $this->line_weight=$aWeight;
-    }
-        
+        $this->line_weight=$aWeight;
+    }
+
     function SetCenter($aCenter=true) {
-        $this->center = $aCenter;
-    }
-        
+        $this->center = $aCenter;
+    }
+
     // This method gets called by Graph class to plot anything that should go
     // into the margin after the margin color has been set.
     function StrokeMargin($aImg) {
-        return true;
+        return true;
     }
 
     // Framework function the chance for each plot class to set a legend
     function Legend($aGraph) {
-        if( $this->legend != "" )
-            $aGraph->legend->Add($this->legend,$this->color,"",0,$this->legendcsimtarget,
-                                 $this->legendcsimalt,$this->legendcsimwintarget);    
-    }
-        
+        if( $this->legend != '' ) {
+            $aGraph->legend->Add($this->legend,$this->color,'',0,$this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);
+        }
+    }
+
+    function Clear() {
+        $this->isRunningClear = true;
+        $this->__construct($this->inputValues['aDatay'], $this->inputValues['aDatax']);
+        $this->isRunningClear = false;
+    }
+
 } // Class
 
 
-//===================================================
-// CLASS PlotLine
-// Description: 
-// Data container class to hold properties for a static
-// line that is drawn directly in the plot area.
-// Usefull to add static borders inside a plot to show
-// for example set-values
-//===================================================
-class PlotLine {
-    public $scaleposition, $direction=-1; 
-    protected $weight=1;
-    protected $color="black";
-    private $legend='',$hidelegend=false, $legendcsimtarget='', $legendcsimalt='',$legendcsimwintarget='';
-    private $iLineStyle='solid';
-
-//---------------
-// CONSTRUCTOR
-    function PlotLine($aDir=HORIZONTAL,$aPos=0,$aColor="black",$aWeight=1) {
-        $this->direction = $aDir;
-        $this->color=$aColor;
-        $this->weight=$aWeight;
-        $this->scaleposition=$aPos;
-    }
-        
-//---------------
-// PUBLIC METHODS       
-
-    function SetLegend($aLegend,$aCSIM='',$aCSIMAlt='',$aCSIMWinTarget='') {
-        $this->legend = $aLegend;
-        $this->legendcsimtarget = $aCSIM;
-        $this->legendcsimwintarget = $aCSIMWinTarget;
-        $this->legendcsimalt = $aCSIMAlt;
-    }
-
-    function HideLegend($f=true) {
-        $this->hidelegend = $f;
-    }
-
-    function SetPosition($aScalePosition) {
-        $this->scaleposition=$aScalePosition;
-    }
-        
-    function SetDirection($aDir) {
-        $this->direction = $aDir;
-    }
-        
-    function SetColor($aColor) {
-        $this->color=$aColor;
-    }
-        
-    function SetWeight($aWeight) {
-        $this->weight=$aWeight;
-    }
-
-    function SetLineStyle($aStyle) {
-        $this->iLineStyle = $aStyle;
-    }
-
-//---------------
-// PRIVATE METHODS
-
-    function DoLegend(&$graph) {
-        if( !$this->hidelegend )
-            $this->Legend($graph);
-    }
-
-    // Framework function the chance for each plot class to set a legend
-    function Legend(&$aGraph) {
-        if( $this->legend != "" ) {
-            $dummyPlotMark = new PlotMark();
-            $lineStyle = 1;
-            $aGraph->legend->Add($this->legend,$this->color,$dummyPlotMark,$lineStyle,
-                                 $this->legendcsimtarget,$this->legendcsimalt,$this->legendcsimwintarget);    
-        }
-    }
-
-    function PreStrokeAdjust($aGraph) {
-        // Nothing to do
-    }
-        
-    function Stroke($aImg,$aXScale,$aYScale) {
-        $aImg->SetColor($this->color);
-        $aImg->SetLineWeight($this->weight);    
-        $oldStyle = $aImg->SetLineStyle($this->iLineStyle);
-        if( $this->direction == VERTICAL ) {
-            $ymin_abs=$aYScale->Translate($aYScale->GetMinVal());
-            $ymax_abs=$aYScale->Translate($aYScale->GetMaxVal());
-            $xpos_abs=$aXScale->Translate($this->scaleposition);
-            $aImg->StyleLine($xpos_abs, $ymin_abs, $xpos_abs, $ymax_abs);
-        }
-        elseif( $this->direction == HORIZONTAL ) {
-            $xmin_abs=$aXScale->Translate($aXScale->GetMinVal());
-            $xmax_abs=$aXScale->Translate($aXScale->GetMaxVal());
-            $ypos_abs=$aYScale->Translate($this->scaleposition);
-            $aImg->StyleLine($xmin_abs, $ypos_abs, $xmax_abs, $ypos_abs);
-        }
-        else {
-            JpGraphError::RaiseL(25125);//(" Illegal direction for static line");
-        }
-        $aImg->SetLineStyle($oldStyle);
-    }
+// Provide a deterministic list of new colors whenever the getColor() method
+// is called. Used to automatically set colors of plots.
+class ColorFactory {
+
+    static private $iIdx = 0;
+    static private $iColorList = array(
+        'black',
+        'blue',
+        'orange',
+        'darkgreen',
+        'red',
+        'AntiqueWhite3',
+        'aquamarine3',
+        'azure4',
+        'brown',
+        'cadetblue3',
+        'chartreuse4',
+        'chocolate',
+        'darkblue',
+        'darkgoldenrod3',
+        'darkorchid3',
+        'darksalmon',
+        'darkseagreen4',
+        'deepskyblue2',
+        'dodgerblue4',
+        'gold3',
+        'hotpink',
+        'lawngreen',
+        'lightcoral',
+        'lightpink3',
+        'lightseagreen',
+        'lightslateblue',
+        'mediumpurple',
+        'olivedrab',
+        'orangered1',
+        'peru',
+        'slategray',
+        'yellow4',
+        'springgreen2');
+    static private $iNum = 33;
+
+    static function getColor() {
+        if( ColorFactory::$iIdx >= ColorFactory::$iNum )
+            ColorFactory::$iIdx = 0;
+        return ColorFactory::$iColorList[ColorFactory::$iIdx++];
+    }
+
 }