Minor case-sensitivity bugfix to getCell when cell reference is a worksheet!cell

Work on PSR2 Coding standards
This commit is contained in:
MarkBaker 2015-05-04 23:36:20 +01:00
parent e83c359c7c
commit b3d2db79ea
13 changed files with 3126 additions and 3130 deletions

View File

@ -1,6 +1,7 @@
<?php <?php
/** /**
* PHPExcel * PHPExcel_Style
* *
* Copyright (c) 2006 - 2015 PHPExcel * Copyright (c) 2006 - 2015 PHPExcel
* *
@ -24,15 +25,6 @@
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
/**
* PHPExcel_Style
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
{ {
/** /**
@ -40,96 +32,96 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
* *
* @var PHPExcel_Style_Font * @var PHPExcel_Style_Font
*/ */
protected $_font; protected $font;
/** /**
* Fill * Fill
* *
* @var PHPExcel_Style_Fill * @var PHPExcel_Style_Fill
*/ */
protected $_fill; protected $fill;
/** /**
* Borders * Borders
* *
* @var PHPExcel_Style_Borders * @var PHPExcel_Style_Borders
*/ */
protected $_borders; protected $borders;
/** /**
* Alignment * Alignment
* *
* @var PHPExcel_Style_Alignment * @var PHPExcel_Style_Alignment
*/ */
protected $_alignment; protected $alignment;
/** /**
* Number Format * Number Format
* *
* @var PHPExcel_Style_NumberFormat * @var PHPExcel_Style_NumberFormat
*/ */
protected $_numberFormat; protected $numberFormat;
/** /**
* Conditional styles * Conditional styles
* *
* @var PHPExcel_Style_Conditional[] * @var PHPExcel_Style_Conditional[]
*/ */
protected $_conditionalStyles; protected $conditionalStyles;
/** /**
* Protection * Protection
* *
* @var PHPExcel_Style_Protection * @var PHPExcel_Style_Protection
*/ */
protected $_protection; protected $protection;
/** /**
* Index of style in collection. Only used for real style. * Index of style in collection. Only used for real style.
* *
* @var int * @var int
*/ */
protected $_index; protected $index;
/** /**
* Use Quote Prefix when displaying in cell editor. Only used for real style. * Use Quote Prefix when displaying in cell editor. Only used for real style.
* *
* @var boolean * @var boolean
*/ */
protected $_quotePrefix = false; protected $quotePrefix = false;
/** /**
* Create a new PHPExcel_Style * Create a new PHPExcel_Style
* *
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not * @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not * @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
*/ */
public function __construct($isSupervisor = false, $isConditional = false) public function __construct($isSupervisor = false, $isConditional = false)
{ {
// Supervisor? // Supervisor?
$this->_isSupervisor = $isSupervisor; $this->isSupervisor = $isSupervisor;
// Initialise values // Initialise values
$this->_conditionalStyles = array(); $this->conditionalStyles = array();
$this->_font = new PHPExcel_Style_Font($isSupervisor, $isConditional); $this->font = new PHPExcel_Style_Font($isSupervisor, $isConditional);
$this->_fill = new PHPExcel_Style_Fill($isSupervisor, $isConditional); $this->fill = new PHPExcel_Style_Fill($isSupervisor, $isConditional);
$this->_borders = new PHPExcel_Style_Borders($isSupervisor, $isConditional); $this->borders = new PHPExcel_Style_Borders($isSupervisor, $isConditional);
$this->_alignment = new PHPExcel_Style_Alignment($isSupervisor, $isConditional); $this->alignment = new PHPExcel_Style_Alignment($isSupervisor, $isConditional);
$this->_numberFormat = new PHPExcel_Style_NumberFormat($isSupervisor, $isConditional); $this->numberFormat = new PHPExcel_Style_NumberFormat($isSupervisor, $isConditional);
$this->_protection = new PHPExcel_Style_Protection($isSupervisor, $isConditional); $this->protection = new PHPExcel_Style_Protection($isSupervisor, $isConditional);
// bind parent if we are a supervisor // bind parent if we are a supervisor
if ($isSupervisor) { if ($isSupervisor) {
$this->_font->bindParent($this); $this->font->bindParent($this);
$this->_fill->bindParent($this); $this->fill->bindParent($this);
$this->_borders->bindParent($this); $this->borders->bindParent($this);
$this->_alignment->bindParent($this); $this->alignment->bindParent($this);
$this->_numberFormat->bindParent($this); $this->numberFormat->bindParent($this);
$this->_protection->bindParent($this); $this->protection->bindParent($this);
} }
} }
@ -150,7 +142,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
$xfIndex = 0; $xfIndex = 0;
} }
return $this->_parent->getCellXfByIndex($xfIndex); return $this->parent->getCellXfByIndex($xfIndex);
} }
/** /**
@ -160,19 +152,19 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getParent() public function getParent()
{ {
return $this->_parent; return $this->parent;
} }
/** /**
* Build style array from subcomponents * Build style array from subcomponents
* *
* @param array $array * @param array $array
* @return array * @return array
*/ */
public function getStyleArray($array) public function getStyleArray($array)
{ {
return array('quotePrefix' => $array); return array('quotePrefix' => $array);
} }
/** /**
* Apply styles from array * Apply styles from array
@ -217,7 +209,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
public function applyFromArray($pStyles = null, $pAdvanced = true) public function applyFromArray($pStyles = null, $pAdvanced = true)
{ {
if (is_array($pStyles)) { if (is_array($pStyles)) {
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$pRange = $this->getSelectedCells(); $pRange = $this->getSelectedCells();
@ -234,7 +226,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
// Calculate range outer borders // Calculate range outer borders
$rangeStart = PHPExcel_Cell::coordinateFromString($rangeA); $rangeStart = PHPExcel_Cell::coordinateFromString($rangeA);
$rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB); $rangeEnd = PHPExcel_Cell::coordinateFromString($rangeB);
// Translate column into index // Translate column into index
$rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1; $rangeStart[0] = PHPExcel_Cell::columnIndexFromString($rangeStart[0]) - 1;
@ -248,9 +240,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
} }
// ADVANCED MODE: // ADVANCED MODE:
if ($pAdvanced && isset($pStyles['borders'])) { if ($pAdvanced && isset($pStyles['borders'])) {
// 'allborders' is a shorthand property for 'outline' and 'inside' and // 'allborders' is a shorthand property for 'outline' and 'inside' and
// it applies to components that have not been set explicitly // it applies to components that have not been set explicitly
if (isset($pStyles['borders']['allborders'])) { if (isset($pStyles['borders']['allborders'])) {
@ -261,7 +251,6 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
} }
unset($pStyles['borders']['allborders']); // not needed any more unset($pStyles['borders']['allborders']); // not needed any more
} }
// 'outline' is a shorthand property for 'top', 'right', 'bottom', 'left' // 'outline' is a shorthand property for 'top', 'right', 'bottom', 'left'
// it applies to components that have not been set explicitly // it applies to components that have not been set explicitly
if (isset($pStyles['borders']['outline'])) { if (isset($pStyles['borders']['outline'])) {
@ -272,7 +261,6 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
} }
unset($pStyles['borders']['outline']); // not needed any more unset($pStyles['borders']['outline']); // not needed any more
} }
// 'inside' is a shorthand property for 'vertical' and 'horizontal' // 'inside' is a shorthand property for 'vertical' and 'horizontal'
// it applies to components that have not been set explicitly // it applies to components that have not been set explicitly
if (isset($pStyles['borders']['inside'])) { if (isset($pStyles['borders']['inside'])) {
@ -283,7 +271,6 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
} }
unset($pStyles['borders']['inside']); // not needed any more unset($pStyles['borders']['inside']); // not needed any more
} }
// width and height characteristics of selection, 1, 2, or 3 (for 3 or more) // width and height characteristics of selection, 1, 2, or 3 (for 3 or more)
$xMax = min($rangeEnd[0] - $rangeStart[0] + 1, 3); $xMax = min($rangeEnd[0] - $rangeStart[0] + 1, 3);
$yMax = min($rangeEnd[1] - $rangeStart[1] + 1, 3); $yMax = min($rangeEnd[1] - $rangeStart[1] + 1, 3);
@ -294,34 +281,28 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
$colStart = ($x == 3) ? $colStart = ($x == 3) ?
PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0]) PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0])
: PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $x - 1); : PHPExcel_Cell::stringFromColumnIndex($rangeStart[0] + $x - 1);
// end column index for region // end column index for region
$colEnd = ($x == 1) ? $colEnd = ($x == 1) ?
PHPExcel_Cell::stringFromColumnIndex($rangeStart[0]) PHPExcel_Cell::stringFromColumnIndex($rangeStart[0])
: PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] - $xMax + $x); : PHPExcel_Cell::stringFromColumnIndex($rangeEnd[0] - $xMax + $x);
for ($y = 1; $y <= $yMax; ++$y) { for ($y = 1; $y <= $yMax; ++$y) {
// which edges are touching the region // which edges are touching the region
$edges = array(); $edges = array();
// are we at left edge
if ($x == 1) { if ($x == 1) {
// are we at left edge
$edges[] = 'left'; $edges[] = 'left';
} }
// are we at right edge
if ($x == $xMax) { if ($x == $xMax) {
// are we at right edge
$edges[] = 'right'; $edges[] = 'right';
} }
// are we at top edge?
if ($y == 1) { if ($y == 1) {
// are we at top edge?
$edges[] = 'top'; $edges[] = 'top';
} }
// are we at bottom edge?
if ($y == $yMax) { if ($y == $yMax) {
// are we at bottom edge?
$edges[] = 'bottom'; $edges[] = 'bottom';
} }
@ -375,7 +356,6 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
} }
// SIMPLE MODE: // SIMPLE MODE:
// Selection type, inspect // Selection type, inspect
if (preg_match('/^[A-Z]+1:[A-Z]+1048576$/', $pRange)) { if (preg_match('/^[A-Z]+1:[A-Z]+1048576$/', $pRange)) {
$selectionType = 'COLUMN'; $selectionType = 'COLUMN';
@ -393,7 +373,6 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
$oldXfIndexes[$this->getActiveSheet()->getColumnDimensionByColumn($col)->getXfIndex()] = true; $oldXfIndexes[$this->getActiveSheet()->getColumnDimensionByColumn($col)->getXfIndex()] = true;
} }
break; break;
case 'ROW': case 'ROW':
$oldXfIndexes = array(); $oldXfIndexes = array();
for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) { for ($row = $rangeStart[1]; $row <= $rangeEnd[1]; ++$row) {
@ -404,7 +383,6 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
} }
} }
break; break;
case 'CELL': case 'CELL':
$oldXfIndexes = array(); $oldXfIndexes = array();
for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) { for ($col = $rangeStart[0]; $col <= $rangeEnd[0]; ++$col) {
@ -483,7 +461,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
$this->getProtection()->applyFromArray($pStyles['protection']); $this->getProtection()->applyFromArray($pStyles['protection']);
} }
if (array_key_exists('quotePrefix', $pStyles)) { if (array_key_exists('quotePrefix', $pStyles)) {
$this->_quotePrefix = $pStyles['quotePrefix']; $this->quotePrefix = $pStyles['quotePrefix'];
} }
} }
} else { } else {
@ -499,7 +477,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getFill() public function getFill()
{ {
return $this->_fill; return $this->fill;
} }
/** /**
@ -509,7 +487,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getFont() public function getFont()
{ {
return $this->_font; return $this->font;
} }
/** /**
@ -520,7 +498,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function setFont(PHPExcel_Style_Font $font) public function setFont(PHPExcel_Style_Font $font)
{ {
$this->_font = $font; $this->font = $font;
return $this; return $this;
} }
@ -531,7 +509,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getBorders() public function getBorders()
{ {
return $this->_borders; return $this->borders;
} }
/** /**
@ -541,7 +519,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getAlignment() public function getAlignment()
{ {
return $this->_alignment; return $this->alignment;
} }
/** /**
@ -551,7 +529,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getNumberFormat() public function getNumberFormat()
{ {
return $this->_numberFormat; return $this->numberFormat;
} }
/** /**
@ -585,7 +563,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getProtection() public function getProtection()
{ {
return $this->_protection; return $this->protection;
} }
/** /**
@ -595,10 +573,10 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getQuotePrefix() public function getQuotePrefix()
{ {
if ($this->_isSupervisor) { if ($this->isSupervisor) {
return $this->getSharedComponent()->getQuotePrefix(); return $this->getSharedComponent()->getQuotePrefix();
} }
return $this->_quotePrefix; return $this->quotePrefix;
} }
/** /**
@ -611,11 +589,11 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
if ($pValue == '') { if ($pValue == '') {
$pValue = false; $pValue = false;
} }
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$styleArray = array('quotePrefix' => $pValue); $styleArray = array('quotePrefix' => $pValue);
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} else { } else {
$this->_quotePrefix = (boolean) $pValue; $this->quotePrefix = (boolean) $pValue;
} }
return $this; return $this;
} }
@ -628,20 +606,20 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
public function getHashCode() public function getHashCode()
{ {
$hashConditionals = ''; $hashConditionals = '';
foreach ($this->_conditionalStyles as $conditional) { foreach ($this->conditionalStyles as $conditional) {
$hashConditionals .= $conditional->getHashCode(); $hashConditionals .= $conditional->getHashCode();
} }
return md5( return md5(
$this->_fill->getHashCode() $this->fill->getHashCode() .
. $this->_font->getHashCode() $this->font->getHashCode() .
. $this->_borders->getHashCode() $this->borders->getHashCode() .
. $this->_alignment->getHashCode() $this->alignment->getHashCode() .
. $this->_numberFormat->getHashCode() $this->numberFormat->getHashCode() .
. $hashConditionals $hashConditionals .
. $this->_protection->getHashCode() $this->protection->getHashCode() .
. ($this->_quotePrefix ? 't' : 'f') ($this->quotePrefix ? 't' : 'f') .
. __CLASS__ __CLASS__
); );
} }
@ -652,7 +630,7 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function getIndex() public function getIndex()
{ {
return $this->_index; return $this->index;
} }
/** /**
@ -662,7 +640,6 @@ class PHPExcel_Style extends PHPExcel_Style_Supervisor implements PHPExcel_IComp
*/ */
public function setIndex($pValue) public function setIndex($pValue)
{ {
$this->_index = $pValue; $this->index = $pValue;
} }
} }

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* PHPExcel * PHPExcel_Style_Alignment
* *
* Copyright (c) 2006 - 2015 PHPExcel * Copyright (c) 2006 - 2015 PHPExcel
* *
@ -19,441 +19,446 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* @category PHPExcel * @category PHPExcel
* @package PHPExcel_Style * @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/
/**
* PHPExcel_Style_Alignment
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable class PHPExcel_Style_Alignment extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
{ {
/* Horizontal alignment styles */ /* Horizontal alignment styles */
const HORIZONTAL_GENERAL = 'general'; const HORIZONTAL_GENERAL = 'general';
const HORIZONTAL_LEFT = 'left'; const HORIZONTAL_LEFT = 'left';
const HORIZONTAL_RIGHT = 'right'; const HORIZONTAL_RIGHT = 'right';
const HORIZONTAL_CENTER = 'center'; const HORIZONTAL_CENTER = 'center';
const HORIZONTAL_CENTER_CONTINUOUS = 'centerContinuous'; const HORIZONTAL_CENTER_CONTINUOUS = 'centerContinuous';
const HORIZONTAL_JUSTIFY = 'justify'; const HORIZONTAL_JUSTIFY = 'justify';
const HORIZONTAL_FILL = 'fill'; const HORIZONTAL_FILL = 'fill';
const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only const HORIZONTAL_DISTRIBUTED = 'distributed'; // Excel2007 only
/* Vertical alignment styles */ /* Vertical alignment styles */
const VERTICAL_BOTTOM = 'bottom'; const VERTICAL_BOTTOM = 'bottom';
const VERTICAL_TOP = 'top'; const VERTICAL_TOP = 'top';
const VERTICAL_CENTER = 'center'; const VERTICAL_CENTER = 'center';
const VERTICAL_JUSTIFY = 'justify'; const VERTICAL_JUSTIFY = 'justify';
const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only const VERTICAL_DISTRIBUTED = 'distributed'; // Excel2007 only
/* Read order */ /* Read order */
const READORDER_CONTEXT = 0; const READORDER_CONTEXT = 0;
const READORDER_LTR = 1; const READORDER_LTR = 1;
const READORDER_RTL = 2; const READORDER_RTL = 2;
/** /**
* Horizontal alignment * Horizontal alignment
* *
* @var string * @var string
*/ */
protected $_horizontal = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL; protected $horizontal = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
/** /**
* Vertical alignment * Vertical alignment
* *
* @var string * @var string
*/ */
protected $_vertical = PHPExcel_Style_Alignment::VERTICAL_BOTTOM; protected $vertical = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
/** /**
* Text rotation * Text rotation
* *
* @var integer * @var integer
*/ */
protected $_textRotation = 0; protected $textRotation = 0;
/** /**
* Wrap text * Wrap text
* *
* @var boolean * @var boolean
*/ */
protected $_wrapText = FALSE; protected $wrapText = false;
/** /**
* Shrink to fit * Shrink to fit
* *
* @var boolean * @var boolean
*/ */
protected $_shrinkToFit = FALSE; protected $shrinkToFit = false;
/** /**
* Indent - only possible with horizontal alignment left and right * Indent - only possible with horizontal alignment left and right
* *
* @var integer * @var integer
*/ */
protected $_indent = 0; protected $indent = 0;
/** /**
* Read order * Read order
* *
* @var integer * @var integer
*/ */
protected $_readorder = 0; protected $readorder = 0;
/** /**
* Create a new PHPExcel_Style_Alignment * Create a new PHPExcel_Style_Alignment
* *
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not * @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not * @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
*/ */
public function __construct($isSupervisor = FALSE, $isConditional = FALSE) public function __construct($isSupervisor = false, $isConditional = false)
{ {
// Supervisor? // Supervisor?
parent::__construct($isSupervisor); parent::__construct($isSupervisor);
if ($isConditional) { if ($isConditional) {
$this->_horizontal = NULL; $this->horizontal = null;
$this->_vertical = NULL; $this->vertical = null;
$this->_textRotation = NULL; $this->textRotation = null;
} }
} }
/** /**
* Get the shared style component for the currently active cell in currently active sheet. * Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor * Only used for style supervisor
* *
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function getSharedComponent() public function getSharedComponent()
{ {
return $this->_parent->getSharedComponent()->getAlignment(); return $this->parent->getSharedComponent()->getAlignment();
} }
/** /**
* Build style array from subcomponents * Build style array from subcomponents
* *
* @param array $array * @param array $array
* @return array * @return array
*/ */
public function getStyleArray($array) public function getStyleArray($array)
{ {
return array('alignment' => $array); return array('alignment' => $array);
} }
/** /**
* Apply styles from array * Apply styles from array
* *
* <code> * <code>
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getAlignment()->applyFromArray( * $objPHPExcel->getActiveSheet()->getStyle('B2')->getAlignment()->applyFromArray(
* array( * array(
* 'horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER, * 'horizontal' => PHPExcel_Style_Alignment::HORIZONTAL_CENTER,
* 'vertical' => PHPExcel_Style_Alignment::VERTICAL_CENTER, * 'vertical' => PHPExcel_Style_Alignment::VERTICAL_CENTER,
* 'rotation' => 0, * 'rotation' => 0,
* 'wrap' => TRUE * 'wrap' => TRUE
* ) * )
* ); * );
* </code> * </code>
* *
* @param array $pStyles Array containing style information * @param array $pStyles Array containing style information
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function applyFromArray($pStyles = NULL) { public function applyFromArray($pStyles = null)
if (is_array($pStyles)) { {
if ($this->_isSupervisor) { if (is_array($pStyles)) {
$this->getActiveSheet()->getStyle($this->getSelectedCells()) if ($this->isSupervisor) {
->applyFromArray($this->getStyleArray($pStyles)); $this->getActiveSheet()->getStyle($this->getSelectedCells())
} else { ->applyFromArray($this->getStyleArray($pStyles));
if (isset($pStyles['horizontal'])) { } else {
$this->setHorizontal($pStyles['horizontal']); if (isset($pStyles['horizontal'])) {
} $this->setHorizontal($pStyles['horizontal']);
if (isset($pStyles['vertical'])) { }
$this->setVertical($pStyles['vertical']); if (isset($pStyles['vertical'])) {
} $this->setVertical($pStyles['vertical']);
if (isset($pStyles['rotation'])) { }
$this->setTextRotation($pStyles['rotation']); if (isset($pStyles['rotation'])) {
} $this->setTextRotation($pStyles['rotation']);
if (isset($pStyles['wrap'])) { }
$this->setWrapText($pStyles['wrap']); if (isset($pStyles['wrap'])) {
} $this->setWrapText($pStyles['wrap']);
if (isset($pStyles['shrinkToFit'])) { }
$this->setShrinkToFit($pStyles['shrinkToFit']); if (isset($pStyles['shrinkToFit'])) {
} $this->setShrinkToFit($pStyles['shrinkToFit']);
if (isset($pStyles['indent'])) { }
$this->setIndent($pStyles['indent']); if (isset($pStyles['indent'])) {
} $this->setIndent($pStyles['indent']);
if (isset($pStyles['readorder'])) { }
$this->setReadorder($pStyles['readorder']); if (isset($pStyles['readorder'])) {
} $this->setReadorder($pStyles['readorder']);
} }
} else { }
throw new PHPExcel_Exception("Invalid style array passed."); } else {
} throw new PHPExcel_Exception("Invalid style array passed.");
return $this; }
} return $this;
}
/** /**
* Get Horizontal * Get Horizontal
* *
* @return string * @return string
*/ */
public function getHorizontal() { public function getHorizontal()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getHorizontal(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getHorizontal();
return $this->_horizontal; }
} return $this->horizontal;
}
/** /**
* Set Horizontal * Set Horizontal
* *
* @param string $pValue * @param string $pValue
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function setHorizontal($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL) { public function setHorizontal($pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL)
if ($pValue == '') { {
$pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL; if ($pValue == '') {
} $pValue = PHPExcel_Style_Alignment::HORIZONTAL_GENERAL;
}
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$styleArray = $this->getStyleArray(array('horizontal' => $pValue)); $styleArray = $this->getStyleArray(array('horizontal' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} } else {
else { $this->horizontal = $pValue;
$this->_horizontal = $pValue; }
} return $this;
return $this; }
}
/** /**
* Get Vertical * Get Vertical
* *
* @return string * @return string
*/ */
public function getVertical() { public function getVertical()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getVertical(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getVertical();
return $this->_vertical; }
} return $this->vertical;
}
/** /**
* Set Vertical * Set Vertical
* *
* @param string $pValue * @param string $pValue
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function setVertical($pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM) { public function setVertical($pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM)
if ($pValue == '') { {
$pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM; if ($pValue == '') {
} $pValue = PHPExcel_Style_Alignment::VERTICAL_BOTTOM;
}
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$styleArray = $this->getStyleArray(array('vertical' => $pValue)); $styleArray = $this->getStyleArray(array('vertical' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} else { } else {
$this->_vertical = $pValue; $this->vertical = $pValue;
} }
return $this; return $this;
} }
/** /**
* Get TextRotation * Get TextRotation
* *
* @return int * @return int
*/ */
public function getTextRotation() { public function getTextRotation()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getTextRotation(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getTextRotation();
return $this->_textRotation; }
} return $this->textRotation;
}
/** /**
* Set TextRotation * Set TextRotation
* *
* @param int $pValue * @param int $pValue
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function setTextRotation($pValue = 0) { public function setTextRotation($pValue = 0)
// Excel2007 value 255 => PHPExcel value -165 {
if ($pValue == 255) { // Excel2007 value 255 => PHPExcel value -165
$pValue = -165; if ($pValue == 255) {
} $pValue = -165;
}
// Set rotation // Set rotation
if ( ($pValue >= -90 && $pValue <= 90) || $pValue == -165 ) { if (($pValue >= -90 && $pValue <= 90) || $pValue == -165) {
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$styleArray = $this->getStyleArray(array('rotation' => $pValue)); $styleArray = $this->getStyleArray(array('rotation' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} else { } else {
$this->_textRotation = $pValue; $this->textRotation = $pValue;
} }
} else { } else {
throw new PHPExcel_Exception("Text rotation should be a value between -90 and 90."); throw new PHPExcel_Exception("Text rotation should be a value between -90 and 90.");
} }
return $this; return $this;
} }
/** /**
* Get Wrap Text * Get Wrap Text
* *
* @return boolean * @return boolean
*/ */
public function getWrapText() { public function getWrapText()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getWrapText(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getWrapText();
return $this->_wrapText; }
} return $this->wrapText;
}
/** /**
* Set Wrap Text * Set Wrap Text
* *
* @param boolean $pValue * @param boolean $pValue
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function setWrapText($pValue = FALSE) { public function setWrapText($pValue = false)
if ($pValue == '') { {
$pValue = FALSE; if ($pValue == '') {
} $pValue = false;
if ($this->_isSupervisor) { }
$styleArray = $this->getStyleArray(array('wrap' => $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('wrap' => $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_wrapText = $pValue; } else {
} $this->wrapText = $pValue;
return $this; }
} return $this;
}
/** /**
* Get Shrink to fit * Get Shrink to fit
* *
* @return boolean * @return boolean
*/ */
public function getShrinkToFit() { public function getShrinkToFit()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getShrinkToFit(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getShrinkToFit();
return $this->_shrinkToFit; }
} return $this->shrinkToFit;
}
/** /**
* Set Shrink to fit * Set Shrink to fit
* *
* @param boolean $pValue * @param boolean $pValue
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function setShrinkToFit($pValue = FALSE) { public function setShrinkToFit($pValue = false)
if ($pValue == '') { {
$pValue = FALSE; if ($pValue == '') {
} $pValue = false;
if ($this->_isSupervisor) { }
$styleArray = $this->getStyleArray(array('shrinkToFit' => $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('shrinkToFit' => $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_shrinkToFit = $pValue; } else {
} $this->shrinkToFit = $pValue;
return $this; }
} return $this;
}
/** /**
* Get indent * Get indent
* *
* @return int * @return int
*/ */
public function getIndent() { public function getIndent()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getIndent(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getIndent();
return $this->_indent; }
} return $this->indent;
}
/** /**
* Set indent * Set indent
* *
* @param int $pValue * @param int $pValue
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function setIndent($pValue = 0) { public function setIndent($pValue = 0)
if ($pValue > 0) { {
if ($this->getHorizontal() != self::HORIZONTAL_GENERAL && if ($pValue > 0) {
$this->getHorizontal() != self::HORIZONTAL_LEFT && if ($this->getHorizontal() != self::HORIZONTAL_GENERAL &&
$this->getHorizontal() != self::HORIZONTAL_RIGHT) { $this->getHorizontal() != self::HORIZONTAL_LEFT &&
$pValue = 0; // indent not supported $this->getHorizontal() != self::HORIZONTAL_RIGHT) {
} $pValue = 0; // indent not supported
} }
if ($this->_isSupervisor) { }
$styleArray = $this->getStyleArray(array('indent' => $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('indent' => $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_indent = $pValue; } else {
} $this->indent = $pValue;
return $this; }
} return $this;
}
/** /**
* Get read order * Get read order
* *
* @return integer * @return integer
*/ */
public function getReadorder() { public function getReadorder()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getReadorder(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getReadorder();
return $this->_readorder; }
} return $this->readorder;
}
/** /**
* Set read order * Set read order
* *
* @param int $pValue * @param int $pValue
* @return PHPExcel_Style_Alignment * @return PHPExcel_Style_Alignment
*/ */
public function setReadorder($pValue = 0) { public function setReadorder($pValue = 0)
if ($pValue < 0 || $pValue > 2) { {
if ($pValue < 0 || $pValue > 2) {
$pValue = 0; $pValue = 0;
} }
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$styleArray = $this->getStyleArray(array('readorder' => $pValue)); $styleArray = $this->getStyleArray(array('readorder' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} else { } else {
$this->_readorder = $pValue; $this->readorder = $pValue;
} }
return $this; return $this;
} }
/**
* Get hash code
*
* @return string Hash code
*/
public function getHashCode() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->_horizontal
. $this->_vertical
. $this->_textRotation
. ($this->_wrapText ? 't' : 'f')
. ($this->_shrinkToFit ? 't' : 'f')
. $this->_indent
. $this->_readorder
. __CLASS__
);
}
/**
* Get hash code
*
* @return string Hash code
*/
public function getHashCode()
{
if ($this->isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->horizontal .
$this->vertical .
$this->textRotation .
($this->wrapText ? 't' : 'f') .
($this->shrinkToFit ? 't' : 'f') .
$this->indent .
$this->readorder .
__CLASS__
);
}
} }

View File

@ -1,6 +1,7 @@
<?php <?php
/** /**
* PHPExcel * PHPExcel_Style_Border
* *
* Copyright (c) 2006 - 2015 PHPExcel * Copyright (c) 2006 - 2015 PHPExcel
* *
@ -19,276 +20,263 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* @category PHPExcel * @category PHPExcel
* @package PHPExcel_Style * @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/
/**
* PHPExcel_Style_Border
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable class PHPExcel_Style_Border extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
{ {
/* Border style */ /* Border style */
const BORDER_NONE = 'none'; const BORDER_NONE = 'none';
const BORDER_DASHDOT = 'dashDot'; const BORDER_DASHDOT = 'dashDot';
const BORDER_DASHDOTDOT = 'dashDotDot'; const BORDER_DASHDOTDOT = 'dashDotDot';
const BORDER_DASHED = 'dashed'; const BORDER_DASHED = 'dashed';
const BORDER_DOTTED = 'dotted'; const BORDER_DOTTED = 'dotted';
const BORDER_DOUBLE = 'double'; const BORDER_DOUBLE = 'double';
const BORDER_HAIR = 'hair'; const BORDER_HAIR = 'hair';
const BORDER_MEDIUM = 'medium'; const BORDER_MEDIUM = 'medium';
const BORDER_MEDIUMDASHDOT = 'mediumDashDot'; const BORDER_MEDIUMDASHDOT = 'mediumDashDot';
const BORDER_MEDIUMDASHDOTDOT = 'mediumDashDotDot'; const BORDER_MEDIUMDASHDOTDOT = 'mediumDashDotDot';
const BORDER_MEDIUMDASHED = 'mediumDashed'; const BORDER_MEDIUMDASHED = 'mediumDashed';
const BORDER_SLANTDASHDOT = 'slantDashDot'; const BORDER_SLANTDASHDOT = 'slantDashDot';
const BORDER_THICK = 'thick'; const BORDER_THICK = 'thick';
const BORDER_THIN = 'thin'; const BORDER_THIN = 'thin';
/** /**
* Border style * Border style
* *
* @var string * @var string
*/ */
protected $_borderStyle = PHPExcel_Style_Border::BORDER_NONE; protected $borderStyle = PHPExcel_Style_Border::BORDER_NONE;
/** /**
* Border color * Border color
* *
* @var PHPExcel_Style_Color * @var PHPExcel_Style_Color
*/ */
protected $_color; protected $color;
/** /**
* Parent property name * Parent property name
* *
* @var string * @var string
*/ */
protected $_parentPropertyName; protected $parentPropertyName;
/** /**
* Create a new PHPExcel_Style_Border * Create a new PHPExcel_Style_Border
* *
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not * @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not * @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
*/ */
public function __construct($isSupervisor = FALSE, $isConditional = FALSE) public function __construct($isSupervisor = false, $isConditional = false)
{ {
// Supervisor? // Supervisor?
parent::__construct($isSupervisor); parent::__construct($isSupervisor);
// Initialise values // Initialise values
$this->_color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor); $this->color = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor);
// bind parent if we are a supervisor // bind parent if we are a supervisor
if ($isSupervisor) { if ($isSupervisor) {
$this->_color->bindParent($this, '_color'); $this->color->bindParent($this, 'color');
} }
} }
/** /**
* Bind parent. Only used for supervisor * Bind parent. Only used for supervisor
* *
* @param PHPExcel_Style_Borders $parent * @param PHPExcel_Style_Borders $parent
* @param string $parentPropertyName * @param string $parentPropertyName
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
*/ */
public function bindParent($parent, $parentPropertyName=NULL) public function bindParent($parent, $parentPropertyName = null)
{ {
$this->_parent = $parent; $this->parent = $parent;
$this->_parentPropertyName = $parentPropertyName; $this->parentPropertyName = $parentPropertyName;
return $this; return $this;
} }
/** /**
* Get the shared style component for the currently active cell in currently active sheet. * Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor * Only used for style supervisor
* *
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
*/ */
public function getSharedComponent() public function getSharedComponent()
{ {
switch ($this->_parentPropertyName) { switch ($this->parentPropertyName) {
case '_allBorders': case 'allBorders':
case '_horizontal': case 'horizontal':
case '_inside': case 'inside':
case '_outline': case 'outline':
case '_vertical': case 'vertical':
throw new PHPExcel_Exception('Cannot get shared component for a pseudo-border.'); throw new PHPExcel_Exception('Cannot get shared component for a pseudo-border.');
break; break;
case '_bottom': case 'bottom':
return $this->_parent->getSharedComponent()->getBottom(); break; return $this->parent->getSharedComponent()->getBottom();
case '_diagonal': case 'diagonal':
return $this->_parent->getSharedComponent()->getDiagonal(); break; return $this->parent->getSharedComponent()->getDiagonal();
case '_left': case 'left':
return $this->_parent->getSharedComponent()->getLeft(); break; return $this->parent->getSharedComponent()->getLeft();
case '_right': case 'right':
return $this->_parent->getSharedComponent()->getRight(); break; return $this->parent->getSharedComponent()->getRight();
case '_top': case 'top':
return $this->_parent->getSharedComponent()->getTop(); break; return $this->parent->getSharedComponent()->getTop();
}
}
} /**
} * Build style array from subcomponents
*
* @param array $array
* @return array
*/
public function getStyleArray($array)
{
switch ($this->parentPropertyName) {
case 'allBorders':
case 'bottom':
case 'diagonal':
case 'horizontal':
case 'inside':
case 'left':
case 'outline':
case 'right':
case 'top':
case 'vertical':
$key = strtolower('vertical');
break;
}
return $this->parent->getStyleArray(array($key => $array));
}
/** /**
* Build style array from subcomponents * Apply styles from array
* *
* @param array $array * <code>
* @return array * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->getTop()->applyFromArray(
*/ * array(
public function getStyleArray($array) * 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
{ * 'color' => array(
switch ($this->_parentPropertyName) { * 'rgb' => '808080'
case '_allBorders': * )
$key = 'allborders'; break; * )
case '_bottom': * );
$key = 'bottom'; break; * </code>
case '_diagonal': *
$key = 'diagonal'; break; * @param array $pStyles Array containing style information
case '_horizontal': * @throws PHPExcel_Exception
$key = 'horizontal'; break; * @return PHPExcel_Style_Border
case '_inside': */
$key = 'inside'; break; public function applyFromArray($pStyles = null)
case '_left': {
$key = 'left'; break; if (is_array($pStyles)) {
case '_outline': if ($this->isSupervisor) {
$key = 'outline'; break; $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
case '_right': } else {
$key = 'right'; break; if (isset($pStyles['style'])) {
case '_top': $this->setBorderStyle($pStyles['style']);
$key = 'top'; break; }
case '_vertical': if (isset($pStyles['color'])) {
$key = 'vertical'; break; $this->getColor()->applyFromArray($pStyles['color']);
} }
return $this->_parent->getStyleArray(array($key => $array)); }
} } else {
throw new PHPExcel_Exception("Invalid style array passed.");
}
return $this;
}
/** /**
* Apply styles from array * Get Border style
* *
* <code> * @return string
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->getTop()->applyFromArray( */
* array( public function getBorderStyle()
* 'style' => PHPExcel_Style_Border::BORDER_DASHDOT, {
* 'color' => array( if ($this->isSupervisor) {
* 'rgb' => '808080' return $this->getSharedComponent()->getBorderStyle();
* ) }
* ) return $this->borderStyle;
* ); }
* </code>
*
* @param array $pStyles Array containing style information
* @throws PHPExcel_Exception
* @return PHPExcel_Style_Border
*/
public function applyFromArray($pStyles = null) {
if (is_array($pStyles)) {
if ($this->_isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
} else {
if (isset($pStyles['style'])) {
$this->setBorderStyle($pStyles['style']);
}
if (isset($pStyles['color'])) {
$this->getColor()->applyFromArray($pStyles['color']);
}
}
} else {
throw new PHPExcel_Exception("Invalid style array passed.");
}
return $this;
}
/** /**
* Get Border style * Set Border style
* *
* @return string * @param string|boolean $pValue
*/ * When passing a boolean, FALSE equates PHPExcel_Style_Border::BORDER_NONE
public function getBorderStyle() { * and TRUE to PHPExcel_Style_Border::BORDER_MEDIUM
if ($this->_isSupervisor) { * @return PHPExcel_Style_Border
return $this->getSharedComponent()->getBorderStyle(); */
} public function setBorderStyle($pValue = PHPExcel_Style_Border::BORDER_NONE)
return $this->_borderStyle; {
}
/** if (empty($pValue)) {
* Set Border style $pValue = PHPExcel_Style_Border::BORDER_NONE;
* } elseif (is_bool($pValue) && $pValue) {
* @param string|boolean $pValue $pValue = PHPExcel_Style_Border::BORDER_MEDIUM;
* When passing a boolean, FALSE equates PHPExcel_Style_Border::BORDER_NONE }
* and TRUE to PHPExcel_Style_Border::BORDER_MEDIUM if ($this->isSupervisor) {
* @return PHPExcel_Style_Border $styleArray = $this->getStyleArray(array('style' => $pValue));
*/ $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
public function setBorderStyle($pValue = PHPExcel_Style_Border::BORDER_NONE) { } else {
$this->borderStyle = $pValue;
}
return $this;
}
if (empty($pValue)) { /**
$pValue = PHPExcel_Style_Border::BORDER_NONE; * Get Border Color
} elseif(is_bool($pValue) && $pValue) { *
$pValue = PHPExcel_Style_Border::BORDER_MEDIUM; * @return PHPExcel_Style_Color
} */
if ($this->_isSupervisor) { public function getColor()
$styleArray = $this->getStyleArray(array('style' => $pValue)); {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); return $this->color;
} else { }
$this->_borderStyle = $pValue;
}
return $this;
}
/** /**
* Get Border Color * Set Border Color
* *
* @return PHPExcel_Style_Color * @param PHPExcel_Style_Color $pValue
*/ * @throws PHPExcel_Exception
public function getColor() { * @return PHPExcel_Style_Border
return $this->_color; */
} public function setColor(PHPExcel_Style_Color $pValue = null)
{
// make sure parameter is a real color and not a supervisor
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
/** if ($this->isSupervisor) {
* Set Border Color $styleArray = $this->getColor()->getStyleArray(array('argb' => $color->getARGB()));
* $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
* @param PHPExcel_Style_Color $pValue } else {
* @throws PHPExcel_Exception $this->color = $color;
* @return PHPExcel_Style_Border }
*/ return $this;
public function setColor(PHPExcel_Style_Color $pValue = null) { }
// make sure parameter is a real color and not a supervisor
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
if ($this->_isSupervisor) {
$styleArray = $this->getColor()->getStyleArray(array('argb' => $color->getARGB()));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} else {
$this->_color = $color;
}
return $this;
}
/**
* Get hash code
*
* @return string Hash code
*/
public function getHashCode() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->_borderStyle
. $this->_color->getHashCode()
. __CLASS__
);
}
/**
* Get hash code
*
* @return string Hash code
*/
public function getHashCode()
{
if ($this->isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->borderStyle .
$this->color->getHashCode() .
__CLASS__
);
}
} }

View File

@ -1,6 +1,7 @@
<?php <?php
/** /**
* PHPExcel * PHPExcel_Style_Borders
* *
* Copyright (c) 2006 - 2015 PHPExcel * Copyright (c) 2006 - 2015 PHPExcel
* *
@ -21,252 +22,245 @@
* @category PHPExcel * @category PHPExcel
* @package PHPExcel_Style * @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
/**
* PHPExcel_Style_Borders
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
{ {
/* Diagonal directions */ /* Diagonal directions */
const DIAGONAL_NONE = 0; const DIAGONAL_NONE = 0;
const DIAGONAL_UP = 1; const DIAGONAL_UP = 1;
const DIAGONAL_DOWN = 2; const DIAGONAL_DOWN = 2;
const DIAGONAL_BOTH = 3; const DIAGONAL_BOTH = 3;
/** /**
* Left * Left
* *
* @var PHPExcel_Style_Border * @var PHPExcel_Style_Border
*/
protected $_left;
/**
* Right
*
* @var PHPExcel_Style_Border
*/
protected $_right;
/**
* Top
*
* @var PHPExcel_Style_Border
*/
protected $_top;
/**
* Bottom
*
* @var PHPExcel_Style_Border
*/
protected $_bottom;
/**
* Diagonal
*
* @var PHPExcel_Style_Border
*/
protected $_diagonal;
/**
* DiagonalDirection
*
* @var int
*/
protected $_diagonalDirection;
/**
* All borders psedo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $_allBorders;
/**
* Outline psedo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $_outline;
/**
* Inside psedo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $_inside;
/**
* Vertical pseudo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $_vertical;
/**
* Horizontal pseudo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $_horizontal;
/**
* Create a new PHPExcel_Style_Borders
*
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what
* its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what
* its ramifications are
*/ */
public function __construct($isSupervisor = FALSE, $isConditional = FALSE) protected $left;
/**
* Right
*
* @var PHPExcel_Style_Border
*/
protected $right;
/**
* Top
*
* @var PHPExcel_Style_Border
*/
protected $top;
/**
* Bottom
*
* @var PHPExcel_Style_Border
*/
protected $bottom;
/**
* Diagonal
*
* @var PHPExcel_Style_Border
*/
protected $diagonal;
/**
* DiagonalDirection
*
* @var int
*/
protected $diagonalDirection;
/**
* All borders psedo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $allBorders;
/**
* Outline psedo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $outline;
/**
* Inside psedo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $inside;
/**
* Vertical pseudo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $vertical;
/**
* Horizontal pseudo-border. Only applies to supervisor.
*
* @var PHPExcel_Style_Border
*/
protected $horizontal;
/**
* Create a new PHPExcel_Style_Borders
*
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what
* its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what
* its ramifications are
*/
public function __construct($isSupervisor = false, $isConditional = false)
{ {
// Supervisor? // Supervisor?
parent::__construct($isSupervisor); parent::__construct($isSupervisor);
// Initialise values // Initialise values
$this->_left = new PHPExcel_Style_Border($isSupervisor, $isConditional); $this->left = new PHPExcel_Style_Border($isSupervisor, $isConditional);
$this->_right = new PHPExcel_Style_Border($isSupervisor, $isConditional); $this->right = new PHPExcel_Style_Border($isSupervisor, $isConditional);
$this->_top = new PHPExcel_Style_Border($isSupervisor, $isConditional); $this->top = new PHPExcel_Style_Border($isSupervisor, $isConditional);
$this->_bottom = new PHPExcel_Style_Border($isSupervisor, $isConditional); $this->bottom = new PHPExcel_Style_Border($isSupervisor, $isConditional);
$this->_diagonal = new PHPExcel_Style_Border($isSupervisor, $isConditional); $this->diagonal = new PHPExcel_Style_Border($isSupervisor, $isConditional);
$this->_diagonalDirection = PHPExcel_Style_Borders::DIAGONAL_NONE; $this->diagonalDirection = PHPExcel_Style_Borders::DIAGONAL_NONE;
// Specially for supervisor // Specially for supervisor
if ($isSupervisor) { if ($isSupervisor) {
// Initialize pseudo-borders // Initialize pseudo-borders
$this->_allBorders = new PHPExcel_Style_Border(TRUE); $this->allBorders = new PHPExcel_Style_Border(true);
$this->_outline = new PHPExcel_Style_Border(TRUE); $this->outline = new PHPExcel_Style_Border(true);
$this->_inside = new PHPExcel_Style_Border(TRUE); $this->inside = new PHPExcel_Style_Border(true);
$this->_vertical = new PHPExcel_Style_Border(TRUE); $this->vertical = new PHPExcel_Style_Border(true);
$this->_horizontal = new PHPExcel_Style_Border(TRUE); $this->horizontal = new PHPExcel_Style_Border(true);
// bind parent if we are a supervisor // bind parent if we are a supervisor
$this->_left->bindParent($this, '_left'); $this->left->bindParent($this, 'left');
$this->_right->bindParent($this, '_right'); $this->right->bindParent($this, 'right');
$this->_top->bindParent($this, '_top'); $this->top->bindParent($this, 'top');
$this->_bottom->bindParent($this, '_bottom'); $this->bottom->bindParent($this, 'bottom');
$this->_diagonal->bindParent($this, '_diagonal'); $this->diagonal->bindParent($this, 'diagonal');
$this->_allBorders->bindParent($this, '_allBorders'); $this->allBorders->bindParent($this, 'allBorders');
$this->_outline->bindParent($this, '_outline'); $this->outline->bindParent($this, 'outline');
$this->_inside->bindParent($this, '_inside'); $this->inside->bindParent($this, 'inside');
$this->_vertical->bindParent($this, '_vertical'); $this->vertical->bindParent($this, 'vertical');
$this->_horizontal->bindParent($this, '_horizontal'); $this->horizontal->bindParent($this, 'horizontal');
} }
} }
/** /**
* Get the shared style component for the currently active cell in currently active sheet. * Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor * Only used for style supervisor
* *
* @return PHPExcel_Style_Borders * @return PHPExcel_Style_Borders
*/ */
public function getSharedComponent() public function getSharedComponent()
{ {
return $this->_parent->getSharedComponent()->getBorders(); return $this->parent->getSharedComponent()->getBorders();
} }
/** /**
* Build style array from subcomponents * Build style array from subcomponents
* *
* @param array $array * @param array $array
* @return array * @return array
*/ */
public function getStyleArray($array) public function getStyleArray($array)
{ {
return array('borders' => $array); return array('borders' => $array);
} }
/** /**
* Apply styles from array * Apply styles from array
* *
* <code> * <code>
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray( * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
* array( * array(
* 'bottom' => array( * 'bottom' => array(
* 'style' => PHPExcel_Style_Border::BORDER_DASHDOT, * 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
* 'color' => array( * 'color' => array(
* 'rgb' => '808080' * 'rgb' => '808080'
* ) * )
* ), * ),
* 'top' => array( * 'top' => array(
* 'style' => PHPExcel_Style_Border::BORDER_DASHDOT, * 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
* 'color' => array( * 'color' => array(
* 'rgb' => '808080' * 'rgb' => '808080'
* ) * )
* ) * )
* ) * )
* ); * );
* </code> * </code>
* <code> * <code>
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray( * $objPHPExcel->getActiveSheet()->getStyle('B2')->getBorders()->applyFromArray(
* array( * array(
* 'allborders' => array( * 'allborders' => array(
* 'style' => PHPExcel_Style_Border::BORDER_DASHDOT, * 'style' => PHPExcel_Style_Border::BORDER_DASHDOT,
* 'color' => array( * 'color' => array(
* 'rgb' => '808080' * 'rgb' => '808080'
* ) * )
* ) * )
* ) * )
* ); * );
* </code> * </code>
* *
* @param array $pStyles Array containing style information * @param array $pStyles Array containing style information
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Borders * @return PHPExcel_Style_Borders
*/ */
public function applyFromArray($pStyles = null) { public function applyFromArray($pStyles = null)
if (is_array($pStyles)) { {
if ($this->_isSupervisor) { if (is_array($pStyles)) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles)); if ($this->isSupervisor) {
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
if (array_key_exists('left', $pStyles)) { } else {
$this->getLeft()->applyFromArray($pStyles['left']); if (array_key_exists('left', $pStyles)) {
} $this->getLeft()->applyFromArray($pStyles['left']);
if (array_key_exists('right', $pStyles)) { }
$this->getRight()->applyFromArray($pStyles['right']); if (array_key_exists('right', $pStyles)) {
} $this->getRight()->applyFromArray($pStyles['right']);
if (array_key_exists('top', $pStyles)) { }
$this->getTop()->applyFromArray($pStyles['top']); if (array_key_exists('top', $pStyles)) {
} $this->getTop()->applyFromArray($pStyles['top']);
if (array_key_exists('bottom', $pStyles)) { }
$this->getBottom()->applyFromArray($pStyles['bottom']); if (array_key_exists('bottom', $pStyles)) {
} $this->getBottom()->applyFromArray($pStyles['bottom']);
if (array_key_exists('diagonal', $pStyles)) { }
$this->getDiagonal()->applyFromArray($pStyles['diagonal']); if (array_key_exists('diagonal', $pStyles)) {
} $this->getDiagonal()->applyFromArray($pStyles['diagonal']);
if (array_key_exists('diagonaldirection', $pStyles)) { }
$this->setDiagonalDirection($pStyles['diagonaldirection']); if (array_key_exists('diagonaldirection', $pStyles)) {
} $this->setDiagonalDirection($pStyles['diagonaldirection']);
if (array_key_exists('allborders', $pStyles)) { }
$this->getLeft()->applyFromArray($pStyles['allborders']); if (array_key_exists('allborders', $pStyles)) {
$this->getRight()->applyFromArray($pStyles['allborders']); $this->getLeft()->applyFromArray($pStyles['allborders']);
$this->getTop()->applyFromArray($pStyles['allborders']); $this->getRight()->applyFromArray($pStyles['allborders']);
$this->getBottom()->applyFromArray($pStyles['allborders']); $this->getTop()->applyFromArray($pStyles['allborders']);
} $this->getBottom()->applyFromArray($pStyles['allborders']);
} }
} else { }
throw new PHPExcel_Exception("Invalid style array passed."); } else {
} throw new PHPExcel_Exception("Invalid style array passed.");
return $this; }
} return $this;
}
/** /**
* Get Left * Get Left
* *
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
*/ */
public function getLeft() { public function getLeft()
return $this->_left; {
return $this->left;
} }
/** /**
@ -274,8 +268,9 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* *
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
*/ */
public function getRight() { public function getRight()
return $this->_right; {
return $this->right;
} }
/** /**
@ -283,8 +278,9 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* *
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
*/ */
public function getTop() { public function getTop()
return $this->_top; {
return $this->top;
} }
/** /**
@ -292,8 +288,9 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* *
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
*/ */
public function getBottom() { public function getBottom()
return $this->_bottom; {
return $this->bottom;
} }
/** /**
@ -301,8 +298,9 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* *
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
*/ */
public function getDiagonal() { public function getDiagonal()
return $this->_diagonal; {
return $this->diagonal;
} }
/** /**
@ -311,11 +309,12 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
*/ */
public function getAllBorders() { public function getAllBorders()
if (!$this->_isSupervisor) { {
throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.'); if (!$this->isSupervisor) {
} throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
return $this->_allBorders; }
return $this->allBorders;
} }
/** /**
@ -324,11 +323,12 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* @return boolean * @return boolean
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
*/ */
public function getOutline() { public function getOutline()
if (!$this->_isSupervisor) { {
throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.'); if (!$this->isSupervisor) {
} throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
return $this->_outline; }
return $this->outline;
} }
/** /**
@ -337,11 +337,12 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* @return boolean * @return boolean
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
*/ */
public function getInside() { public function getInside()
if (!$this->_isSupervisor) { {
throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.'); if (!$this->isSupervisor) {
} throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
return $this->_inside; }
return $this->inside;
} }
/** /**
@ -350,11 +351,12 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
*/ */
public function getVertical() { public function getVertical()
if (!$this->_isSupervisor) { {
throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.'); if (!$this->isSupervisor) {
} throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
return $this->_vertical; }
return $this->vertical;
} }
/** /**
@ -363,11 +365,12 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* @return PHPExcel_Style_Border * @return PHPExcel_Style_Border
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
*/ */
public function getHorizontal() { public function getHorizontal()
if (!$this->_isSupervisor) { {
throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.'); if (!$this->isSupervisor) {
} throw new PHPExcel_Exception('Can only get pseudo-border for supervisor.');
return $this->_horizontal; }
return $this->horizontal;
} }
/** /**
@ -375,11 +378,12 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* *
* @return int * @return int
*/ */
public function getDiagonalDirection() { public function getDiagonalDirection()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getDiagonalDirection(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getDiagonalDirection();
return $this->_diagonalDirection; }
return $this->diagonalDirection;
} }
/** /**
@ -388,37 +392,38 @@ class PHPExcel_Style_Borders extends PHPExcel_Style_Supervisor implements PHPExc
* @param int $pValue * @param int $pValue
* @return PHPExcel_Style_Borders * @return PHPExcel_Style_Borders
*/ */
public function setDiagonalDirection($pValue = PHPExcel_Style_Borders::DIAGONAL_NONE) { public function setDiagonalDirection($pValue = PHPExcel_Style_Borders::DIAGONAL_NONE)
{
if ($pValue == '') { if ($pValue == '') {
$pValue = PHPExcel_Style_Borders::DIAGONAL_NONE; $pValue = PHPExcel_Style_Borders::DIAGONAL_NONE;
} }
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$styleArray = $this->getStyleArray(array('diagonaldirection' => $pValue)); $styleArray = $this->getStyleArray(array('diagonaldirection' => $pValue));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} else { } else {
$this->_diagonalDirection = $pValue; $this->diagonalDirection = $pValue;
} }
return $this; return $this;
} }
/** /**
* Get hash code * Get hash code
* *
* @return string Hash code * @return string Hash code
*/ */
public function getHashCode() { public function getHashCode()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getHashcode(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getHashcode();
return md5( }
$this->getLeft()->getHashCode() return md5(
. $this->getRight()->getHashCode() $this->getLeft()->getHashCode() .
. $this->getTop()->getHashCode() $this->getRight()->getHashCode() .
. $this->getBottom()->getHashCode() $this->getTop()->getHashCode() .
. $this->getDiagonal()->getHashCode() $this->getBottom()->getHashCode() .
. $this->getDiagonalDirection() $this->getDiagonal()->getHashCode() .
. __CLASS__ $this->getDiagonalDirection() .
); __CLASS__
);
} }
} }

View File

@ -1,6 +1,7 @@
<?php <?php
/** /**
* PHPExcel * PHPExcel_Style_Color
* *
* Copyright (c) 2006 - 2015 PHPExcel * Copyright (c) 2006 - 2015 PHPExcel
* *
@ -19,411 +20,424 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* @category PHPExcel * @category PHPExcel
* @package PHPExcel_Style * @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
/**
* PHPExcel_Style_Color
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
*/
class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable class PHPExcel_Style_Color extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
{ {
/* Colors */ /* Colors */
const COLOR_BLACK = 'FF000000'; const COLOR_BLACK = 'FF000000';
const COLOR_WHITE = 'FFFFFFFF'; const COLOR_WHITE = 'FFFFFFFF';
const COLOR_RED = 'FFFF0000'; const COLOR_RED = 'FFFF0000';
const COLOR_DARKRED = 'FF800000'; const COLOR_DARKRED = 'FF800000';
const COLOR_BLUE = 'FF0000FF'; const COLOR_BLUE = 'FF0000FF';
const COLOR_DARKBLUE = 'FF000080'; const COLOR_DARKBLUE = 'FF000080';
const COLOR_GREEN = 'FF00FF00'; const COLOR_GREEN = 'FF00FF00';
const COLOR_DARKGREEN = 'FF008000'; const COLOR_DARKGREEN = 'FF008000';
const COLOR_YELLOW = 'FFFFFF00'; const COLOR_YELLOW = 'FFFFFF00';
const COLOR_DARKYELLOW = 'FF808000'; const COLOR_DARKYELLOW = 'FF808000';
/** /**
* Indexed colors array * Indexed colors array
* *
* @var array * @var array
*/ */
protected static $_indexedColors; protected static $indexedColors;
/** /**
* ARGB - Alpha RGB * ARGB - Alpha RGB
* *
* @var string * @var string
*/ */
protected $_argb = NULL; protected $argb = null;
/** /**
* Parent property name * Parent property name
* *
* @var string * @var string
*/ */
protected $_parentPropertyName; protected $parentPropertyName;
/** /**
* Create a new PHPExcel_Style_Color * Create a new PHPExcel_Style_Color
* *
* @param string $pARGB ARGB value for the colour * @param string $pARGB ARGB value for the colour
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not * @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not * @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
*/ */
public function __construct($pARGB = PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor = FALSE, $isConditional = FALSE) public function __construct($pARGB = PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor = false, $isConditional = false)
{ {
// Supervisor? // Supervisor?
parent::__construct($isSupervisor); parent::__construct($isSupervisor);
// Initialise values // Initialise values
if (!$isConditional) { if (!$isConditional) {
$this->_argb = $pARGB; $this->argb = $pARGB;
} }
} }
/** /**
* Bind parent. Only used for supervisor * Bind parent. Only used for supervisor
* *
* @param mixed $parent * @param mixed $parent
* @param string $parentPropertyName * @param string $parentPropertyName
* @return PHPExcel_Style_Color * @return PHPExcel_Style_Color
*/ */
public function bindParent($parent, $parentPropertyName=NULL) public function bindParent($parent, $parentPropertyName = null)
{ {
$this->_parent = $parent; $this->parent = $parent;
$this->_parentPropertyName = $parentPropertyName; $this->parentPropertyName = $parentPropertyName;
return $this; return $this;
} }
/** /**
* Get the shared style component for the currently active cell in currently active sheet. * Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor * Only used for style supervisor
* *
* @return PHPExcel_Style_Color * @return PHPExcel_Style_Color
*/ */
public function getSharedComponent() public function getSharedComponent()
{ {
switch ($this->_parentPropertyName) { switch ($this->parentPropertyName) {
case '_endColor': case 'endColor':
return $this->_parent->getSharedComponent()->getEndColor(); break; return $this->parent->getSharedComponent()->getEndColor();
case '_color': case 'color':
return $this->_parent->getSharedComponent()->getColor(); break; return $this->parent->getSharedComponent()->getColor();
case '_startColor': case 'startColor':
return $this->_parent->getSharedComponent()->getStartColor(); break; return $this->parent->getSharedComponent()->getStartColor();
} }
} }
/** /**
* Build style array from subcomponents * Build style array from subcomponents
* *
* @param array $array * @param array $array
* @return array * @return array
*/ */
public function getStyleArray($array) public function getStyleArray($array)
{ {
switch ($this->_parentPropertyName) { switch ($this->parentPropertyName) {
case '_endColor': case 'endColor':
$key = 'endcolor'; $key = 'endcolor';
break; break;
case '_color': case 'color':
$key = 'color'; $key = 'color';
break; break;
case '_startColor': case 'startColor':
$key = 'startcolor'; $key = 'startcolor';
break; break;
} }
return $this->_parent->getStyleArray(array($key => $array)); return $this->parent->getStyleArray(array($key => $array));
} }
/** /**
* Apply styles from array * Apply styles from array
* *
* <code> * <code>
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray( array('rgb' => '808080') ); * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFont()->getColor()->applyFromArray( array('rgb' => '808080') );
* </code> * </code>
* *
* @param array $pStyles Array containing style information * @param array $pStyles Array containing style information
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Color * @return PHPExcel_Style_Color
*/ */
public function applyFromArray($pStyles = NULL) { public function applyFromArray($pStyles = null)
if (is_array($pStyles)) { {
if ($this->_isSupervisor) { if (is_array($pStyles)) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles)); if ($this->isSupervisor) {
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
if (array_key_exists('rgb', $pStyles)) { } else {
$this->setRGB($pStyles['rgb']); if (array_key_exists('rgb', $pStyles)) {
} $this->setRGB($pStyles['rgb']);
if (array_key_exists('argb', $pStyles)) { }
$this->setARGB($pStyles['argb']); if (array_key_exists('argb', $pStyles)) {
} $this->setARGB($pStyles['argb']);
} }
} else { }
throw new PHPExcel_Exception("Invalid style array passed."); } else {
} throw new PHPExcel_Exception("Invalid style array passed.");
return $this; }
} return $this;
}
/** /**
* Get ARGB * Get ARGB
* *
* @return string * @return string
*/ */
public function getARGB() { public function getARGB()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getARGB(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getARGB();
return $this->_argb; }
} return $this->argb;
}
/** /**
* Set ARGB * Set ARGB
* *
* @param string $pValue * @param string $pValue
* @return PHPExcel_Style_Color * @return PHPExcel_Style_Color
*/ */
public function setARGB($pValue = PHPExcel_Style_Color::COLOR_BLACK) { public function setARGB($pValue = PHPExcel_Style_Color::COLOR_BLACK)
if ($pValue == '') { {
$pValue = PHPExcel_Style_Color::COLOR_BLACK; if ($pValue == '') {
} $pValue = PHPExcel_Style_Color::COLOR_BLACK;
if ($this->_isSupervisor) { }
$styleArray = $this->getStyleArray(array('argb' => $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('argb' => $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_argb = $pValue; } else {
} $this->argb = $pValue;
return $this; }
} return $this;
}
/** /**
* Get RGB * Get RGB
* *
* @return string * @return string
*/ */
public function getRGB() { public function getRGB()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getRGB(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getRGB();
return substr($this->_argb, 2); }
} return substr($this->argb, 2);
}
/** /**
* Set RGB * Set RGB
* *
* @param string $pValue RGB value * @param string $pValue RGB value
* @return PHPExcel_Style_Color * @return PHPExcel_Style_Color
*/ */
public function setRGB($pValue = '000000') { public function setRGB($pValue = '000000')
if ($pValue == '') { {
$pValue = '000000'; if ($pValue == '') {
} $pValue = '000000';
if ($this->_isSupervisor) { }
$styleArray = $this->getStyleArray(array('argb' => 'FF' . $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('argb' => 'FF' . $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_argb = 'FF' . $pValue; } else {
} $this->argb = 'FF' . $pValue;
return $this; }
} return $this;
}
/** /**
* Get a specified colour component of an RGB value * Get a specified colour component of an RGB value
* *
* @private * @private
* @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
* @param int $offset Position within the RGB value to extract * @param int $offset Position within the RGB value to extract
* @param boolean $hex Flag indicating whether the component should be returned as a hex or a * @param boolean $hex Flag indicating whether the component should be returned as a hex or a
* decimal value * decimal value
* @return string The extracted colour component * @return string The extracted colour component
*/ */
private static function _getColourComponent($RGB,$offset,$hex=TRUE) { private static function getColourComponent($RGB, $offset, $hex = true)
$colour = substr($RGB, $offset, 2); {
if (!$hex) $colour = substr($RGB, $offset, 2);
$colour = hexdec($colour); if (!$hex) {
return $colour; $colour = hexdec($colour);
} }
return $colour;
}
/** /**
* Get the red colour component of an RGB value * Get the red colour component of an RGB value
* *
* @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
* @param boolean $hex Flag indicating whether the component should be returned as a hex or a * @param boolean $hex Flag indicating whether the component should be returned as a hex or a
* decimal value * decimal value
* @return string The red colour component * @return string The red colour component
*/ */
public static function getRed($RGB,$hex=TRUE) { public static function getRed($RGB, $hex = true)
return self::_getColourComponent($RGB, strlen($RGB) - 6, $hex); {
} return self::getColourComponent($RGB, strlen($RGB) - 6, $hex);
}
/** /**
* Get the green colour component of an RGB value * Get the green colour component of an RGB value
* *
* @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
* @param boolean $hex Flag indicating whether the component should be returned as a hex or a * @param boolean $hex Flag indicating whether the component should be returned as a hex or a
* decimal value * decimal value
* @return string The green colour component * @return string The green colour component
*/ */
public static function getGreen($RGB,$hex=TRUE) { public static function getGreen($RGB, $hex = true)
return self::_getColourComponent($RGB, strlen($RGB) - 4, $hex); {
} return self::getColourComponent($RGB, strlen($RGB) - 4, $hex);
}
/** /**
* Get the blue colour component of an RGB value * Get the blue colour component of an RGB value
* *
* @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE * @param string $RGB The colour as an RGB value (e.g. FF00CCCC or CCDDEE
* @param boolean $hex Flag indicating whether the component should be returned as a hex or a * @param boolean $hex Flag indicating whether the component should be returned as a hex or a
* decimal value * decimal value
* @return string The blue colour component * @return string The blue colour component
*/ */
public static function getBlue($RGB,$hex=TRUE) { public static function getBlue($RGB, $hex = true)
return self::_getColourComponent($RGB, strlen($RGB) - 2, $hex); {
} return self::getColourComponent($RGB, strlen($RGB) - 2, $hex);
}
/** /**
* Adjust the brightness of a color * Adjust the brightness of a color
* *
* @param string $hex The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE) * @param string $hex The colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
* @param float $adjustPercentage The percentage by which to adjust the colour as a float from -1 to 1 * @param float $adjustPercentage The percentage by which to adjust the colour as a float from -1 to 1
* @return string The adjusted colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE) * @return string The adjusted colour as an RGBA or RGB value (e.g. FF00CCCC or CCDDEE)
*/ */
public static function changeBrightness($hex, $adjustPercentage) { public static function changeBrightness($hex, $adjustPercentage)
$rgba = (strlen($hex) == 8); {
$rgba = (strlen($hex) == 8);
$red = self::getRed($hex, FALSE); $red = self::getRed($hex, false);
$green = self::getGreen($hex, FALSE); $green = self::getGreen($hex, false);
$blue = self::getBlue($hex, FALSE); $blue = self::getBlue($hex, false);
if ($adjustPercentage > 0) { if ($adjustPercentage > 0) {
$red += (255 - $red) * $adjustPercentage; $red += (255 - $red) * $adjustPercentage;
$green += (255 - $green) * $adjustPercentage; $green += (255 - $green) * $adjustPercentage;
$blue += (255 - $blue) * $adjustPercentage; $blue += (255 - $blue) * $adjustPercentage;
} else { } else {
$red += $red * $adjustPercentage; $red += $red * $adjustPercentage;
$green += $green * $adjustPercentage; $green += $green * $adjustPercentage;
$blue += $blue * $adjustPercentage; $blue += $blue * $adjustPercentage;
} }
if ($red < 0) $red = 0; if ($red < 0) {
elseif ($red > 255) $red = 255; $red = 0;
if ($green < 0) $green = 0; } elseif ($red > 255) {
elseif ($green > 255) $green = 255; $red = 255;
if ($blue < 0) $blue = 0; }
elseif ($blue > 255) $blue = 255; if ($green < 0) {
$green = 0;
} elseif ($green > 255) {
$green = 255;
}
if ($blue < 0) {
$blue = 0;
} elseif ($blue > 255) {
$blue = 255;
}
$rgb = strtoupper( str_pad(dechex($red), 2, '0', 0) . $rgb = strtoupper(
str_pad(dechex($green), 2, '0', 0) . str_pad(dechex($red), 2, '0', 0) .
str_pad(dechex($blue), 2, '0', 0) str_pad(dechex($green), 2, '0', 0) .
); str_pad(dechex($blue), 2, '0', 0)
return (($rgba) ? 'FF' : '') . $rgb; );
} return (($rgba) ? 'FF' : '') . $rgb;
}
/** /**
* Get indexed color * Get indexed color
* *
* @param int $pIndex Index entry point into the colour array * @param int $pIndex Index entry point into the colour array
* @param boolean $background Flag to indicate whether default background or foreground colour * @param boolean $background Flag to indicate whether default background or foreground colour
* should be returned if the indexed colour doesn't exist * should be returned if the indexed colour doesn't exist
* @return PHPExcel_Style_Color * @return PHPExcel_Style_Color
*/ */
public static function indexedColor($pIndex, $background=FALSE) { public static function indexedColor($pIndex, $background = false)
// Clean parameter {
$pIndex = intval($pIndex); // Clean parameter
$pIndex = intval($pIndex);
// Indexed colors // Indexed colors
if (is_null(self::$_indexedColors)) { if (is_null(self::$indexedColors)) {
self::$_indexedColors = array( self::$indexedColors = array(
1 => 'FF000000', // System Colour #1 - Black 1 => 'FF000000', // System Colour #1 - Black
2 => 'FFFFFFFF', // System Colour #2 - White 2 => 'FFFFFFFF', // System Colour #2 - White
3 => 'FFFF0000', // System Colour #3 - Red 3 => 'FFFF0000', // System Colour #3 - Red
4 => 'FF00FF00', // System Colour #4 - Green 4 => 'FF00FF00', // System Colour #4 - Green
5 => 'FF0000FF', // System Colour #5 - Blue 5 => 'FF0000FF', // System Colour #5 - Blue
6 => 'FFFFFF00', // System Colour #6 - Yellow 6 => 'FFFFFF00', // System Colour #6 - Yellow
7 => 'FFFF00FF', // System Colour #7- Magenta 7 => 'FFFF00FF', // System Colour #7- Magenta
8 => 'FF00FFFF', // System Colour #8- Cyan 8 => 'FF00FFFF', // System Colour #8- Cyan
9 => 'FF800000', // Standard Colour #9 9 => 'FF800000', // Standard Colour #9
10 => 'FF008000', // Standard Colour #10 10 => 'FF008000', // Standard Colour #10
11 => 'FF000080', // Standard Colour #11 11 => 'FF000080', // Standard Colour #11
12 => 'FF808000', // Standard Colour #12 12 => 'FF808000', // Standard Colour #12
13 => 'FF800080', // Standard Colour #13 13 => 'FF800080', // Standard Colour #13
14 => 'FF008080', // Standard Colour #14 14 => 'FF008080', // Standard Colour #14
15 => 'FFC0C0C0', // Standard Colour #15 15 => 'FFC0C0C0', // Standard Colour #15
16 => 'FF808080', // Standard Colour #16 16 => 'FF808080', // Standard Colour #16
17 => 'FF9999FF', // Chart Fill Colour #17 17 => 'FF9999FF', // Chart Fill Colour #17
18 => 'FF993366', // Chart Fill Colour #18 18 => 'FF993366', // Chart Fill Colour #18
19 => 'FFFFFFCC', // Chart Fill Colour #19 19 => 'FFFFFFCC', // Chart Fill Colour #19
20 => 'FFCCFFFF', // Chart Fill Colour #20 20 => 'FFCCFFFF', // Chart Fill Colour #20
21 => 'FF660066', // Chart Fill Colour #21 21 => 'FF660066', // Chart Fill Colour #21
22 => 'FFFF8080', // Chart Fill Colour #22 22 => 'FFFF8080', // Chart Fill Colour #22
23 => 'FF0066CC', // Chart Fill Colour #23 23 => 'FF0066CC', // Chart Fill Colour #23
24 => 'FFCCCCFF', // Chart Fill Colour #24 24 => 'FFCCCCFF', // Chart Fill Colour #24
25 => 'FF000080', // Chart Line Colour #25 25 => 'FF000080', // Chart Line Colour #25
26 => 'FFFF00FF', // Chart Line Colour #26 26 => 'FFFF00FF', // Chart Line Colour #26
27 => 'FFFFFF00', // Chart Line Colour #27 27 => 'FFFFFF00', // Chart Line Colour #27
28 => 'FF00FFFF', // Chart Line Colour #28 28 => 'FF00FFFF', // Chart Line Colour #28
29 => 'FF800080', // Chart Line Colour #29 29 => 'FF800080', // Chart Line Colour #29
30 => 'FF800000', // Chart Line Colour #30 30 => 'FF800000', // Chart Line Colour #30
31 => 'FF008080', // Chart Line Colour #31 31 => 'FF008080', // Chart Line Colour #31
32 => 'FF0000FF', // Chart Line Colour #32 32 => 'FF0000FF', // Chart Line Colour #32
33 => 'FF00CCFF', // Standard Colour #33 33 => 'FF00CCFF', // Standard Colour #33
34 => 'FFCCFFFF', // Standard Colour #34 34 => 'FFCCFFFF', // Standard Colour #34
35 => 'FFCCFFCC', // Standard Colour #35 35 => 'FFCCFFCC', // Standard Colour #35
36 => 'FFFFFF99', // Standard Colour #36 36 => 'FFFFFF99', // Standard Colour #36
37 => 'FF99CCFF', // Standard Colour #37 37 => 'FF99CCFF', // Standard Colour #37
38 => 'FFFF99CC', // Standard Colour #38 38 => 'FFFF99CC', // Standard Colour #38
39 => 'FFCC99FF', // Standard Colour #39 39 => 'FFCC99FF', // Standard Colour #39
40 => 'FFFFCC99', // Standard Colour #40 40 => 'FFFFCC99', // Standard Colour #40
41 => 'FF3366FF', // Standard Colour #41 41 => 'FF3366FF', // Standard Colour #41
42 => 'FF33CCCC', // Standard Colour #42 42 => 'FF33CCCC', // Standard Colour #42
43 => 'FF99CC00', // Standard Colour #43 43 => 'FF99CC00', // Standard Colour #43
44 => 'FFFFCC00', // Standard Colour #44 44 => 'FFFFCC00', // Standard Colour #44
45 => 'FFFF9900', // Standard Colour #45 45 => 'FFFF9900', // Standard Colour #45
46 => 'FFFF6600', // Standard Colour #46 46 => 'FFFF6600', // Standard Colour #46
47 => 'FF666699', // Standard Colour #47 47 => 'FF666699', // Standard Colour #47
48 => 'FF969696', // Standard Colour #48 48 => 'FF969696', // Standard Colour #48
49 => 'FF003366', // Standard Colour #49 49 => 'FF003366', // Standard Colour #49
50 => 'FF339966', // Standard Colour #50 50 => 'FF339966', // Standard Colour #50
51 => 'FF003300', // Standard Colour #51 51 => 'FF003300', // Standard Colour #51
52 => 'FF333300', // Standard Colour #52 52 => 'FF333300', // Standard Colour #52
53 => 'FF993300', // Standard Colour #53 53 => 'FF993300', // Standard Colour #53
54 => 'FF993366', // Standard Colour #54 54 => 'FF993366', // Standard Colour #54
55 => 'FF333399', // Standard Colour #55 55 => 'FF333399', // Standard Colour #55
56 => 'FF333333' // Standard Colour #56 56 => 'FF333333' // Standard Colour #56
); );
} }
if (array_key_exists($pIndex, self::$_indexedColors)) { if (array_key_exists($pIndex, self::$indexedColors)) {
return new PHPExcel_Style_Color(self::$_indexedColors[$pIndex]); return new PHPExcel_Style_Color(self::$indexedColors[$pIndex]);
} }
if ($background) { if ($background) {
return new PHPExcel_Style_Color('FFFFFFFF'); return new PHPExcel_Style_Color(self::COLOR_WHITE);
} }
return new PHPExcel_Style_Color('FF000000'); return new PHPExcel_Style_Color(self::COLOR_BLACK);
} }
/**
* Get hash code
*
* @return string Hash code
*/
public function getHashCode() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->_argb
. __CLASS__
);
}
/**
* Get hash code
*
* @return string Hash code
*/
public function getHashCode()
{
if ($this->isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->argb .
__CLASS__
);
}
} }

View File

@ -21,7 +21,7 @@
* @category PHPExcel * @category PHPExcel
* @package PHPExcel_Style * @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE## * @version ##VERSION##, ##DATE##
*/ */
@ -35,72 +35,72 @@
*/ */
class PHPExcel_Style_Conditional implements PHPExcel_IComparable class PHPExcel_Style_Conditional implements PHPExcel_IComparable
{ {
/* Condition types */ /* Condition types */
const CONDITION_NONE = 'none'; const CONDITION_NONE = 'none';
const CONDITION_CELLIS = 'cellIs'; const CONDITION_CELLIS = 'cellIs';
const CONDITION_CONTAINSTEXT = 'containsText'; const CONDITION_CONTAINSTEXT = 'containsText';
const CONDITION_EXPRESSION = 'expression'; const CONDITION_EXPRESSION = 'expression';
/* Operator types */ /* Operator types */
const OPERATOR_NONE = ''; const OPERATOR_NONE = '';
const OPERATOR_BEGINSWITH = 'beginsWith'; const OPERATOR_BEGINSWITH = 'beginsWith';
const OPERATOR_ENDSWITH = 'endsWith'; const OPERATOR_ENDSWITH = 'endsWith';
const OPERATOR_EQUAL = 'equal'; const OPERATOR_EQUAL = 'equal';
const OPERATOR_GREATERTHAN = 'greaterThan'; const OPERATOR_GREATERTHAN = 'greaterThan';
const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual'; const OPERATOR_GREATERTHANOREQUAL = 'greaterThanOrEqual';
const OPERATOR_LESSTHAN = 'lessThan'; const OPERATOR_LESSTHAN = 'lessThan';
const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual'; const OPERATOR_LESSTHANOREQUAL = 'lessThanOrEqual';
const OPERATOR_NOTEQUAL = 'notEqual'; const OPERATOR_NOTEQUAL = 'notEqual';
const OPERATOR_CONTAINSTEXT = 'containsText'; const OPERATOR_CONTAINSTEXT = 'containsText';
const OPERATOR_NOTCONTAINS = 'notContains'; const OPERATOR_NOTCONTAINS = 'notContains';
const OPERATOR_BETWEEN = 'between'; const OPERATOR_BETWEEN = 'between';
/** /**
* Condition type * Condition type
* *
* @var int * @var int
*/ */
private $_conditionType; private $conditionType;
/** /**
* Operator type * Operator type
* *
* @var int * @var int
*/ */
private $_operatorType; private $operatorType;
/** /**
* Text * Text
* *
* @var string * @var string
*/ */
private $_text; private $text;
/** /**
* Condition * Condition
* *
* @var string[] * @var string[]
*/ */
private $_condition = array(); private $condition = array();
/** /**
* Style * Style
* *
* @var PHPExcel_Style * @var PHPExcel_Style
*/ */
private $_style; private $style;
/** /**
* Create a new PHPExcel_Style_Conditional * Create a new PHPExcel_Style_Conditional
*/ */
public function __construct() public function __construct()
{ {
// Initialise values // Initialise values
$this->_conditionType = PHPExcel_Style_Conditional::CONDITION_NONE; $this->conditionType = PHPExcel_Style_Conditional::CONDITION_NONE;
$this->_operatorType = PHPExcel_Style_Conditional::OPERATOR_NONE; $this->operatorType = PHPExcel_Style_Conditional::OPERATOR_NONE;
$this->_text = null; $this->text = null;
$this->_condition = array(); $this->condition = array();
$this->_style = new PHPExcel_Style(FALSE, TRUE); $this->style = new PHPExcel_Style(false, true);
} }
/** /**
@ -108,19 +108,21 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* *
* @return string * @return string
*/ */
public function getConditionType() { public function getConditionType()
return $this->_conditionType; {
return $this->conditionType;
} }
/** /**
* Set Condition type * Set Condition type
* *
* @param string $pValue PHPExcel_Style_Conditional condition type * @param string $pValue PHPExcel_Style_Conditional condition type
* @return PHPExcel_Style_Conditional * @return PHPExcel_Style_Conditional
*/ */
public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE) { public function setConditionType($pValue = PHPExcel_Style_Conditional::CONDITION_NONE)
$this->_conditionType = $pValue; {
return $this; $this->conditionType = $pValue;
return $this;
} }
/** /**
@ -128,19 +130,21 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* *
* @return string * @return string
*/ */
public function getOperatorType() { public function getOperatorType()
return $this->_operatorType; {
return $this->operatorType;
} }
/** /**
* Set Operator type * Set Operator type
* *
* @param string $pValue PHPExcel_Style_Conditional operator type * @param string $pValue PHPExcel_Style_Conditional operator type
* @return PHPExcel_Style_Conditional * @return PHPExcel_Style_Conditional
*/ */
public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE) { public function setOperatorType($pValue = PHPExcel_Style_Conditional::OPERATOR_NONE)
$this->_operatorType = $pValue; {
return $this; $this->operatorType = $pValue;
return $this;
} }
/** /**
@ -148,8 +152,9 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* *
* @return string * @return string
*/ */
public function getText() { public function getText()
return $this->_text; {
return $this->text;
} }
/** /**
@ -158,9 +163,10 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* @param string $value * @param string $value
* @return PHPExcel_Style_Conditional * @return PHPExcel_Style_Conditional
*/ */
public function setText($value = null) { public function setText($value = null)
$this->_text = $value; {
return $this; $this->text = $value;
return $this;
} }
/** /**
@ -169,26 +175,29 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* @deprecated Deprecated, use getConditions instead * @deprecated Deprecated, use getConditions instead
* @return string * @return string
*/ */
public function getCondition() { public function getCondition()
if (isset($this->_condition[0])) { {
return $this->_condition[0]; if (isset($this->condition[0])) {
} return $this->condition[0];
}
return ''; return '';
} }
/** /**
* Set Condition * Set Condition
* *
* @deprecated Deprecated, use setConditions instead * @deprecated Deprecated, use setConditions instead
* @param string $pValue Condition * @param string $pValue Condition
* @return PHPExcel_Style_Conditional * @return PHPExcel_Style_Conditional
*/ */
public function setCondition($pValue = '') { public function setCondition($pValue = '')
if (!is_array($pValue)) {
$pValue = array($pValue); if (!is_array($pValue)) {
$pValue = array($pValue);
}
return $this->setConditions($pValue); return $this->setConditions($pValue);
} }
/** /**
@ -196,33 +205,36 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* *
* @return string[] * @return string[]
*/ */
public function getConditions() { public function getConditions()
return $this->_condition; {
return $this->condition;
} }
/** /**
* Set Conditions * Set Conditions
* *
* @param string[] $pValue Condition * @param string[] $pValue Condition
* @return PHPExcel_Style_Conditional * @return PHPExcel_Style_Conditional
*/ */
public function setConditions($pValue) { public function setConditions($pValue)
if (!is_array($pValue)) {
$pValue = array($pValue); if (!is_array($pValue)) {
$pValue = array($pValue);
$this->_condition = $pValue; }
return $this; $this->condition = $pValue;
return $this;
} }
/** /**
* Add Condition * Add Condition
* *
* @param string $pValue Condition * @param string $pValue Condition
* @return PHPExcel_Style_Conditional * @return PHPExcel_Style_Conditional
*/ */
public function addCondition($pValue = '') { public function addCondition($pValue = '')
$this->_condition[] = $pValue; {
return $this; $this->condition[] = $pValue;
return $this;
} }
/** /**
@ -230,48 +242,52 @@ class PHPExcel_Style_Conditional implements PHPExcel_IComparable
* *
* @return PHPExcel_Style * @return PHPExcel_Style
*/ */
public function getStyle() { public function getStyle()
return $this->_style; {
return $this->style;
} }
/** /**
* Set Style * Set Style
* *
* @param PHPExcel_Style $pValue * @param PHPExcel_Style $pValue
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Conditional * @return PHPExcel_Style_Conditional
*/ */
public function setStyle(PHPExcel_Style $pValue = null) { public function setStyle(PHPExcel_Style $pValue = null)
$this->_style = $pValue; {
return $this; $this->style = $pValue;
return $this;
} }
/** /**
* Get hash code * Get hash code
* *
* @return string Hash code * @return string Hash code
*/ */
public function getHashCode() { public function getHashCode()
return md5( {
$this->_conditionType return md5(
. $this->_operatorType $this->conditionType .
. implode(';', $this->_condition) $this->operatorType .
. $this->_style->getHashCode() implode(';', $this->condition) .
. __CLASS__ $this->style->getHashCode() .
); __CLASS__
);
} }
/** /**
* Implement PHP __clone to create a deep clone, not just a shallow copy. * Implement PHP __clone to create a deep clone, not just a shallow copy.
*/ */
public function __clone() { public function __clone()
$vars = get_object_vars($this); {
foreach ($vars as $key => $value) { $vars = get_object_vars($this);
if (is_object($value)) { foreach ($vars as $key => $value) {
$this->$key = clone $value; if (is_object($value)) {
} else { $this->$key = clone $value;
$this->$key = $value; } else {
} $this->$key = $value;
} }
} }
}
} }

View File

@ -1,6 +1,7 @@
<?php <?php
/** /**
* PHPExcel * PHPExcel_Style_Fill
* *
* Copyright (c) 2006 - 2015 PHPExcel * Copyright (c) 2006 - 2015 PHPExcel
* *
@ -19,303 +20,303 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* @category PHPExcel * @category PHPExcel
* @package PHPExcel_Style * @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/
/**
* PHPExcel_Style_Fill
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/ */
class PHPExcel_Style_Fill extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable class PHPExcel_Style_Fill extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
{ {
/* Fill types */ /* Fill types */
const FILL_NONE = 'none'; const FILL_NONE = 'none';
const FILL_SOLID = 'solid'; const FILL_SOLID = 'solid';
const FILL_GRADIENT_LINEAR = 'linear'; const FILL_GRADIENT_LINEAR = 'linear';
const FILL_GRADIENT_PATH = 'path'; const FILL_GRADIENT_PATH = 'path';
const FILL_PATTERN_DARKDOWN = 'darkDown'; const FILL_PATTERN_DARKDOWN = 'darkDown';
const FILL_PATTERN_DARKGRAY = 'darkGray'; const FILL_PATTERN_DARKGRAY = 'darkGray';
const FILL_PATTERN_DARKGRID = 'darkGrid'; const FILL_PATTERN_DARKGRID = 'darkGrid';
const FILL_PATTERN_DARKHORIZONTAL = 'darkHorizontal'; const FILL_PATTERN_DARKHORIZONTAL = 'darkHorizontal';
const FILL_PATTERN_DARKTRELLIS = 'darkTrellis'; const FILL_PATTERN_DARKTRELLIS = 'darkTrellis';
const FILL_PATTERN_DARKUP = 'darkUp'; const FILL_PATTERN_DARKUP = 'darkUp';
const FILL_PATTERN_DARKVERTICAL = 'darkVertical'; const FILL_PATTERN_DARKVERTICAL = 'darkVertical';
const FILL_PATTERN_GRAY0625 = 'gray0625'; const FILL_PATTERN_GRAY0625 = 'gray0625';
const FILL_PATTERN_GRAY125 = 'gray125'; const FILL_PATTERN_GRAY125 = 'gray125';
const FILL_PATTERN_LIGHTDOWN = 'lightDown'; const FILL_PATTERN_LIGHTDOWN = 'lightDown';
const FILL_PATTERN_LIGHTGRAY = 'lightGray'; const FILL_PATTERN_LIGHTGRAY = 'lightGray';
const FILL_PATTERN_LIGHTGRID = 'lightGrid'; const FILL_PATTERN_LIGHTGRID = 'lightGrid';
const FILL_PATTERN_LIGHTHORIZONTAL = 'lightHorizontal'; const FILL_PATTERN_LIGHTHORIZONTAL = 'lightHorizontal';
const FILL_PATTERN_LIGHTTRELLIS = 'lightTrellis'; const FILL_PATTERN_LIGHTTRELLIS = 'lightTrellis';
const FILL_PATTERN_LIGHTUP = 'lightUp'; const FILL_PATTERN_LIGHTUP = 'lightUp';
const FILL_PATTERN_LIGHTVERTICAL = 'lightVertical'; const FILL_PATTERN_LIGHTVERTICAL = 'lightVertical';
const FILL_PATTERN_MEDIUMGRAY = 'mediumGray'; const FILL_PATTERN_MEDIUMGRAY = 'mediumGray';
/** /**
* Fill type * Fill type
* *
* @var string * @var string
*/ */
protected $_fillType = PHPExcel_Style_Fill::FILL_NONE; protected $fillType = PHPExcel_Style_Fill::FILL_NONE;
/** /**
* Rotation * Rotation
* *
* @var double * @var double
*/ */
protected $_rotation = 0; protected $rotation = 0;
/** /**
* Start color * Start color
* *
* @var PHPExcel_Style_Color * @var PHPExcel_Style_Color
*/ */
protected $_startColor; protected $startColor;
/** /**
* End color * End color
* *
* @var PHPExcel_Style_Color * @var PHPExcel_Style_Color
*/ */
protected $_endColor; protected $endColor;
/** /**
* Create a new PHPExcel_Style_Fill * Create a new PHPExcel_Style_Fill
* *
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not * @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not * @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
*/ */
public function __construct($isSupervisor = FALSE, $isConditional = FALSE) public function __construct($isSupervisor = false, $isConditional = false)
{ {
// Supervisor? // Supervisor?
parent::__construct($isSupervisor); parent::__construct($isSupervisor);
// Initialise values // Initialise values
if ($isConditional) { if ($isConditional) {
$this->_fillType = NULL; $this->fillType = null;
} }
$this->_startColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor, $isConditional); $this->startColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_WHITE, $isSupervisor, $isConditional);
$this->_endColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional); $this->endColor = new PHPExcel_Style_Color(PHPExcel_Style_Color::COLOR_BLACK, $isSupervisor, $isConditional);
// bind parent if we are a supervisor // bind parent if we are a supervisor
if ($isSupervisor) { if ($isSupervisor) {
$this->_startColor->bindParent($this, '_startColor'); $this->startColor->bindParent($this, 'startColor');
$this->_endColor->bindParent($this, '_endColor'); $this->endColor->bindParent($this, 'endColor');
} }
} }
/** /**
* Get the shared style component for the currently active cell in currently active sheet. * Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor * Only used for style supervisor
* *
* @return PHPExcel_Style_Fill * @return PHPExcel_Style_Fill
*/ */
public function getSharedComponent() public function getSharedComponent()
{ {
return $this->_parent->getSharedComponent()->getFill(); return $this->parent->getSharedComponent()->getFill();
} }
/** /**
* Build style array from subcomponents * Build style array from subcomponents
* *
* @param array $array * @param array $array
* @return array * @return array
*/ */
public function getStyleArray($array) public function getStyleArray($array)
{ {
return array('fill' => $array); return array('fill' => $array);
} }
/** /**
* Apply styles from array * Apply styles from array
* *
* <code> * <code>
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray( * $objPHPExcel->getActiveSheet()->getStyle('B2')->getFill()->applyFromArray(
* array( * array(
* 'type' => PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR, * 'type' => PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR,
* 'rotation' => 0, * 'rotation' => 0,
* 'startcolor' => array( * 'startcolor' => array(
* 'rgb' => '000000' * 'rgb' => '000000'
* ), * ),
* 'endcolor' => array( * 'endcolor' => array(
* 'argb' => 'FFFFFFFF' * 'argb' => 'FFFFFFFF'
* ) * )
* ) * )
* ); * );
* </code> * </code>
* *
* @param array $pStyles Array containing style information * @param array $pStyles Array containing style information
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Fill * @return PHPExcel_Style_Fill
*/ */
public function applyFromArray($pStyles = null) { public function applyFromArray($pStyles = null)
if (is_array($pStyles)) { {
if ($this->_isSupervisor) { if (is_array($pStyles)) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles)); if ($this->isSupervisor) {
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
if (array_key_exists('type', $pStyles)) { } else {
$this->setFillType($pStyles['type']); if (array_key_exists('type', $pStyles)) {
} $this->setFillType($pStyles['type']);
if (array_key_exists('rotation', $pStyles)) { }
$this->setRotation($pStyles['rotation']); if (array_key_exists('rotation', $pStyles)) {
} $this->setRotation($pStyles['rotation']);
if (array_key_exists('startcolor', $pStyles)) { }
$this->getStartColor()->applyFromArray($pStyles['startcolor']); if (array_key_exists('startcolor', $pStyles)) {
} $this->getStartColor()->applyFromArray($pStyles['startcolor']);
if (array_key_exists('endcolor', $pStyles)) { }
$this->getEndColor()->applyFromArray($pStyles['endcolor']); if (array_key_exists('endcolor', $pStyles)) {
} $this->getEndColor()->applyFromArray($pStyles['endcolor']);
if (array_key_exists('color', $pStyles)) { }
$this->getStartColor()->applyFromArray($pStyles['color']); if (array_key_exists('color', $pStyles)) {
} $this->getStartColor()->applyFromArray($pStyles['color']);
} }
} else { }
throw new PHPExcel_Exception("Invalid style array passed."); } else {
} throw new PHPExcel_Exception("Invalid style array passed.");
return $this; }
} return $this;
}
/** /**
* Get Fill Type * Get Fill Type
* *
* @return string * @return string
*/ */
public function getFillType() { public function getFillType()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getFillType(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getFillType();
return $this->_fillType; }
} return $this->fillType;
}
/** /**
* Set Fill Type * Set Fill Type
* *
* @param string $pValue PHPExcel_Style_Fill fill type * @param string $pValue PHPExcel_Style_Fill fill type
* @return PHPExcel_Style_Fill * @return PHPExcel_Style_Fill
*/ */
public function setFillType($pValue = PHPExcel_Style_Fill::FILL_NONE) { public function setFillType($pValue = PHPExcel_Style_Fill::FILL_NONE)
if ($this->_isSupervisor) { {
$styleArray = $this->getStyleArray(array('type' => $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('type' => $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_fillType = $pValue; } else {
} $this->fillType = $pValue;
return $this; }
} return $this;
}
/** /**
* Get Rotation * Get Rotation
* *
* @return double * @return double
*/ */
public function getRotation() { public function getRotation()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getRotation(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getRotation();
return $this->_rotation; }
} return $this->rotation;
}
/** /**
* Set Rotation * Set Rotation
* *
* @param double $pValue * @param double $pValue
* @return PHPExcel_Style_Fill * @return PHPExcel_Style_Fill
*/ */
public function setRotation($pValue = 0) { public function setRotation($pValue = 0)
if ($this->_isSupervisor) { {
$styleArray = $this->getStyleArray(array('rotation' => $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('rotation' => $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_rotation = $pValue; } else {
} $this->rotation = $pValue;
return $this; }
} return $this;
}
/** /**
* Get Start Color * Get Start Color
* *
* @return PHPExcel_Style_Color * @return PHPExcel_Style_Color
*/ */
public function getStartColor() { public function getStartColor()
return $this->_startColor; {
} return $this->startColor;
}
/** /**
* Set Start Color * Set Start Color
* *
* @param PHPExcel_Style_Color $pValue * @param PHPExcel_Style_Color $pValue
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Fill * @return PHPExcel_Style_Fill
*/ */
public function setStartColor(PHPExcel_Style_Color $pValue = null) { public function setStartColor(PHPExcel_Style_Color $pValue = null)
// make sure parameter is a real color and not a supervisor {
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue; // make sure parameter is a real color and not a supervisor
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$styleArray = $this->getStartColor()->getStyleArray(array('argb' => $color->getARGB())); $styleArray = $this->getStartColor()->getStyleArray(array('argb' => $color->getARGB()));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} else { } else {
$this->_startColor = $color; $this->startColor = $color;
} }
return $this; return $this;
} }
/** /**
* Get End Color * Get End Color
* *
* @return PHPExcel_Style_Color * @return PHPExcel_Style_Color
*/ */
public function getEndColor() { public function getEndColor()
return $this->_endColor; {
} return $this->endColor;
}
/** /**
* Set End Color * Set End Color
* *
* @param PHPExcel_Style_Color $pValue * @param PHPExcel_Style_Color $pValue
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Fill * @return PHPExcel_Style_Fill
*/ */
public function setEndColor(PHPExcel_Style_Color $pValue = null) { public function setEndColor(PHPExcel_Style_Color $pValue = null)
// make sure parameter is a real color and not a supervisor {
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue; // make sure parameter is a real color and not a supervisor
$color = $pValue->getIsSupervisor() ? $pValue->getSharedComponent() : $pValue;
if ($this->_isSupervisor) { if ($this->isSupervisor) {
$styleArray = $this->getEndColor()->getStyleArray(array('argb' => $color->getARGB())); $styleArray = $this->getEndColor()->getStyleArray(array('argb' => $color->getARGB()));
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
} else { } else {
$this->_endColor = $color; $this->endColor = $color;
} }
return $this; return $this;
} }
/**
* Get hash code
*
* @return string Hash code
*/
public function getHashCode() {
if ($this->_isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->getFillType()
. $this->getRotation()
. $this->getStartColor()->getHashCode()
. $this->getEndColor()->getHashCode()
. __CLASS__
);
}
/**
* Get hash code
*
* @return string Hash code
*/
public function getHashCode()
{
if ($this->isSupervisor) {
return $this->getSharedComponent()->getHashCode();
}
return md5(
$this->getFillType() .
$this->getRotation() .
$this->getStartColor()->getHashCode() .
$this->getEndColor()->getHashCode() .
__CLASS__
);
}
} }

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,6 +1,7 @@
<?php <?php
/** /**
* PHPExcel * PHPExcel_Style_Protection
* *
* Copyright (c) 2006 - 2015 PHPExcel * Copyright (c) 2006 - 2015 PHPExcel
* *
@ -21,127 +22,120 @@
* @category PHPExcel * @category PHPExcel
* @package PHPExcel_Style * @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version 1.4.5, 2007-08-23 * @version ##VERSION##, ##DATE##
*/
/**
* PHPExcel_Style_Protection
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
*/ */
class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHPExcel_IComparable
{ {
/** Protection styles */ /** Protection styles */
const PROTECTION_INHERIT = 'inherit'; const PROTECTION_INHERIT = 'inherit';
const PROTECTION_PROTECTED = 'protected'; const PROTECTION_PROTECTED = 'protected';
const PROTECTION_UNPROTECTED = 'unprotected'; const PROTECTION_UNPROTECTED = 'unprotected';
/** /**
* Locked * Locked
* *
* @var string * @var string
*/
protected $_locked;
/**
* Hidden
*
* @var string
*/
protected $_hidden;
/**
* Create a new PHPExcel_Style_Protection
*
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what
* its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what
* its ramifications are
*/ */
public function __construct($isSupervisor = FALSE, $isConditional = FALSE) protected $locked;
{
// Supervisor?
parent::__construct($isSupervisor);
// Initialise values /**
if (!$isConditional) { * Hidden
$this->_locked = self::PROTECTION_INHERIT; *
$this->_hidden = self::PROTECTION_INHERIT; * @var string
} */
protected $hidden;
/**
* Create a new PHPExcel_Style_Protection
*
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what
* its ramifications are
* @param boolean $isConditional Flag indicating if this is a conditional style or not
* Leave this value at default unless you understand exactly what
* its ramifications are
*/
public function __construct($isSupervisor = false, $isConditional = false)
{
// Supervisor?
parent::__construct($isSupervisor);
// Initialise values
if (!$isConditional) {
$this->locked = self::PROTECTION_INHERIT;
$this->hidden = self::PROTECTION_INHERIT;
}
} }
/** /**
* Get the shared style component for the currently active cell in currently active sheet. * Get the shared style component for the currently active cell in currently active sheet.
* Only used for style supervisor * Only used for style supervisor
* *
* @return PHPExcel_Style_Protection * @return PHPExcel_Style_Protection
*/ */
public function getSharedComponent() public function getSharedComponent()
{ {
return $this->_parent->getSharedComponent()->getProtection(); return $this->parent->getSharedComponent()->getProtection();
} }
/** /**
* Build style array from subcomponents * Build style array from subcomponents
* *
* @param array $array * @param array $array
* @return array * @return array
*/ */
public function getStyleArray($array) public function getStyleArray($array)
{ {
return array('protection' => $array); return array('protection' => $array);
} }
/** /**
* Apply styles from array * Apply styles from array
* *
* <code> * <code>
* $objPHPExcel->getActiveSheet()->getStyle('B2')->getLocked()->applyFromArray( * $objPHPExcel->getActiveSheet()->getStyle('B2')->getLocked()->applyFromArray(
* array( * array(
* 'locked' => TRUE, * 'locked' => TRUE,
* 'hidden' => FALSE * 'hidden' => FALSE
* ) * )
* ); * );
* </code> * </code>
* *
* @param array $pStyles Array containing style information * @param array $pStyles Array containing style information
* @throws PHPExcel_Exception * @throws PHPExcel_Exception
* @return PHPExcel_Style_Protection * @return PHPExcel_Style_Protection
*/ */
public function applyFromArray($pStyles = NULL) { public function applyFromArray($pStyles = null)
if (is_array($pStyles)) { {
if ($this->_isSupervisor) { if (is_array($pStyles)) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles)); if ($this->isSupervisor) {
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($this->getStyleArray($pStyles));
if (isset($pStyles['locked'])) { } else {
$this->setLocked($pStyles['locked']); if (isset($pStyles['locked'])) {
} $this->setLocked($pStyles['locked']);
if (isset($pStyles['hidden'])) { }
$this->setHidden($pStyles['hidden']); if (isset($pStyles['hidden'])) {
} $this->setHidden($pStyles['hidden']);
} }
} else { }
throw new PHPExcel_Exception("Invalid style array passed."); } else {
} throw new PHPExcel_Exception("Invalid style array passed.");
return $this; }
} return $this;
}
/** /**
* Get locked * Get locked
* *
* @return string * @return string
*/ */
public function getLocked() { public function getLocked()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getLocked(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getLocked();
return $this->_locked; }
return $this->locked;
} }
/** /**
@ -150,14 +144,15 @@ class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHP
* @param string $pValue * @param string $pValue
* @return PHPExcel_Style_Protection * @return PHPExcel_Style_Protection
*/ */
public function setLocked($pValue = self::PROTECTION_INHERIT) { public function setLocked($pValue = self::PROTECTION_INHERIT)
if ($this->_isSupervisor) { {
$styleArray = $this->getStyleArray(array('locked' => $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('locked' => $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_locked = $pValue; } else {
} $this->locked = $pValue;
return $this; }
return $this;
} }
/** /**
@ -165,11 +160,12 @@ class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHP
* *
* @return string * @return string
*/ */
public function getHidden() { public function getHidden()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getHidden(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getHidden();
return $this->_hidden; }
return $this->hidden;
} }
/** /**
@ -178,30 +174,31 @@ class PHPExcel_Style_Protection extends PHPExcel_Style_Supervisor implements PHP
* @param string $pValue * @param string $pValue
* @return PHPExcel_Style_Protection * @return PHPExcel_Style_Protection
*/ */
public function setHidden($pValue = self::PROTECTION_INHERIT) { public function setHidden($pValue = self::PROTECTION_INHERIT)
if ($this->_isSupervisor) { {
$styleArray = $this->getStyleArray(array('hidden' => $pValue)); if ($this->isSupervisor) {
$this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray); $styleArray = $this->getStyleArray(array('hidden' => $pValue));
} else { $this->getActiveSheet()->getStyle($this->getSelectedCells())->applyFromArray($styleArray);
$this->_hidden = $pValue; } else {
} $this->hidden = $pValue;
return $this; }
return $this;
} }
/** /**
* Get hash code * Get hash code
* *
* @return string Hash code * @return string Hash code
*/ */
public function getHashCode() { public function getHashCode()
if ($this->_isSupervisor) { {
return $this->getSharedComponent()->getHashCode(); if ($this->isSupervisor) {
} return $this->getSharedComponent()->getHashCode();
return md5( }
$this->_locked return md5(
. $this->_hidden $this->locked .
. __CLASS__ $this->hidden .
); __CLASS__
);
} }
} }

View File

@ -1,6 +1,7 @@
<?php <?php
/** /**
* PHPExcel * PHPExcel_Style_Supervisor
* *
* Copyright (c) 2006 - 2015 PHPExcel * Copyright (c) 2006 - 2015 PHPExcel
* *
@ -19,114 +20,106 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
* *
* @category PHPExcel * @category PHPExcel
* @package PHPExcel_Style * @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/
/**
* PHPExcel_Style_Supervisor
*
* @category PHPExcel
* @package PHPExcel_Style
* @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel) * @copyright Copyright (c) 2006 - 2015 PHPExcel (http://www.codeplex.com/PHPExcel)
* @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
* @version ##VERSION##, ##DATE##
*/ */
abstract class PHPExcel_Style_Supervisor abstract class PHPExcel_Style_Supervisor
{ {
/** /**
* Supervisor? * Supervisor?
* *
* @var boolean * @var boolean
*/ */
protected $_isSupervisor; protected $isSupervisor;
/** /**
* Parent. Only used for supervisor * Parent. Only used for supervisor
* *
* @var PHPExcel_Style * @var PHPExcel_Style
*/ */
protected $_parent; protected $parent;
/** /**
* Create a new PHPExcel_Style_Alignment * Create a new PHPExcel_Style_Alignment
* *
* @param boolean $isSupervisor Flag indicating if this is a supervisor or not * @param boolean $isSupervisor Flag indicating if this is a supervisor or not
* Leave this value at default unless you understand exactly what * Leave this value at default unless you understand exactly what
* its ramifications are * its ramifications are
*/ */
public function __construct($isSupervisor = FALSE) public function __construct($isSupervisor = false)
{ {
// Supervisor? // Supervisor?
$this->_isSupervisor = $isSupervisor; $this->isSupervisor = $isSupervisor;
} }
/** /**
* Bind parent. Only used for supervisor * Bind parent. Only used for supervisor
* *
* @param PHPExcel $parent * @param PHPExcel $parent
* @return PHPExcel_Style_Supervisor * @return PHPExcel_Style_Supervisor
*/ */
public function bindParent($parent, $parentPropertyName=NULL) public function bindParent($parent, $parentPropertyName = null)
{ {
$this->_parent = $parent; $this->parent = $parent;
return $this; return $this;
} }
/** /**
* Is this a supervisor or a cell style component? * Is this a supervisor or a cell style component?
* *
* @return boolean * @return boolean
*/ */
public function getIsSupervisor() public function getIsSupervisor()
{ {
return $this->_isSupervisor; return $this->isSupervisor;
} }
/** /**
* Get the currently active sheet. Only used for supervisor * Get the currently active sheet. Only used for supervisor
* *
* @return PHPExcel_Worksheet * @return PHPExcel_Worksheet
*/ */
public function getActiveSheet() public function getActiveSheet()
{ {
return $this->_parent->getActiveSheet(); return $this->parent->getActiveSheet();
} }
/** /**
* Get the currently active cell coordinate in currently active sheet. * Get the currently active cell coordinate in currently active sheet.
* Only used for supervisor * Only used for supervisor
* *
* @return string E.g. 'A1' * @return string E.g. 'A1'
*/ */
public function getSelectedCells() public function getSelectedCells()
{ {
return $this->getActiveSheet()->getSelectedCells(); return $this->getActiveSheet()->getSelectedCells();
} }
/** /**
* Get the currently active cell coordinate in currently active sheet. * Get the currently active cell coordinate in currently active sheet.
* Only used for supervisor * Only used for supervisor
* *
* @return string E.g. 'A1' * @return string E.g. 'A1'
*/ */
public function getActiveCell() public function getActiveCell()
{ {
return $this->getActiveSheet()->getActiveCell(); return $this->getActiveSheet()->getActiveCell();
} }
/** /**
* Implement PHP __clone to create a deep clone, not just a shallow copy. * Implement PHP __clone to create a deep clone, not just a shallow copy.
*/ */
public function __clone() { public function __clone()
$vars = get_object_vars($this); {
foreach ($vars as $key => $value) { $vars = get_object_vars($this);
if ((is_object($value)) && ($key != '_parent')) { foreach ($vars as $key => $value) {
$this->$key = clone $value; if ((is_object($value)) && ($key != 'parent')) {
} else { $this->$key = clone $value;
$this->$key = $value; } else {
} $this->$key = $value;
} }
} }
}
} }

View File

@ -1152,16 +1152,15 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
*/ */
public function getCell($pCoordinate = 'A1') public function getCell($pCoordinate = 'A1')
{ {
$pCoordinate = strtoupper($pCoordinate);
// Check cell collection // Check cell collection
if ($this->_cellCollection->isDataSet($pCoordinate)) { if ($this->_cellCollection->isDataSet(strtoupper($pCoordinate))) {
return $this->_cellCollection->getCacheData($pCoordinate); return $this->_cellCollection->getCacheData($pCoordinate);
} }
// Worksheet reference? // Worksheet reference?
if (strpos($pCoordinate, '!') !== false) { if (strpos($pCoordinate, '!') !== false) {
$worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true); $worksheetReference = PHPExcel_Worksheet::extractSheetTitle($pCoordinate, true);
return $this->_parent->getSheetByName($worksheetReference[0])->getCell($worksheetReference[1]); return $this->_parent->getSheetByName($worksheetReference[0])->getCell(strtoupper($worksheetReference[1]));
} }
// Named range? // Named range?
@ -2658,9 +2657,10 @@ class PHPExcel_Worksheet implements PHPExcel_IComparable
} }
if ($returnRange) { if ($returnRange) {
return array( trim(substr($pRange, 0, $sep),"'"), return array(
substr($pRange, $sep + 1) trim(substr($pRange, 0, $sep),"'"),
); substr($pRange, $sep + 1)
);
} }
return substr($pRange, $sep + 1); return substr($pRange, $sep + 1);

View File

@ -46,7 +46,6 @@ $callStartTime = microtime(true);
$objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'CSV')->setDelimiter(',') $objWriter = PHPExcel_IOFactory::createWriter($objPHPExcel, 'CSV')->setDelimiter(',')
->setEnclosure('"') ->setEnclosure('"')
->setLineEnding("\r\n")
->setSheetIndex(0) ->setSheetIndex(0)
->save(str_replace('.php', '.csv', __FILE__)); ->save(str_replace('.php', '.csv', __FILE__));
$callEndTime = microtime(true); $callEndTime = microtime(true);
@ -61,7 +60,6 @@ echo date('H:i:s') , " Read from CSV format" , EOL;
$callStartTime = microtime(true); $callStartTime = microtime(true);
$objReader = PHPExcel_IOFactory::createReader('CSV')->setDelimiter(',') $objReader = PHPExcel_IOFactory::createReader('CSV')->setDelimiter(',')
->setEnclosure('"') ->setEnclosure('"')
->setLineEnding("\r\n")
->setSheetIndex(0); ->setSheetIndex(0);
$objPHPExcelFromCSV = $objReader->load(str_replace('.php', '.csv', __FILE__)); $objPHPExcelFromCSV = $objReader->load(str_replace('.php', '.csv', __FILE__));