geckon01/PhpSpreadsheet
1
0
Fork 0
mirror of https://github.com/PHPOffice/PhpSpreadsheet.git synced 2026-08-31 12:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4074 from yfinkel/patch-1

Browse Source 
Update JpGraphRendererBase.php - check existing of PlotLabel
This commit is contained in:
oleibman
2024-06-30 02:12:15 +00:00
committed by GitHub
parent d767d4618a 675efc1f79
commit aae4992dca
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/PhpSpreadsheet/Chart/Renderer/JpGraphRendererBase.php
+16 -12
View File
@@ -281,6 +281,16 @@ abstract class JpGraphRendererBase implements IRenderer
$this->renderTitle();
}
private function getDataLabel(int $groupId, int $index): mixed
{
$plotLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupId)->getPlotLabelByIndex($index);
if (!$plotLabel) {
return '';
}
return $plotLabel->getDataValue();
}
private function renderPlotLine(int $groupID, bool $filled = false, bool $combination = false): void
{
$grouping = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotGrouping();
@@ -334,8 +344,8 @@ abstract class JpGraphRendererBase implements IRenderer
// Set the appropriate plot marker
$this->formatPointMarker($seriesPlot, $marker);
}
$dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($index)->getDataValue();
$seriesPlot->SetLegend($dataLabel);
$seriesPlot->SetLegend($this->getDataLabel($groupID, $index));
$seriesPlots[] = $seriesPlot;
}
@@ -408,12 +418,8 @@ abstract class JpGraphRendererBase implements IRenderer
if ($dimensions == '3d') {
$seriesPlot->SetShadow();
}
if (!$this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)) {
$dataLabel = '';
} else {
$dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($j)->getDataValue();
}
$seriesPlot->SetLegend($dataLabel);
$seriesPlot->SetLegend($this->getDataLabel($groupID, $j));
$seriesPlots[] = $seriesPlot;
}
@@ -492,8 +498,7 @@ abstract class JpGraphRendererBase implements IRenderer
$marker = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotValuesByIndex($i)->getPointMarker();
$this->formatPointMarker($seriesPlot, $marker);
}
$dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
$seriesPlot->SetLegend($dataLabel);
$seriesPlot->SetLegend($this->getDataLabel($groupID, $i));
$this->graph->Add($seriesPlot);
}
@@ -524,13 +529,12 @@ abstract class JpGraphRendererBase implements IRenderer
$seriesPlot = new RadarPlot(array_reverse($dataValuesX));
$dataLabel = $this->chart->getPlotArea()->getPlotGroupByIndex($groupID)->getPlotLabelByIndex($i)->getDataValue();
$seriesPlot->SetColor(self::$colourSet[self::$plotColour++]);
if ($radarStyle == 'filled') {
$seriesPlot->SetFillColor(self::$colourSet[self::$plotColour]);
}
$this->formatPointMarker($seriesPlot, $marker);
$seriesPlot->SetLegend($dataLabel);
$seriesPlot->SetLegend($this->getDataLabel($groupID, $i));
$this->graph->Add($seriesPlot);
}