graph : renew the points draw with 1. The background, 2. The border
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3357 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
45
graph.php
45
graph.php
@@ -2466,47 +2466,48 @@ class graphStyleLinePoints
|
||||
switch ($this->pointShape)
|
||||
{
|
||||
case "circle":
|
||||
if ($this->pointBgcolor !== "transparent")
|
||||
imagefilledellipse ($gd, $posX, $posY, $this->pointWidth,
|
||||
$this->pointWidth, $pointBgcolor + 2);
|
||||
if ($this->pointColor !== "transparent")
|
||||
imageellipse ($gd, $posX, $posY, $this->pointWidth + 2,
|
||||
$this->pointWidth + 2, $pointColor);
|
||||
if ($this->pointBgcolor !== "transparent")
|
||||
imagefilledellipse ($gd, $posX, $posY, $this->pointWidth,
|
||||
$this->pointWidth, $pointBgcolor);
|
||||
break;
|
||||
case "lozenge":
|
||||
if ($this->pointColor !== "transparent")
|
||||
imagepolygon ($gd, array ($posX - $half - 2, $posY,
|
||||
if ($this->pointBgcolor !== "transparent")
|
||||
imagefilledpolygon ($gd, array ($posX - $half - 2, $posY,
|
||||
$posX, $posY - $half - 2,
|
||||
$posX + $half + 2, $posY,
|
||||
$posX, $posY + $half + 2),
|
||||
4, $pointColor);
|
||||
if ($this->pointBgcolor !== "transparent")
|
||||
imagefilledpolygon ($gd, array ($posX - $half, $posY,
|
||||
$posX, $posY - $half,
|
||||
$posX + $half, $posY,
|
||||
$posX, $posY + $half),
|
||||
4, $pointBgcolor);
|
||||
if ($this->pointColor !== "transparent")
|
||||
imagepolygon ($gd, array ($posX - $half - 2, $posY,
|
||||
$posX, $posY - $half - 2,
|
||||
$posX + $half + 2, $posY,
|
||||
$posX, $posY + $half + 2),
|
||||
4, $pointColor);
|
||||
break;
|
||||
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")
|
||||
imagerectangle ($gd, $posX - $half - 1, $posY - $half - 1,
|
||||
$posX + $half + 1, $posY + $half + 1,
|
||||
$pointColor);
|
||||
if ($this->pointBgcolor !== "transparent")
|
||||
imagefilledrectangle ($gd, $posX - $half, $posY - $half,
|
||||
$posX + $half, $posY + $half, $pointBgcolor);
|
||||
$posX + $half + 1, $posY + $half + 1,
|
||||
$pointColor);
|
||||
break;
|
||||
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")
|
||||
imagepolygon ($gd, array ($posX - $half - 2, $posY + $half + 2,
|
||||
$posX, $posY - $half - 4,
|
||||
$posX, $posY - $half - 2,
|
||||
$posX + $half + 2, $posY + $half + 2),
|
||||
3, $pointColor);
|
||||
if ($this->pointBgcolor !== "transparent")
|
||||
imagefilledpolygon ($gd, array ($posX - $half, $posY + $half,
|
||||
$posX, $posY - $half,
|
||||
$posX + $half, $posY + $half),
|
||||
3, $pointBgcolor);
|
||||
break;
|
||||
default:
|
||||
throw new \Exception (dgettext ("domframework",
|
||||
|
||||
Reference in New Issue
Block a user