alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fix to varyColor 

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@87267 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2012-03-04 11:30:33 +00:00
parent 1600961140
commit 4562c83ec8
1 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -227,20 +227,20 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement(); $objWriter->endElement();
} }
$this->_writePlotGroup($plotGroup, $groupType, $objWriter, $catIsMultiLevelSeries, $valIsMultiLevelSeries, $plotGroupingType); $this->_writePlotGroup($plotGroup, $chartType, $objWriter, $catIsMultiLevelSeries, $valIsMultiLevelSeries, $plotGroupingType);
} }
} }
$this->_writeDataLbls($objWriter); $this->_writeDataLbls($objWriter);
if ($groupType === PHPExcel_Chart_DataSeries::TYPE_LINECHART) { if ($chartType === PHPExcel_Chart_DataSeries::TYPE_LINECHART) {
// Line only, Line3D can't be smoothed // Line only, Line3D can't be smoothed
$objWriter->startElement('c:smooth'); $objWriter->startElement('c:smooth');
$objWriter->writeAttribute('val', (integer) $plotGroup->getSmoothLine() ); $objWriter->writeAttribute('val', (integer) $plotGroup->getSmoothLine() );
$objWriter->endElement(); $objWriter->endElement();
} elseif (($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) || } elseif (($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART) ||
($groupType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) { ($chartType === PHPExcel_Chart_DataSeries::TYPE_BARCHART_3D)) {
$objWriter->startElement('c:gapWidth'); $objWriter->startElement('c:gapWidth');
$objWriter->writeAttribute('val', 150 ); $objWriter->writeAttribute('val', 150 );
@ -253,7 +253,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->writeAttribute('val', 100 ); $objWriter->writeAttribute('val', 100 );
$objWriter->endElement(); $objWriter->endElement();
} }
} elseif ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) { } elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
$objWriter->startElement('c:bubbleScale'); $objWriter->startElement('c:bubbleScale');
$objWriter->writeAttribute('val', 25 ); $objWriter->writeAttribute('val', 25 );
@ -262,21 +262,23 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->startElement('c:showNegBubbles'); $objWriter->startElement('c:showNegBubbles');
$objWriter->writeAttribute('val', 0 ); $objWriter->writeAttribute('val', 0 );
$objWriter->endElement(); $objWriter->endElement();
} elseif ($groupType === PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) { } elseif ($chartType === PHPExcel_Chart_DataSeries::TYPE_STOCKCHART) {
$objWriter->startElement('c:hiLowLines'); $objWriter->startElement('c:hiLowLines');
$objWriter->endElement(); $objWriter->endElement();
} }
// Generate 2 unique numbers to use for axId values // Generate 2 unique numbers to use for axId values
$id1 = $id2 = rand(10000000,99999999); // $id1 = $id2 = rand(10000000,99999999);
do { // do {
$id2 = rand(10000000,99999999); // $id2 = rand(10000000,99999999);
} while ($id1 == $id2); // } while ($id1 == $id2);
$id1 = '75091328';
$id2 = '75089408';
if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) && if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
($groupType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) && ($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
($groupType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) { ($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
$objWriter->startElement('c:axId'); $objWriter->startElement('c:axId');
$objWriter->writeAttribute('val', $id1 ); $objWriter->writeAttribute('val', $id1 );
@ -289,7 +291,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->writeAttribute('val', 0); $objWriter->writeAttribute('val', 0);
$objWriter->endElement(); $objWriter->endElement();
if ($groupType === PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) { if ($chartType === PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) {
$objWriter->startElement('c:holeSize'); $objWriter->startElement('c:holeSize');
$objWriter->writeAttribute('val', 50); $objWriter->writeAttribute('val', 50);
@ -300,17 +302,17 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
$objWriter->endElement(); $objWriter->endElement();
} }
if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) && if (($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART) &&
($groupType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) && ($chartType !== PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) &&
($groupType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) { ($chartType !== PHPExcel_Chart_DataSeries::TYPE_DONUTCHART)) {
if ($groupType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) { if ($chartType === PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
$this->_writeValAx($objWriter,$plotArea,$xAxisLabel,$groupType,$id1,$id2,$catIsMultiLevelSeries); $this->_writeValAx($objWriter,$plotArea,$xAxisLabel,$chartType,$id1,$id2,$catIsMultiLevelSeries);
} else { } else {
$this->_writeCatAx($objWriter,$plotArea,$xAxisLabel,$groupType,$id1,$id2,$catIsMultiLevelSeries); $this->_writeCatAx($objWriter,$plotArea,$xAxisLabel,$chartType,$id1,$id2,$catIsMultiLevelSeries);
} }
$this->_writeValAx($objWriter,$plotArea,$yAxisLabel,$groupType,$id1,$id2,$valIsMultiLevelSeries); $this->_writeValAx($objWriter,$plotArea,$yAxisLabel,$chartType,$id1,$id2,$valIsMultiLevelSeries);
} }
$objWriter->endElement(); $objWriter->endElement();
@ -618,11 +620,19 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
if (($groupType !== PHPExcel_Chart_DataSeries::TYPE_RADARCHART) && if (($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) {
($plotSeriesCount > 1)) { if (($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART) ||
$objWriter->startElement('c:varyColors'); ($groupType == PHPExcel_Chart_DataSeries::TYPE_PIECHART_3D) ||
$objWriter->writeAttribute('val', 1); ($groupType == PHPExcel_Chart_DataSeries::TYPE_DONUTCHART) ||
$objWriter->endElement(); ($plotSeriesCount > 1)) {
$objWriter->startElement('c:varyColors');
$objWriter->writeAttribute('val', 1);
$objWriter->endElement();
} else {
$objWriter->startElement('c:varyColors');
$objWriter->writeAttribute('val', 0);
$objWriter->endElement();
}
} }
} }