From 52e42662185ef728f436d9e2e9ab983b20ef7d1c Mon Sep 17 00:00:00 2001 From: Nigel Sheldon Date: Sun, 3 Jan 2021 17:23:46 +0100 Subject: [PATCH] =?UTF-8?q?Lint=20mon=20cache=20a=20fait=20que=20=C3=A7a?= =?UTF-8?q?=20n'avait=20pas=20=C3=A9t=C3=A9=20corrig=C3=A9=20=C3=A0=20la?= =?UTF-8?q?=20premi=C3=A8re=20passe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- onyx2/include/jpgraph/gd_image.inc.php | 6 ++---- onyx2/include/jpgraph/jpgraph_gantt.php | 12 ++++++------ onyx2/include/jpgraph/jpgraph_line.php | 8 ++++---- onyx2/include/jpgraph/jpgraph_pie3d.php | 3 +-- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/onyx2/include/jpgraph/gd_image.inc.php b/onyx2/include/jpgraph/gd_image.inc.php index aed0bdb..a9ea65e 100644 --- a/onyx2/include/jpgraph/gd_image.inc.php +++ b/onyx2/include/jpgraph/gd_image.inc.php @@ -434,8 +434,7 @@ class Image $ymarg=4, $cornerradius=0, $dropwidth=3 - ) - { + ) { $oldx = $this->lastx; $oldy = $this->lasty; @@ -551,8 +550,7 @@ class Image $ymarg=4, $cornerradius=0, $dropwidth=3 - ) - { + ) { // This version of boxed text will stroke a rotated box round the text // thta will follow the angle of the text. diff --git a/onyx2/include/jpgraph/jpgraph_gantt.php b/onyx2/include/jpgraph/jpgraph_gantt.php index 8dbdd84..a6b098a 100644 --- a/onyx2/include/jpgraph/jpgraph_gantt.php +++ b/onyx2/include/jpgraph/jpgraph_gantt.php @@ -945,9 +945,9 @@ class GanttGraph extends Graph // Firdst find out the maximum width of each object column $titlewidth = max( max( - $this->GetMaxLabelWidth(), - $this->scale->tableTitle->GetWidth($this->img) - ), + $this->GetMaxLabelWidth(), + $this->scale->tableTitle->GetWidth($this->img) + ), $this->scale->actinfo->GetWidth($this->img) ); @@ -1044,9 +1044,9 @@ class GanttGraph extends Graph $maxwidth=max( $this->scale->actinfo->GetWidth($this->img), max( - $this->GetMaxLabelWidth(), - $this->scale->tableTitle->GetWidth($this->img) - ) + $this->GetMaxLabelWidth(), + $this->scale->tableTitle->GetWidth($this->img) + ) ); $this->scale->SetLabelWidth($maxwidth+$this->scale->divider->iWeight);//*(1+$this->iLabelHMarginFactor)); diff --git a/onyx2/include/jpgraph/jpgraph_line.php b/onyx2/include/jpgraph/jpgraph_line.php index 8021bc1..a05df1a 100644 --- a/onyx2/include/jpgraph/jpgraph_line.php +++ b/onyx2/include/jpgraph/jpgraph_line.php @@ -426,10 +426,10 @@ class LinePlot extends Plot array_merge( $areaCoords, array_slice( - $cord, - $this->filledAreas[$i][0] * $factor, - ($this->filledAreas[$i][1] - $this->filledAreas[$i][0] + ($this->step_style ? 0 : 1)) * $factor - ) + $cord, + $this->filledAreas[$i][0] * $factor, + ($this->filledAreas[$i][1] - $this->filledAreas[$i][0] + ($this->step_style ? 0 : 1)) * $factor + ) ); $areaCoords[] = $areaCoords[sizeof($areaCoords)-2]; // last x $areaCoords[] = $minY; // last y diff --git a/onyx2/include/jpgraph/jpgraph_pie3d.php b/onyx2/include/jpgraph/jpgraph_pie3d.php index c5e51c5..955e995 100644 --- a/onyx2/include/jpgraph/jpgraph_pie3d.php +++ b/onyx2/include/jpgraph/jpgraph_pie3d.php @@ -424,8 +424,7 @@ class PiePlot3D extends PiePlot $startangle=0, $edgecolor="", $edgeweight=1 - ) - { + ) { //--------------------------------------------------------------------------- // As usual the algorithm get more complicated than I originally