Skip to content

Commit

Permalink
ADDED : UnitTests (87.27% Lines)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Progi1984
Progi1984 committed Jul 10, 2014
1 parent e360b05 commit 20410e0
Show file tree
Hide file tree
Showing 5 changed files with 898 additions and 146 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ vendor
/samples/results
/phpunit.bat
/todo.txt
/samples/Sample_00_Test.php
52 changes: 5 additions & 47 deletions src/PhpPowerpoint/Writer/PowerPoint2007/Chart.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -931,12 +931,10 @@ protected function writeTypeBar3D(XMLWriter $objWriter, Bar3D $subject, $include
$objWriter->endElement();

// c:tx
if (class_exists('PHPExcel_Cell')) {
$objWriter->startElement('c:tx');
$coords = ($includeSheet ? 'Sheet1!$' . PHPExcel_Cell::stringFromColumnIndex(1 + $seriesIndex) . '$1' : '');
$this->writeSingleValueOrReference($objWriter, $includeSheet, $series->getTitle(), $coords);
$objWriter->endElement();
}
$objWriter->startElement('c:tx');
$coords = ($includeSheet ? 'Sheet1!$' . PHPExcel_Cell::stringFromColumnIndex(1 + $seriesIndex) . '$1' : '');
$this->writeSingleValueOrReference($objWriter, $includeSheet, $series->getTitle(), $coords);
$objWriter->endElement();

// Fills for points?
$dataPointFills = $series->getDataPointFills();
Expand Down Expand Up @@ -1316,26 +1314,6 @@ protected function writeTypeLine(XMLWriter $objWriter, Line $subject, $includeSh
$this->writeSingleValueOrReference($objWriter, $includeSheet, $series->getTitle(), $coords);
$objWriter->endElement();

// Fills for points?
$dataPointFills = $series->getDataPointFills();
foreach ($dataPointFills as $key => $value) {
// c:dPt
$objWriter->startElement('c:dPt');

// c:idx
$this->writeElementWithValAttribute($objWriter, 'c:idx', $key);

// c:spPr
$objWriter->startElement('c:spPr');

// Write fill
$this->writeFill($objWriter, $value);

$objWriter->endElement();

$objWriter->endElement();
}

// c:dLbls
$objWriter->startElement('c:dLbls');

Expand Down Expand Up @@ -1530,27 +1508,7 @@ protected function writeTypeScatter(XMLWriter $objWriter, Scatter $subject, $inc
$objWriter->endElement();

$objWriter->endElement();
/*
// Fills for points?
$dataPointFills = $series->getDataPointFills();
foreach ($dataPointFills as $key => $value) {
// c:dPt
$objWriter->startElement('c:dPt');
// c:idx
$this->writeElementWithValAttribute($objWriter, 'c:idx', $key);
// c:spPr
$objWriter->startElement('c:spPr');
// Write fill
$this->writeFill($objWriter, $value);
$objWriter->endElement();
$objWriter->endElement();
}
*/

// c:dLbls
$objWriter->startElement('c:dLbls');

Expand Down
99 changes: 0 additions & 99 deletions src/PhpPowerpoint/Writer/PowerPoint2007/Slide.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,6 @@ private function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape, $sh
$objWriter->writeAttribute('name', $shape->getName());
$objWriter->writeAttribute('descr', $shape->getDescription());

// a:hlinkClick
if ($shape->hasHyperlink()) {
$this->writeHyperlink($objWriter, $shape);
}

$objWriter->endElement();

// p:cNvPicPr
Expand Down Expand Up @@ -379,11 +374,6 @@ private function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
$objWriter->writeAttribute('id', $shapeId);
$objWriter->writeAttribute('name', '');

// a:hlinkClick
if ($shape->hasHyperlink()) {
$this->writeHyperlink($objWriter, $shape);
}

$objWriter->endElement();

// p:cNvSpPr
Expand Down Expand Up @@ -422,40 +412,6 @@ private function writeShapeText(XMLWriter $objWriter, RichText $shape, $shapeId)
$objWriter->writeAttribute('prst', 'rect');
$objWriter->endElement();

$this->writeFill($objWriter, $shape->getFill());

if ($shape->getBorder()->getLineStyle() != Border::LINE_NONE) {
$this->writeBorder($objWriter, $shape->getBorder(), '');
}

if ($shape->getShadow()->isVisible()) {
// a:effectLst
$objWriter->startElement('a:effectLst');

// a:outerShdw
$objWriter->startElement('a:outerShdw');
$objWriter->writeAttribute('blurRad', SharedDrawing::pixelsToEmu($shape->getShadow()->getBlurRadius()));
$objWriter->writeAttribute('dist', SharedDrawing::pixelsToEmu($shape->getShadow()->getDistance()));
$objWriter->writeAttribute('dir', SharedDrawing::degreesToAngle($shape->getShadow()->getDirection()));
$objWriter->writeAttribute('algn', $shape->getShadow()->getAlignment());
$objWriter->writeAttribute('rotWithShape', '0');

// a:srgbClr
$objWriter->startElement('a:srgbClr');
$objWriter->writeAttribute('val', $shape->getShadow()->getColor()->getRGB());

// a:alpha
$objWriter->startElement('a:alpha');
$objWriter->writeAttribute('val', $shape->getShadow()->getAlpha() * 1000);
$objWriter->endElement();

$objWriter->endElement();

$objWriter->endElement();

$objWriter->endElement();
}

$objWriter->endElement();

// p:txBody
Expand Down Expand Up @@ -521,11 +477,6 @@ private function writeShapeTable(XMLWriter $objWriter, Table $shape, $shapeId)
$objWriter->writeAttribute('name', $shape->getName());
$objWriter->writeAttribute('descr', $shape->getDescription());

// a:hlinkClick
if ($shape->hasHyperlink()) {
$this->writeHyperlink($objWriter, $shape);
}

$objWriter->endElement();

// p:cNvGraphicFramePr
Expand Down Expand Up @@ -575,34 +526,6 @@ private function writeShapeTable(XMLWriter $objWriter, Table $shape, $shapeId)
$objWriter->writeAttribute('firstRow', '1');
$objWriter->writeAttribute('bandRow', '1');

if ($shape->getShadow()->isVisible()) {
// a:effectLst
$objWriter->startElement('a:effectLst');

// a:outerShdw
$objWriter->startElement('a:outerShdw');
$objWriter->writeAttribute('blurRad', SharedDrawing::pixelsToEmu($shape->getShadow()->getBlurRadius()));
$objWriter->writeAttribute('dist', SharedDrawing::pixelsToEmu($shape->getShadow()->getDistance()));
$objWriter->writeAttribute('dir', SharedDrawing::degreesToAngle($shape->getShadow()->getDirection()));
$objWriter->writeAttribute('algn', $shape->getShadow()->getAlignment());
$objWriter->writeAttribute('rotWithShape', '0');

// a:srgbClr
$objWriter->startElement('a:srgbClr');
$objWriter->writeAttribute('val', $shape->getShadow()->getColor()->getRGB());

// a:alpha
$objWriter->startElement('a:alpha');
$objWriter->writeAttribute('val', $shape->getShadow()->getAlpha() * 1000);
$objWriter->endElement();

$objWriter->endElement();

$objWriter->endElement();

$objWriter->endElement();
}

$objWriter->endElement();

// a:tblGrid
Expand Down Expand Up @@ -892,11 +815,6 @@ private function writeShapeLine(XMLWriter $objWriter, Line $shape, $shapeId)
$objWriter->writeAttribute('id', $shapeId);
$objWriter->writeAttribute('name', '');

// a:hlinkClick
if ($shape->hasHyperlink()) {
$this->writeHyperlink($objWriter, $shape);
}

$objWriter->endElement();

// p:cNvCxnSpPr
Expand Down Expand Up @@ -983,23 +901,6 @@ private function writeShapeLine(XMLWriter $objWriter, Line $shape, $shapeId)
$objWriter->endElement();
}

/**
* Write Borders
*
* @param \PhpOffice\PhpPowerpoint\Shared\XMLWriter $objWriter XML Writer
* @param \PhpOffice\PhpPowerpoint\Style\Borders $pBorders Borders
* @throws \Exception
*/
protected function writeBorders(XMLWriter $objWriter, Borders $pBorders)
{
$this->writeBorder($objWriter, $pBorders->getLeft(), 'L');
$this->writeBorder($objWriter, $pBorders->getRight(), 'R');
$this->writeBorder($objWriter, $pBorders->getTop(), 'T');
$this->writeBorder($objWriter, $pBorders->getBottom(), 'B');
$this->writeBorder($objWriter, $pBorders->getDiagonalDown(), 'TlToBr');
$this->writeBorder($objWriter, $pBorders->getDiagonalUp(), 'BlToTr');
}

/**
* Write Border
*
Expand Down
Loading

0 comments on commit 20410e0

Please sign in to comment.