Upgrade to JpGraph v4.1.0

README.md

@@ -1,5 +1,6 @@
 JpGraph from http://jpgraph.net/
 ======
-This is a port for Composer users to use JpGraph as a Vendor library
 
-use JpGraph\JpGraph::load(); and JpGraph\JpGraph::module('moduleName'); to load required modules
+This is a port for Composer users to use JpGraph as a Vendor library.
+
+Use `JpGraph\JpGraph::load();` and `JpGraph\JpGraph::module('moduleName');` to load required modules.

lib/JpGraph.php

@@ -1,20 +1,20 @@
 <?php
-namespace JpGraph ;
+namespace JpGraph;
 class JpGraph {
-    static  $loaded = false ;
+    static  $loaded = false;
     static  $modules = array();
     static function load(){
         if(self::$loaded !== true){
-            include_once __DIR__.'/JpGraph/src/jpgraph.php';
-            self::$loaded = true ;
+            include_once __DIR__.'/jpgraph/src/jpgraph.php';
+            self::$loaded = true;
         }
     }
     static function module($moduleName){
         self::load();
         if(!in_array($moduleName,self::$modules)){
-            $path = __DIR__.'/JpGraph/src/jpgraph_'.$moduleName.'.php' ;
+            $path = __DIR__.'/jpgraph/src/jpgraph_'.$moduleName.'.php';
             if(file_exists($path)){
-                include_once $path ;
+                include_once $path;
             }else{
                 throw new \InvalidArgumentException('The JpGraphs\'s module "'.$moduleName.'" does not exist');
             }

lib/jpgraph/VERSION

@@ -1 +1 @@
-Version: v4.0.2
+Version: v4.1.0

lib/jpgraph/docs/classref/BoxPlot.html

@@ -17,8 +17,8 @@
 &nbsp;<a href="StockPlot.html#_STOCKPLOT_SETCOLOR">SetColor()</a>&nbsp;<br>
 &nbsp;<a href="StockPlot.html#_STOCKPLOT_SETWIDTH">SetWidth()</a>&nbsp;<br>
 &nbsp;<a href="StockPlot.html#_STOCKPLOT___CONSTRUCT" style="color:darkgrey;">__construct()&nbsp;</a><br>
-</td></tr></table>&nbsp;<p><div style="font-weight:bold;font-family:arial;font-size:100%;">Class usage and Overview</div>Create a box plot. This is the same as a stock plot but with the added feature of a median line. For each X-value 5 Y values must be specified:
-(open,close,min,max,median)
+</td></tr></table>&nbsp;<p><div style="font-weight:bold;font-family:arial;font-size:100%;">Class usage and Overview</div>Create a box plot. This is the same as a stock plot but with the added feature of a median line. For each X-value 5 Y values must be specified:
+(open,close,min,max,median)
  <p> &nbsp;
 <div style="font-weight:bold;font-family:arial;font-size:85%;">See also related classes:</div><a href="StockPlot.html">StockPlot</a> <p> &nbsp;<hr><span style="font-family:arial;font-size:120%;font-weight:bold;">Class Methods</span><hr><p>
 <p> &nbsp; <div style='font-family: helvetica, arial, geneva, sans-serif;margin-bottom:4px;border-left:solid black 1px;border-top:solid black 1px;border-bottom:solid black 2px;border-right:solid black 2px;font-size:120%;background:#dde9af;padding:4px;'><a class="no" name="_BOXPLOT_SETMEDIANCOLOR"><span style="color:#555555;">BoxPlot ::</span><br><b>SetMedianColor</b>($aPos, $aNeg)</a></div>
@@ -69,8 +69,8 @@
 </td><td>If specified, X-positions</td></tr>
 </table>
 
-<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Create a new Box plot. Each data point in a box plotconsists of 5 values; (open,close,min,max,median)
-
+<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Create a new Box plot. Each data point in a box plotconsists of 5 values; (open,close,min,max,median)
+
 &nbsp;<br>
  &nbsp; <div style="font-weight:bold;font-family:arial;font-size:90%;">See also:</div><ul><li><a href="StockPlot.html#_STOCKPLOT___CONSTRUCT">StockPlot::__construct()</a></ul>
 <div style="font-weight:bold;font-family:arial;font-size:90%;"><p>Example:</div><div style="padding:5px;border:dashed gray 1px;background-color:#f3f3f3;font-family:courier new;font-size:90%;font-weight:bold;"><b><span style="color: #000000">

lib/jpgraph/docs/classref/DateScale.html

@@ -60,29 +60,29 @@
 </td><td>End alignment</td></tr>
 </table>
 
-<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Specify start and end date alignment for the scale
-Possible values are
-<ol>
-<li> Alignment on a day basis
-<ul>
-<li> DAYADJ_1, Align on the start of a day
-<li> DAYADJ_7, Align on the start of a week
-<li> DAYADJ_WEEK, Synonym to DAYADJ_7
-</ul>
-
-<li> Alignment on a monthly basis
-<ul>
-<li> MONTHADJ_1, Align on a month start
-<li> MONTHADJ_6, Align on the start of halfyear
-</ul>
-
-<li> Alignment on a yearly basis
-<ul>
-<li> YEARADJ_1, Align on a year
-<li> YEARADJ_2, Align on a bi-yearly basis
-<li> YEARADJ_5, Align on a 5 year basis
-</ul>
-</ol>
+<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Specify start and end date alignment for the scale
+Possible values are
+<ol>
+<li> Alignment on a day basis
+<ul>
+<li> DAYADJ_1, Align on the start of a day
+<li> DAYADJ_7, Align on the start of a week
+<li> DAYADJ_WEEK, Synonym to DAYADJ_7
+</ul>
+
+<li> Alignment on a monthly basis
+<ul>
+<li> MONTHADJ_1, Align on a month start
+<li> MONTHADJ_6, Align on the start of halfyear
+</ul>
+
+<li> Alignment on a yearly basis
+<ul>
+<li> YEARADJ_1, Align on a year
+<li> YEARADJ_2, Align on a bi-yearly basis
+<li> YEARADJ_5, Align on a 5 year basis
+</ul>
+</ol>
 &nbsp;<br>
  &nbsp; <div style="font-weight:bold;font-family:arial;font-size:90%;">See also:</div><ul><li><a href="DateScale.html#_DATESCALE_SETTIMEALIGN">DateScale::SetTimeAlign()</a></ul>
 <div style="font-weight:bold;font-family:arial;font-size:90%;"><p>Example:</div><div style="padding:5px;border:dashed gray 1px;background-color:#f3f3f3;font-family:courier new;font-size:90%;font-weight:bold;"><b><span style="color: #000000">
@@ -126,37 +126,37 @@
 </td><td>End time alignment</td></tr>
 </table>
 
-<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Specify the start and end alignment with the time granularity. For date granularity see SetDateAlign(). Note that only one of SetDateAlign() and SetTimeAlign() can be used.
-
-For start and end alignment the following values are valid
-
-<ol>
-<li> Alignment on seconds
-<ul>
-<li> MINADJ_1, Align on a single second (This is the lowest resolution)
-<li> MINADJ_5, Align on the nearest 5 seconds
-<li> MINADJ_10, Align on the nearest 10 seconds
-<li> MINADJ_15, Align on the nearest 15 seconds
-<li> MINADJ_30, Align on the nearest 30 seconds
-</ul>
-<li> Alignment on minutes
-<ul>
-<li> MINADJ_1, Align to the nearest minute
-<li> MINADJ_5, Align on the nearest 5 minutes
-<li> MINADJ_10, Align on the nearest 10 minutes
-<li> MINADJ_15, Align on the nearest 15 minutes
-<li> MINADJ_30, Align on the nearest 30 minutes
-</ul>
-<li> Alignment on hours
-<ul>
-<li> HOURADJ_1, Align to the nearest hour
-<li> HOURADJ_2, Align to the nearest two hour
-<li> HOURADJ_3, Align to the nearest three hour
-<li> HOURADJ_4, Align to the nearest four hour
-<li> HOURADJ_6, Align to the nearest six hour
-<li> HOURADJ_12, Align to the nearest tolw hour
-</ul>
-</ol>
+<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Specify the start and end alignment with the time granularity. For date granularity see SetDateAlign(). Note that only one of SetDateAlign() and SetTimeAlign() can be used.
+
+For start and end alignment the following values are valid
+
+<ol>
+<li> Alignment on seconds
+<ul>
+<li> MINADJ_1, Align on a single second (This is the lowest resolution)
+<li> MINADJ_5, Align on the nearest 5 seconds
+<li> MINADJ_10, Align on the nearest 10 seconds
+<li> MINADJ_15, Align on the nearest 15 seconds
+<li> MINADJ_30, Align on the nearest 30 seconds
+</ul>
+<li> Alignment on minutes
+<ul>
+<li> MINADJ_1, Align to the nearest minute
+<li> MINADJ_5, Align on the nearest 5 minutes
+<li> MINADJ_10, Align on the nearest 10 minutes
+<li> MINADJ_15, Align on the nearest 15 minutes
+<li> MINADJ_30, Align on the nearest 30 minutes
+</ul>
+<li> Alignment on hours
+<ul>
+<li> HOURADJ_1, Align to the nearest hour
+<li> HOURADJ_2, Align to the nearest two hour
+<li> HOURADJ_3, Align to the nearest three hour
+<li> HOURADJ_4, Align to the nearest four hour
+<li> HOURADJ_6, Align to the nearest six hour
+<li> HOURADJ_12, Align to the nearest tolw hour
+</ul>
+</ol>
 &nbsp;<br>
  &nbsp; <div style="font-weight:bold;font-family:arial;font-size:90%;">See also:</div><ul><li><a href="DateScale.html#_DATESCALE_SETDATEALIGN">DateScale::SetDateAlign()</a></ul>
 <div style="font-weight:bold;font-family:arial;font-size:90%;"><p>Example:</div><div style="padding:5px;border:dashed gray 1px;background-color:#f3f3f3;font-family:courier new;font-size:90%;font-weight:bold;"><b><span style="color: #000000">

lib/jpgraph/docs/classref/ErrorLinePlot.html

@@ -13,8 +13,8 @@
 		</style></HEAD><hr><div style="padding-left:4px;border-left:solid black 1px;border-top:solid black 1px;border-bottom:solid black 2px;border-right:solid black 2px;background-color:#deaa87;font-family:courier new;font-size:16pt;">Class <a class="no" name="_C_ERRORLINEPLOT"><b>ErrorLinePlot</b></a> Extends <a style="font-size:14pt;text-decoration:underline;"href="ErrorPlot.html#_C_ERRORPLOT " style="font-face:arial;font-weight:bold;">ErrorPlot </a></div>
 <i>(Defined in: jpgraph_error.php : 87)</i><br>&nbsp;<br><table cellspaceing=0 cellpadding=4 style="border:solid #303030 1px;"><tr><td align="center" style="background:lightgray;" >&nbsp;<a href="ErrorLinePlot.html" style="font-family:arial;font-weight:bold;color:darkblue;">ErrorLinePlot</a>&nbsp;</td><td align="center" style="background:lightgray;" >&nbsp;<a href="ErrorPlot.html" style="font-family:arial;font-weight:bold;color:darkblue;">ErrorPlot</a>&nbsp;</td></tr><tr><td valign=top>&nbsp;<a href="ErrorLinePlot.html#_ERRORLINEPLOT___CONSTRUCT">__construct()</a>&nbsp;<br>
 </td><td valign=top>&nbsp;<a href="ErrorPlot.html#_ERRORPLOT___CONSTRUCT" style="color:darkgrey;">__construct()&nbsp;</a><br>
-</td></tr></table>&nbsp;<p><div style="font-weight:bold;font-family:arial;font-size:100%;">Class usage and Overview</div>The error line plot is much the same as the error plot with the addition of a line between the average value of each error plot pair. The properties of the line may be accessed through the ?line? property of the ErrLinePlot, so for example to draw a red line you issue the statement
-
+</td></tr></table>&nbsp;<p><div style="font-weight:bold;font-family:arial;font-size:100%;">Class usage and Overview</div>The error line plot is much the same as the error plot with the addition of a line between the average value of each error plot pair. The properties of the line may be accessed through the ?line? property of the ErrLinePlot, so for example to draw a red line you issue the statement
+
 $errlineplot->line->SetColor(?red?); <p> &nbsp;
 <div style="font-weight:bold;font-family:arial;font-size:85%;">See also related classes:</div><a href="LinePlot.html">LinePlot</a> and <a href="ErrorPlot.html">ErrorPlot</a> <p> &nbsp;<hr><span style="font-family:arial;font-size:120%;font-weight:bold;">Class Methods</span><hr><p>
 <p> &nbsp; <div style='font-family: helvetica, arial, geneva, sans-serif;margin-bottom:4px;border-left:solid black 1px;border-top:solid black 1px;border-bottom:solid black 2px;border-right:solid black 2px;font-size:120%;background:#dde9af;padding:4px;'><a class="no" name="_ERRORLINEPLOT___CONSTRUCT"><span style="color:#555555;">ErrorLinePlot ::</span><br><b>__construct</b>($datay, $datax)</a></div>

lib/jpgraph/docs/classref/Footer.html

@@ -13,11 +13,11 @@
 		</style></HEAD><hr><div style="padding-left:4px;border-left:solid black 1px;border-top:solid black 1px;border-bottom:solid black 2px;border-right:solid black 2px;background-color:#deaa87;font-family:courier new;font-size:16pt;">Class <a class="no" name="_C_FOOTER"><b>Footer</b></a></div>
 <i>(Defined in: jpgraph.php : 442)</i><br>&nbsp;<br><table cellspaceing=0 cellpadding=4 style="border:solid #303030 1px;"><tr><td align="center" style="background:lightgray;" >&nbsp;<a href="Footer.html" style="font-family:arial;font-weight:bold;color:darkblue;">Footer</a>&nbsp;</td></tr><tr><td valign=top>&nbsp;<a href="Footer.html#_FOOTER_SETMARGIN">SetMargin()</a>&nbsp;<br>
 &nbsp;<a href="Footer.html#_FOOTER_SETTIMER">SetTimer()</a>&nbsp;<br>
-</td></tr></table>&nbsp;<p><div style="font-weight:bold;font-family:arial;font-size:100%;">Class usage and Overview</div>Represents the footer in all graphs. The footer consists of three fields accessed by properties "left", "center" and "right" representing. This lets you have footer text to the left, center and to the right.
-<p>
-For example
-<p>
-$graph->footer->left->Set("(C) 2002");
+</td></tr></table>&nbsp;<p><div style="font-weight:bold;font-family:arial;font-size:100%;">Class usage and Overview</div>Represents the footer in all graphs. The footer consists of three fields accessed by properties "left", "center" and "right" representing. This lets you have footer text to the left, center and to the right.
+<p>
+For example
+<p>
+$graph->footer->left->Set("(C) 2002");
  <p> &nbsp;
 <hr><span style="font-family:arial;font-size:120%;font-weight:bold;">Class Methods</span><hr><p>
 <p> &nbsp; <div style='font-family: helvetica, arial, geneva, sans-serif;margin-bottom:4px;border-left:solid black 1px;border-top:solid black 1px;border-bottom:solid black 2px;border-right:solid black 2px;font-size:120%;background:#dde9af;padding:4px;'><a class="no" name="_FOOTER_SETMARGIN"><span style="color:#555555;">Footer ::</span><br><b>SetMargin</b>($aLeft, $aRight, $aBottom)</a></div>

lib/jpgraph/docs/classref/LineErrorPlot.html

@@ -13,8 +13,8 @@
 		</style></HEAD><hr><div style="padding-left:4px;border-left:solid black 1px;border-top:solid black 1px;border-bottom:solid black 2px;border-right:solid black 2px;background-color:#deaa87;font-family:courier new;font-size:16pt;">Class <a class="no" name="_C_LINEERRORPLOT"><b>LineErrorPlot</b></a> Extends <a style="font-size:14pt;text-decoration:underline;"href="ErrorPlot.html#_C_ERRORPLOT " style="font-face:arial;font-weight:bold;">ErrorPlot </a></div>
 <i>(Defined in: jpgraph_error.php : 120)</i><br>&nbsp;<br><table cellspaceing=0 cellpadding=4 style="border:solid #303030 1px;"><tr><td align="center" style="background:lightgray;" >&nbsp;<a href="LineErrorPlot.html" style="font-family:arial;font-weight:bold;color:darkblue;">LineErrorPlot</a>&nbsp;</td><td align="center" style="background:lightgray;" >&nbsp;<a href="ErrorPlot.html" style="font-family:arial;font-weight:bold;color:darkblue;">ErrorPlot</a>&nbsp;</td></tr><tr><td valign=top>&nbsp;<a href="LineErrorPlot.html#_LINEERRORPLOT___CONSTRUCT">__construct()</a>&nbsp;<br>
 </td><td valign=top>&nbsp;<a href="ErrorPlot.html#_ERRORPLOT___CONSTRUCT" style="color:darkgrey;">__construct()&nbsp;</a><br>
-</td></tr></table>&nbsp;<p><div style="font-weight:bold;font-family:arial;font-size:100%;">Class usage and Overview</div>A line error plot is in principle a line plot but with the added feature that each point also have a two error values. Low and high error.
-
+</td></tr></table>&nbsp;<p><div style="font-weight:bold;font-family:arial;font-size:100%;">Class usage and Overview</div>A line error plot is in principle a line plot but with the added feature that each point also have a two error values. Low and high error.
+
 This means that data array must be an even number of three values. <p> &nbsp;
 <div style="font-weight:bold;font-family:arial;font-size:85%;">See also related classes:</div><a href="LinePlot.html">LinePlot</a> <p> &nbsp;<hr><span style="font-family:arial;font-size:120%;font-weight:bold;">Class Methods</span><hr><p>
 <p> &nbsp; <div style='font-family: helvetica, arial, geneva, sans-serif;margin-bottom:4px;border-left:solid black 1px;border-top:solid black 1px;border-bottom:solid black 2px;border-right:solid black 2px;font-size:120%;background:#dde9af;padding:4px;'><a class="no" name="_LINEERRORPLOT___CONSTRUCT"><span style="color:#555555;">LineErrorPlot ::</span><br><b>__construct</b>($datay, $datax)</a></div>

lib/jpgraph/docs/classref/LineProperty.html

@@ -51,9 +51,9 @@
 </td><td style='border-right:black solid 1pt;font-family:courier;font-size:100%;font-weight:bold;'>&nbsp;</td><td>Line style</td></tr>
 </table>
 
-<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Linestyle for lines. Valid linestyles are:<br>
-'solid', 'dotted', 'dashed'
-<p>
+<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Linestyle for lines. Valid linestyles are:<br>
+'solid', 'dotted', 'dashed'
+<p>
 The default line style is 'solid'&nbsp;<br>
  &nbsp; <div style="font-weight:bold;font-family:arial;font-size:90%;">See also:</div><ul><li><a href="Image.html#_IMAGE_SETLINESTYLE">Image::SetLineStyle()</a></ul>
 <div style="font-weight:bold;font-family:arial;font-size:90%;"><p>Example:</div><div style="padding:5px;border:dashed gray 1px;background-color:#f3f3f3;font-family:courier new;font-size:90%;font-weight:bold;"><b><span style="color: #000000">

lib/jpgraph/docs/classref/LogTicks.html

@@ -38,15 +38,15 @@
 </td><td style='border-right:black solid 1pt;font-family:courier;font-size:100%;font-weight:bold;'>&nbsp;</td><td>Magnitude (10^x) or plain</td></tr>
 </table>
 
-<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Specify how labels for log scales should be formatted as magnitude (scientific) or plain.
-<p>
-$aType can be either
-<ul>
-<li> LOGLABELS_PLAIN, will show labels as for example 10000
-<li> LOGLABELS_MAGNITUDE, will show labels as 10^4
-</ul>
-
-By default log scale uses magnitude type of labels.
+<div style="font-weight:bold;font-family:arial;font-size:90%;">Description:</div>Specify how labels for log scales should be formatted as magnitude (scientific) or plain.
+<p>
+$aType can be either
+<ul>
+<li> LOGLABELS_PLAIN, will show labels as for example 10000
+<li> LOGLABELS_MAGNITUDE, will show labels as 10^4
+</ul>
+
+By default log scale uses magnitude type of labels.
 &nbsp;<br>
 
 <div style="font-weight:bold;font-family:arial;font-size:90%;"><p>Example:</div><div style="padding:5px;border:dashed gray 1px;background-color:#f3f3f3;font-family:courier new;font-size:90%;font-weight:bold;"><b><span style="color: #000000">

lib/jpgraph/docs/classref/projinfo.html

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><HTML><HEAD><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" ></HEAD><table width=100% border=1 style="background-color:#676c53;color:white;"><tr><td align=center><span style="font-size:20pt;font-family:arial;font-weight:bold;">JpGraph</span></td></tr></table>
 <div align=center><h3 style="color:darkred;font-family:arial;">Documentation status: 73%</h3><span style="font-family:arial;">Total number of Classes: 135, Methods: 1362</span><p>
 <i>This version does <b>not</b> include private methods & classes</i><p><p><i>Generated at 20 Jul 2009  at  16:57</i><br>
-</div><hr><p><div align=center>
+</div><hr><p><div align=center>
 <b>&copy; 2000 - 2009 Aditus Consulting. All rights reserved.</b> </div></html>

lib/jpgraph/src/Examples/accbarex1.php

@@ -7,7 +7,8 @@
 $data2y=array(18,2,1,7,5,4);
 
 // Create the graph. These two calls are always required
-$graph = new Graph(500,400); 
+$graph = new Graph(500,400);
+$graph->cleartheme();
 $graph->SetScale("textlin");
 
 $graph->SetShadow();

lib/jpgraph/src/Examples/alphabarex1.php

@@ -9,7 +9,8 @@
 $datay3=array(20,60,70,140);
 
 // Create the basic graph
-$graph = new Graph(450,250,'auto');	
+$graph = new Graph(450,250,'auto');
+$graph->clearTheme();
 $graph->SetScale("textlin");
 $graph->img->SetMargin(40,80,30,40);
 
@@ -72,4 +73,3 @@
 
 $graph->Stroke();
 ?>
-

lib/jpgraph/src/Examples/background_type_ex0.php

@@ -7,6 +7,7 @@
 
 // Create the graph. These two calls are always required
 $graph = new Graph(350,250);
+$graph->clearTheme();
 $graph->SetScale("textlin");
 $graph->SetMargin(40,40,50,50);
 

lib/jpgraph/src/Examples/background_type_ex1.php

@@ -7,6 +7,7 @@
 
 // Create the graph. These two calls are always required
 $graph = new Graph(350,250);
+$graph->clearTheme();
 $graph->SetScale("textlin");
 $graph->SetMargin(40,40,50,50);
 

lib/jpgraph/src/Examples/background_type_ex2.php

@@ -7,6 +7,7 @@
 
 // Create the graph. These two calls are always required
 $graph = new Graph(350,250);
+$graph->clearTheme();
 $graph->SetScale("textlin");
 $graph->SetMargin(40,40,50,50);
 

lib/jpgraph/src/Examples/background_type_ex3.php

@@ -7,6 +7,7 @@
 
 // Create the graph. These two calls are always required
 $graph = new Graph(350,250);
+$graph->clearTheme();
 $graph->SetScale("textlin");
 $graph->SetMargin(40,40,50,50);
 

lib/jpgraph/src/Examples/background_type_ex4.php

@@ -7,6 +7,7 @@
 
 // Create the graph. These two calls are always required
 $graph = new Graph(350,250);
+$graph->clearTheme();
 $graph->SetScale("textlin");
 $graph->SetMargin(40,40,50,50);