|
@@ -2134,6 +2134,7 @@ class pDraw
|
|
$Boundaries["B"] = $BoxArray[1]["Y"] + 2 + $IconAreaHeight / 2;
|
|
$Boundaries["B"] = $BoxArray[1]["Y"] + 2 + $IconAreaHeight / 2;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ $Width = array();
|
|
$Width[] = $BoxArray[1]["X"];
|
|
$Width[] = $BoxArray[1]["X"];
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2206,6 +2207,7 @@ class pDraw
|
|
$Width = "";
|
|
$Width = "";
|
|
foreach ($Lines as $Key => $Value) {
|
|
foreach ($Lines as $Key => $Value) {
|
|
$BoxArray = $this->drawText($X + $IconAreaWidth + 4, $Y + $IconAreaHeight / 2 + (($this->FontSize + 3) * $Key), $Value, array("R" => $FontR, "G" => $FontG, "B" => $FontB, "Align" => TEXT_ALIGN_MIDDLELEFT, "FontSize" => $FontSize, "FontName" => $FontName));
|
|
$BoxArray = $this->drawText($X + $IconAreaWidth + 4, $Y + $IconAreaHeight / 2 + (($this->FontSize + 3) * $Key), $Value, array("R" => $FontR, "G" => $FontG, "B" => $FontB, "Align" => TEXT_ALIGN_MIDDLELEFT, "FontSize" => $FontSize, "FontName" => $FontName));
|
|
|
|
+ $Width = array();
|
|
$Width[] = $BoxArray[1]["X"];
|
|
$Width[] = $BoxArray[1]["X"];
|
|
}
|
|
}
|
|
$X = max($Width) + 2 + $XStep;
|
|
$X = max($Width) + 2 + $XStep;
|
|
@@ -3902,6 +3904,7 @@ class pDraw
|
|
}
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
|
|
+ $Result = array();
|
|
foreach ($Values as $Key => $Value) {
|
|
foreach ($Values as $Key => $Value) {
|
|
if ($Value == VOID) {
|
|
if ($Value == VOID) {
|
|
$Result[] = VOID;
|
|
$Result[] = VOID;
|
|
@@ -4481,6 +4484,7 @@ class pDraw
|
|
$this->drawLine($LastGoodX, $LastGoodY, $X, $Y, $BreakSettings);
|
|
$this->drawLine($LastGoodX, $LastGoodY, $X, $Y, $BreakSettings);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ $WayPoints = array();
|
|
if ($Y != VOID)
|
|
if ($Y != VOID)
|
|
$WayPoints[] = array($X, $Y);
|
|
$WayPoints[] = array($X, $Y);
|
|
|
|
|