mcndave/spout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve logic

Browse Source
This commit is contained in:
Xwiz 2022-02-04 23:44:49 +01:00
parent 4f0e72c4e4
commit d53be7bd2b
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Spout/Writer/Common/Entity/Worksheet.php
View File

@ -141,15 +141,13 @@ class Worksheet
*/ */
public function autoSetWidth($cell, $style, $zeroBasedIndex) public function autoSetWidth($cell, $style, $zeroBasedIndex)
{ {
$size = strlen($cell->getValue()) ?? 1;//use 1 as length if cell empty $size = 1 + strlen($cell->getValue());//ensure we have at least 1 space
$size *= (float)($style->getFontSize() ?? 10);
$size *= $style->isFontBold() ? 1.2 : 1.0; $size *= $style->isFontBold() ? 1.2 : 1.0;
if ($this->getWidthCalculation() == Worksheet::W_FIXED) { if ($this->getWidthCalculation() == Worksheet::W_FIXED) {
$total = array_sum($this->getColumnWidths()); $total = array_sum($this->getColumnWidths());
$total = $total ?: $size; $total = $total ?: $size;
$size = ($size / $total) * $this->getFixedSheetWidth(); $size = ($size / $total) * $this->getFixedSheetWidth();
} }
$size /= 10;
$this->setMaxColumnWidth($zeroBasedIndex, $size); $this->setMaxColumnWidth($zeroBasedIndex, $size);
} }

1
src/Spout/Writer/ODS/Manager/WorksheetManager.php
View File

@ -286,6 +286,7 @@ class WorksheetManager implements WorksheetManagerInterface
$widths = $worksheet->getColumnWidths(); $widths = $worksheet->getColumnWidths();
//todo: this may not be adequate for multiple worksheets //todo: this may not be adequate for multiple worksheets
foreach ($widths as $i => $width){ foreach ($widths as $i => $width){
//this is a rough equivalent based on pixel density
$win = round($width / 9.6, 2);//convert to inches $win = round($width / 9.6, 2);//convert to inches
$colNo = $i + 1; $colNo = $i + 1;
$style .= '<style:style style:name="co'.$colNo. $style .= '<style:style style:name="co'.$colNo.