-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Additional Support for Chart DataSeriesValues (#2906)
* Additional Support for Chart DataSeriesValues Fix #2863. DataSeriesValues now extends Properties, allowing it to share code in common with Axis and Gridlines. This causes some minor breakages; in particular line width is now initialized to null instead of Excel's default value, and is specified in points, as the user would expect from Excel, rather than the value stored in Xml. This change: - adds support for 1 or 2 marker colors. - adds support for `smoothLine` to DataSeriesValues. - will determine `catAx` or `valAx` for Axis based on what is read from the Xml when available, rather than guessing based on format. (Another minor break.) - reads `formatCode` and `sourceLinked` for Axis. - correct 2 uses of `$plotSeriesRef` to `$plotSeriesIndex` in Writer/Xlsx/Chart. - pushes coverage over 90% for Chart (88.70% overall). * Update Change Log I had updated previously but forgot to stage the member. * Adopt Some Suggestions Incorporate some changes suggested by @bridgeplayr. * Use ChartColor for DSV Fill And Font Text DataSeriesValues Fill could be a scalar or an array, so I saved it till last. * Some Final Cleanup No code changes. Illustrate even more of the new features in existing sample files. Deprecate *_ARGB in Properties/ChartColors in favor of *_RGB, because it uses only 6 hex digits. The alpha value is stored separately.
- Loading branch information
Showing
25 changed files
with
1,272 additions
and
378 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| <?php | ||
|
|
||
| use PhpOffice\PhpSpreadsheet\Chart\Chart; | ||
| use PhpOffice\PhpSpreadsheet\Chart\DataSeries; | ||
| use PhpOffice\PhpSpreadsheet\Chart\DataSeriesValues; | ||
| use PhpOffice\PhpSpreadsheet\Chart\Layout; | ||
| use PhpOffice\PhpSpreadsheet\Chart\Legend as ChartLegend; | ||
| use PhpOffice\PhpSpreadsheet\Chart\PlotArea; | ||
| use PhpOffice\PhpSpreadsheet\Chart\Title; | ||
| use PhpOffice\PhpSpreadsheet\IOFactory; | ||
| use PhpOffice\PhpSpreadsheet\Spreadsheet; | ||
|
|
||
| require __DIR__ . '/../Header.php'; | ||
|
|
||
| $spreadsheet = new Spreadsheet(); | ||
| $worksheet = $spreadsheet->getActiveSheet(); | ||
| $worksheet->fromArray( | ||
| [ | ||
| ['', 2010, 2011, 2012], | ||
| ['Q1', 12, 15, 21], | ||
| ['Q2', 56, 73, 86], | ||
| ['Q3', 52, 61, 69], | ||
| ['Q4', 30, 32, 0], | ||
| ] | ||
| ); | ||
|
|
||
| // Custom colors for dataSeries (gray, blue, red, orange) | ||
| $colors = [ | ||
| 'cccccc', '00abb8', 'b8292f', 'eb8500', | ||
| ]; | ||
|
|
||
| // Set the Labels for each data series we want to plot | ||
| // Datatype | ||
| // Cell reference for data | ||
| // Format Code | ||
| // Number of datapoints in series | ||
| // Data values | ||
| // Data Marker | ||
| $dataSeriesLabels1 = [ | ||
| new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$C$1', null, 1), // 2011 | ||
| ]; | ||
| // Set the X-Axis Labels | ||
| // Datatype | ||
| // Cell reference for data | ||
| // Format Code | ||
| // Number of datapoints in series | ||
| // Data values | ||
| // Data Marker | ||
| $xAxisTickValues1 = [ | ||
| new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 | ||
| ]; | ||
| // Set the Data values for each data series we want to plot | ||
| // Datatype | ||
| // Cell reference for data | ||
| // Format Code | ||
| // Number of datapoints in series | ||
| // Data values | ||
| // Data Marker | ||
| // Custom colors | ||
| $dataSeriesValues1 = [ | ||
| new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$C$2:$C$5', null, 4, [], null, $colors), | ||
| ]; | ||
|
|
||
| // Build the dataseries | ||
| $series1 = new DataSeries( | ||
| DataSeries::TYPE_BARCHART, // plotType | ||
| null, // plotGrouping (Pie charts don't have any grouping) | ||
| range(0, count($dataSeriesValues1) - 1), // plotOrder | ||
| $dataSeriesLabels1, // plotLabel | ||
| $xAxisTickValues1, // plotCategory | ||
| $dataSeriesValues1 // plotValues | ||
| ); | ||
|
|
||
| // Set up a layout object for the Pie chart | ||
| $layout1 = new Layout(); | ||
| $layout1->setShowVal(true); | ||
| $layout1->setShowPercent(true); | ||
|
|
||
| // Set the series in the plot area | ||
| $plotArea1 = new PlotArea($layout1, [$series1]); | ||
| // Set the chart legend | ||
| $legend1 = new ChartLegend(ChartLegend::POSITION_RIGHT, null, false); | ||
|
|
||
| $title1 = new Title('Test Bar Chart'); | ||
|
|
||
| // Create the chart | ||
| $chart1 = new Chart( | ||
| 'chart1', // name | ||
| $title1, // title | ||
| $legend1, // legend | ||
| $plotArea1, // plotArea | ||
| true, // plotVisibleOnly | ||
| DataSeries::EMPTY_AS_GAP, // displayBlanksAs | ||
| null, // xAxisLabel | ||
| null // yAxisLabel - Pie charts don't have a Y-Axis | ||
| ); | ||
|
|
||
| // Set the position where the chart should appear in the worksheet | ||
| $chart1->setTopLeftPosition('A7'); | ||
| $chart1->setBottomRightPosition('H20'); | ||
|
|
||
| // Add the chart to the worksheet | ||
| $worksheet->addChart($chart1); | ||
|
|
||
| // Set the Labels for each data series we want to plot | ||
| // Datatype | ||
| // Cell reference for data | ||
| // Format Code | ||
| // Number of datapoints in series | ||
| // Data values | ||
| // Data Marker | ||
| $dataSeriesLabels2 = [ | ||
| new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$C$1', null, 1), // 2011 | ||
| ]; | ||
| // Set the X-Axis Labels | ||
| // Datatype | ||
| // Cell reference for data | ||
| // Format Code | ||
| // Number of datapoints in series | ||
| // Data values | ||
| // Data Marker | ||
| $xAxisTickValues2 = [ | ||
| new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_STRING, 'Worksheet!$A$2:$A$5', null, 4), // Q1 to Q4 | ||
| ]; | ||
| // Set the Data values for each data series we want to plot | ||
| // Datatype | ||
| // Cell reference for data | ||
| // Format Code | ||
| // Number of datapoints in series | ||
| // Data values | ||
| // Data Marker | ||
| // Custom colors | ||
| $dataSeriesValues2 = [ | ||
| $dataSeriesValues2Element = new DataSeriesValues(DataSeriesValues::DATASERIES_TYPE_NUMBER, 'Worksheet!$C$2:$C$5', null, 4), | ||
| ]; | ||
| $dataSeriesValues2Element->setFillColor($colors); | ||
|
|
||
| // Build the dataseries | ||
| $series2 = new DataSeries( | ||
| DataSeries::TYPE_DONUTCHART, // plotType | ||
| null, // plotGrouping (Donut charts don't have any grouping) | ||
| range(0, count($dataSeriesValues2) - 1), // plotOrder | ||
| $dataSeriesLabels2, // plotLabel | ||
| $xAxisTickValues2, // plotCategory | ||
| $dataSeriesValues2 // plotValues | ||
| ); | ||
|
|
||
| // Set up a layout object for the Pie chart | ||
| $layout2 = new Layout(); | ||
| $layout2->setShowVal(true); | ||
| $layout2->setShowCatName(true); | ||
|
|
||
| // Set the series in the plot area | ||
| $plotArea2 = new PlotArea($layout2, [$series2]); | ||
|
|
||
| $title2 = new Title('Test Donut Chart'); | ||
|
|
||
| // Create the chart | ||
| $chart2 = new Chart( | ||
| 'chart2', // name | ||
| $title2, // title | ||
| null, // legend | ||
| $plotArea2, // plotArea | ||
| true, // plotVisibleOnly | ||
| DataSeries::EMPTY_AS_GAP, // displayBlanksAs | ||
| null, // xAxisLabel | ||
| null // yAxisLabel - Like Pie charts, Donut charts don't have a Y-Axis | ||
| ); | ||
|
|
||
| // Set the position where the chart should appear in the worksheet | ||
| $chart2->setTopLeftPosition('I7'); | ||
| $chart2->setBottomRightPosition('P20'); | ||
|
|
||
| // Add the chart to the worksheet | ||
| $worksheet->addChart($chart2); | ||
|
|
||
| // Save Excel 2007 file | ||
| $filename = $helper->getFilename(__FILE__); | ||
| $writer = IOFactory::createWriter($spreadsheet, 'Xlsx'); | ||
| $writer->setIncludeCharts(true); | ||
| $callStartTime = microtime(true); | ||
| $writer->save($filename); | ||
| $helper->logWrite($writer, $filename, $callStartTime); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.