Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

graph : renew the points draw with 1. The background, 2. The border

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3357 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2017-01-30 14:01:56 +00:00
parent 2eb030056d
commit d60f7a4267
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
graph.php
View File

@@ -2466,47 +2466,48 @@ class graphStyleLinePoints
switch ($this->pointShape) switch ($this->pointShape)
{ {
case "circle": case "circle":
if ($this->pointBgcolor !== "transparent")
imagefilledellipse ($gd, $posX, $posY, $this->pointWidth,
$this->pointWidth, $pointBgcolor + 2);
if ($this->pointColor !== "transparent") if ($this->pointColor !== "transparent")
imageellipse ($gd, $posX, $posY, $this->pointWidth + 2, imageellipse ($gd, $posX, $posY, $this->pointWidth + 2,
$this->pointWidth + 2, $pointColor); $this->pointWidth + 2, $pointColor);
if ($this->pointBgcolor !== "transparent")
imagefilledellipse ($gd, $posX, $posY, $this->pointWidth,
$this->pointWidth, $pointBgcolor);
break; break;
case "lozenge": case "lozenge":
if ($this->pointBgcolor !== "transparent")
imagefilledpolygon ($gd, array ($posX - $half - 2, $posY,
$posX, $posY - $half - 2,
$posX + $half + 2, $posY,
$posX, $posY + $half + 2),
4, $pointBgcolor);
if ($this->pointColor !== "transparent") if ($this->pointColor !== "transparent")
imagepolygon ($gd, array ($posX - $half - 2, $posY, imagepolygon ($gd, array ($posX - $half - 2, $posY,
$posX, $posY - $half - 2, $posX, $posY - $half - 2,
$posX + $half + 2, $posY, $posX + $half + 2, $posY,
$posX, $posY + $half + 2), $posX, $posY + $half + 2),
4, $pointColor); 4, $pointColor);
if ($this->pointBgcolor !== "transparent")
imagefilledpolygon ($gd, array ($posX - $half, $posY,
$posX, $posY - $half,
$posX + $half, $posY,
$posX, $posY + $half),
4, $pointBgcolor);
break; break;
case "square": case "square":
if ($this->pointBgcolor !== "transparent")
imagefilledrectangle ($gd, $posX - $half - 1, $posY - $half - 1,
$posX + $half + 1, $posY + $half + 1,
$pointBgcolor);
if ($this->pointColor !== "transparent") if ($this->pointColor !== "transparent")
imagerectangle ($gd, $posX - $half - 1, $posY - $half - 1, imagerectangle ($gd, $posX - $half - 1, $posY - $half - 1,
$posX + $half + 1, $posY + $half + 1, $posX + $half + 1, $posY + $half + 1,
$pointColor); $pointColor);
if ($this->pointBgcolor !== "transparent")
imagefilledrectangle ($gd, $posX - $half, $posY - $half,
$posX + $half, $posY + $half, $pointBgcolor);
break; break;
case "triangle": case "triangle":
if ($this->pointBgcolor !== "transparent")
imagefilledpolygon ($gd, array ($posX - $half -2, $posY + $half + 2,
$posX, $posY - $half -2,
$posX + $half + 2, $posY + $half + 2),
3, $pointBgcolor);
if ($this->pointColor !== "transparent") if ($this->pointColor !== "transparent")
imagepolygon ($gd, array ($posX - $half - 2, $posY + $half + 2, imagepolygon ($gd, array ($posX - $half - 2, $posY + $half + 2,
$posX, $posY - $half - 4, $posX, $posY - $half - 2,
$posX + $half + 2, $posY + $half + 2), $posX + $half + 2, $posY + $half + 2),
3, $pointColor); 3, $pointColor);
if ($this->pointBgcolor !== "transparent")
imagefilledpolygon ($gd, array ($posX - $half, $posY + $half,
$posX, $posY - $half,
$posX + $half, $posY + $half),
3, $pointBgcolor);
break; break;
default: default:
throw new \Exception (dgettext ("domframework", throw new \Exception (dgettext ("domframework",