RetailCRM-Mirror/PHPExcel
1
0
Fork 0
mirror of https://github.com/retailcrm/PHPExcel.git synced 2024-11-23 13:56:05 +03:00
Code Issues Projects Releases Wiki Activity

Scatter chart basics

Browse Source 
git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@87000 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2012-02-26 12:31:03 +00:00
parent 938dcd9d5f
commit ed6d71cb92
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Classes/PHPExcel/Writer/Excel2007/Chart.php
View File

@ -609,8 +609,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$plotSeriesOrder = $plotGroup->getPlotOrder(); $plotSeriesOrder = $plotGroup->getPlotOrder();
$plotSeriesCount = count($plotSeriesOrder); $plotSeriesCount = count($plotSeriesOrder);
if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART) && if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_RADARCHART) &&
($groupType !== PHPExcel_Chart_DataSeries::TYPE_RADARCHART) &&
($groupType !== PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)) { ($groupType !== PHPExcel_Chart_DataSeries::TYPE_STOCKCHART)) {
if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_LINECHART) || if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_LINECHART) ||
@ -674,6 +673,15 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement(); $objWriter->endElement();
} }
$plotSeriesMarker = $plotGroup->getPlotValuesByIndex($plotSeriesRef)->getPointMarker();
if ($plotSeriesMarker) {
$objWriter->startElement('c:marker');
$objWriter->startElement('c:symbol');
$objWriter->writeAttribute('val', $plotSeriesMarker);
$objWriter->endElement();
$objWriter->endElement();
}
if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) || if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D) || ($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D) ||
($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART)) { ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART)) {
@ -702,7 +710,8 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
} }
} }
if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) { if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
$objWriter->startElement('c:xVal'); $objWriter->startElement('c:xVal');
} else { } else {
$objWriter->startElement('c:cat'); $objWriter->startElement('c:cat');
@ -717,7 +726,8 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
if ($plotSeriesValues) { if ($plotSeriesValues) {
$valIsMultiLevelSeries = $valIsMultiLevelSeries || $plotSeriesValues->isMultiLevelSeries(); $valIsMultiLevelSeries = $valIsMultiLevelSeries || $plotSeriesValues->isMultiLevelSeries();
if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) { if (($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) ||
($groupType === PHPExcel_Chart_DataSeries::TYPE_SCATTERCHART)) {
$objWriter->startElement('c:yVal'); $objWriter->startElement('c:yVal');
} else { } else {
$objWriter->startElement('c:val'); $objWriter->startElement('c:val');