halo-battle/game
1
0
Fork 1
Code Issues Pull requests Projects Releases Activity

Fix linting

Browse source
This commit is contained in:
Nigel Sheldon 2020-11-21 15:51:56 +01:00
commit 1614145b18
262 changed files with 45324 additions and 42695 deletions
Download patch file Download diff file Expand all files Collapse all files

217
onyx2/include/jpgraph/jpgraph_error.php
View file

@ -14,65 +14,74 @@
// Description: Error plot with min/max value for
// each datapoint
//===================================================
class ErrorPlot extends Plot {
class ErrorPlot extends Plot
{
private $errwidth=2;
//---------------
// CONSTRUCTOR
function ErrorPlot($datay,$datax=false) {
$this->Plot($datay,$datax);
$this->numpoints /= 2;
//---------------
// CONSTRUCTOR
public function ErrorPlot($datay, $datax=false)
{
$this->Plot($datay, $datax);
$this->numpoints /= 2;
}
//---------------
// PUBLIC METHODS
//---------------
// PUBLIC METHODS
// Gets called before any axis are stroked
function PreStrokeAdjust($graph) {
if( $this->center ) {
$a=0.5; $b=0.5;
++$this->numpoints;
} else {
$a=0; $b=0;
}
$graph->xaxis->scale->ticks->SetXLabelOffset($a);
$graph->SetTextScaleOff($b);
//$graph->xaxis->scale->ticks->SupressMinorTickMarks();
public function PreStrokeAdjust($graph)
{
if ($this->center) {
$a=0.5;
$b=0.5;
++$this->numpoints;
} else {
$a=0;
$b=0;
}
$graph->xaxis->scale->ticks->SetXLabelOffset($a);
$graph->SetTextScaleOff($b);
//$graph->xaxis->scale->ticks->SupressMinorTickMarks();
}
// Method description
function Stroke($img,$xscale,$yscale) {
$numpoints=count($this->coords[0])/2;
$img->SetColor($this->color);
$img->SetLineWeight($this->weight);
public function Stroke($img, $xscale, $yscale)
{
$numpoints=count($this->coords[0])/2;
$img->SetColor($this->color);
$img->SetLineWeight($this->weight);
if( isset($this->coords[1]) ) {
if( count($this->coords[1])!=$numpoints )
JpGraphError::RaiseL(2003,count($this->coords[1]),$numpoints);
//("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
else
$exist_x = true;
}
else
$exist_x = false;
if (isset($this->coords[1])) {
if (count($this->coords[1])!=$numpoints) {
JpGraphError::RaiseL(2003, count($this->coords[1]), $numpoints);
}
//("Number of X and Y points are not equal. Number of X-points:".count($this->coords[1])." Number of Y-points:$numpoints");
else {
$exist_x = true;
}
} else {
$exist_x = false;
}
for( $i=0; $i<$numpoints; ++$i) {
if( $exist_x )
$x=$this->coords[1][$i];
else
$x=$i;
for ($i=0; $i<$numpoints; ++$i) {
if ($exist_x) {
$x=$this->coords[1][$i];
} else {
$x=$i;
}
if( !is_numeric($x) ||
!is_numeric($this->coords[0][$i*2]) || !is_numeric($this->coords[0][$i*2+1]) ) {
continue;
}
if (!is_numeric($x) ||
!is_numeric($this->coords[0][$i*2]) || !is_numeric($this->coords[0][$i*2+1])) {
continue;
}
$xt = $xscale->Translate($x);
$yt1 = $yscale->Translate($this->coords[0][$i*2]);
$yt2 = $yscale->Translate($this->coords[0][$i*2+1]);
$img->Line($xt,$yt1,$xt,$yt2);
$img->Line($xt-$this->errwidth,$yt1,$xt+$this->errwidth,$yt1);
$img->Line($xt-$this->errwidth,$yt2,$xt+$this->errwidth,$yt2);
}
return true;
$xt = $xscale->Translate($x);
$yt1 = $yscale->Translate($this->coords[0][$i*2]);
$yt2 = $yscale->Translate($this->coords[0][$i*2+1]);
$img->Line($xt, $yt1, $xt, $yt2);
$img->Line($xt-$this->errwidth, $yt1, $xt+$this->errwidth, $yt1);
$img->Line($xt-$this->errwidth, $yt2, $xt+$this->errwidth, $yt2);
}
return true;
}
} // Class
@ -83,31 +92,36 @@ class ErrorPlot extends Plot {
// THIS IS A DEPRECATED PLOT TYPE JUST KEPT FOR
// BACKWARD COMPATIBILITY
//===================================================
class ErrorLinePlot extends ErrorPlot {
class ErrorLinePlot extends ErrorPlot
{
public $line=null;
//---------------
// CONSTRUCTOR
function ErrorLinePlot($datay,$datax=false) {
$this->ErrorPlot($datay,$datax);
// Calculate line coordinates as the average of the error limits
$n = count($datay);
for($i=0; $i < $n; $i+=2 ) {
$ly[]=($datay[$i]+$datay[$i+1])/2;
}
$this->line=new LinePlot($ly,$datax);
//---------------
// CONSTRUCTOR
public function ErrorLinePlot($datay, $datax=false)
{
$this->ErrorPlot($datay, $datax);
// Calculate line coordinates as the average of the error limits
$n = count($datay);
for ($i=0; $i < $n; $i+=2) {
$ly[]=($datay[$i]+$datay[$i+1])/2;
}
$this->line=new LinePlot($ly, $datax);
}
//---------------
// PUBLIC METHODS
function Legend($graph) {
if( $this->legend != "" )
$graph->legend->Add($this->legend,$this->color);
$this->line->Legend($graph);
//---------------
// PUBLIC METHODS
public function Legend($graph)
{
if ($this->legend != "") {
$graph->legend->Add($this->legend, $this->color);
}
$this->line->Legend($graph);
}
function Stroke($img,$xscale,$yscale) {
parent::Stroke($img,$xscale,$yscale);
$this->line->Stroke($img,$xscale,$yscale);
public function Stroke($img, $xscale, $yscale)
{
parent::Stroke($img, $xscale, $yscale);
$this->line->Stroke($img, $xscale, $yscale);
}
} // Class
@ -116,41 +130,46 @@ class ErrorLinePlot extends ErrorPlot {
// CLASS LineErrorPlot
// Description: Combine a line and error plot
//===================================================
class LineErrorPlot extends ErrorPlot {
class LineErrorPlot extends ErrorPlot
{
public $line=null;
//---------------
// CONSTRUCTOR
//---------------
// CONSTRUCTOR
// Data is (val, errdeltamin, errdeltamax)
function LineErrorPlot($datay,$datax=false) {
$ly=array(); $ey=array();
$n = count($datay);
if( $n % 3 != 0 ) {
JpGraphError::RaiseL(4002);
//('Error in input data to LineErrorPlot. Number of data points must be a multiple of 3');
}
for($i=0; $i < $n; $i+=3 ) {
$ly[]=$datay[$i];
$ey[]=$datay[$i]+$datay[$i+1];
$ey[]=$datay[$i]+$datay[$i+2];
}
$this->ErrorPlot($ey,$datax);
$this->line=new LinePlot($ly,$datax);
public function LineErrorPlot($datay, $datax=false)
{
$ly=array();
$ey=array();
$n = count($datay);
if ($n % 3 != 0) {
JpGraphError::RaiseL(4002);
//('Error in input data to LineErrorPlot. Number of data points must be a multiple of 3');
}
for ($i=0; $i < $n; $i+=3) {
$ly[]=$datay[$i];
$ey[]=$datay[$i]+$datay[$i+1];
$ey[]=$datay[$i]+$datay[$i+2];
}
$this->ErrorPlot($ey, $datax);
$this->line=new LinePlot($ly, $datax);
}
//---------------
// PUBLIC METHODS
function Legend($graph) {
if( $this->legend != "" )
$graph->legend->Add($this->legend,$this->color);
$this->line->Legend($graph);
//---------------
// PUBLIC METHODS
public function Legend($graph)
{
if ($this->legend != "") {
$graph->legend->Add($this->legend, $this->color);
}
$this->line->Legend($graph);
}
function Stroke($img,$xscale,$yscale) {
parent::Stroke($img,$xscale,$yscale);
$this->line->Stroke($img,$xscale,$yscale);
public function Stroke($img, $xscale, $yscale)
{
parent::Stroke($img, $xscale, $yscale);
$this->line->Stroke($img, $xscale, $yscale);
}
} // Class
/* EOF */
?>