diff --git a/Examples/33chartcreate-radar.php b/Examples/33chartcreate-radar.php index d32e2c98..bf1af255 100644 --- a/Examples/33chartcreate-radar.php +++ b/Examples/33chartcreate-radar.php @@ -97,14 +97,15 @@ $dataSeriesValues = array( // Build the dataseries $series = new \PHPExcel\Chart\DataSeries( - \PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType - NULL, // plotGrouping (Radar charts don't have any grouping) - range(0, count($dataSeriesValues)-1), // plotOrder - $dataSeriesLabels, // plotLabel - $xAxisTickValues, // plotCategory - $dataSeriesValues, // plotValues - NULL, // smooth line - \PHPExcel\Chart\DataSeries::STYLE_MARKER // plotStyle + \PHPExcel\Chart\DataSeries::TYPE_RADARCHART, // plotType + NULL, // plotGrouping (Radar charts don't have any grouping) + range(0, count($dataSeriesValues)-1), // plotOrder + $dataSeriesLabels, // plotLabel + $xAxisTickValues, // plotCategory + $dataSeriesValues, // plotValues + NULL, // plotDirection + NULL, // smooth line + \PHPExcel\Chart\DataSeries::STYLE_MARKER // plotStyle ); // Set up a layout object for the Pie chart diff --git a/Examples/33chartcreate-scatter.php b/Examples/33chartcreate-scatter.php index ca742d85..c23b063a 100644 --- a/Examples/33chartcreate-scatter.php +++ b/Examples/33chartcreate-scatter.php @@ -89,6 +89,7 @@ $series = new \PHPExcel\Chart\DataSeries( $dataSeriesLabels, // plotLabel $xAxisTickValues, // plotCategory $dataSeriesValues, // plotValues + NULL, // plotDirection NULL, // smooth line \PHPExcel\Chart\DataSeries::STYLE_LINEMARKER // plotStyle ); diff --git a/src/PhpSpreadsheet/Shared/Date.php b/src/PhpSpreadsheet/Shared/Date.php index a6189d86..8069a7db 100644 --- a/src/PhpSpreadsheet/Shared/Date.php +++ b/src/PhpSpreadsheet/Shared/Date.php @@ -40,7 +40,7 @@ class Date * @private * @var int */ - protected static $excelBaseDate = self::CALENDAR_WINDOWS_1900; + protected static $excelCalendar = self::CALENDAR_WINDOWS_1900; /* * Default timezone to use for DateTime objects @@ -132,7 +132,7 @@ class Date */ public static function excelToDateTimeObject($excelTimestamp = 0, $timeZone = null) { $timeZone = ($timeZone === null) ? self::getDefaultTimezone() : self::validateTimeZone($timeZone); - if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) { + if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) { $baseDate = ($excelTimestamp < 60) ? new \DateTime('1899-12-31', $timeZone) : new \DateTime('1899-12-30', $timeZone); } else { $baseDate = new \DateTime('1904-01-01', $timeZone); @@ -159,7 +159,7 @@ class Date * @throws \Exception */ public static function excelToTimestamp($excelTimestampexcelTimestamp = 0, $timeZone = null) { - return self::excelToTimestamp($excelTimestamp, $timeZone) + return self::excelToDateTimeObject($excelTimestamp, $timeZone) ->format('U'); } @@ -212,7 +212,7 @@ class Date */ public static function formattedPHPToExcel($year, $month, $day, $hours = 0, $minutes = 0, $seconds = 0) { - if (self::$excelBaseDate == self::CALENDAR_WINDOWS_1900) { + if (self::$excelCalendar == self::CALENDAR_WINDOWS_1900) { // // Fudge factor for the erroneous fact that the year 1900 is treated as a Leap Year in MS Excel // This affects every date following 28th February 1900 diff --git a/src/PhpSpreadsheet/Spreadsheet.php b/src/PhpSpreadsheet/Spreadsheet.php index 46d32a61..c2efc9f0 100644 --- a/src/PhpSpreadsheet/Spreadsheet.php +++ b/src/PhpSpreadsheet/Spreadsheet.php @@ -1,4 +1,4 @@ -