Clientbase
/
PHPWord
mirror of https://github.com/basemaster/PHPWord.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github_troosan/paper_size_computation' into develop

This commit is contained in:
antoine 2017-01-22 15:16:16 +01:00
parent da60645be3 fc3bc29a02
commit 8d7775552c
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/PhpWord/Style/Section.php
View File

@ -35,14 +35,14 @@ class Section extends Border
*
* @const int|float
*/
const DEFAULT_WIDTH = 11870; // In twips.
const DEFAULT_HEIGHT = 16787; // In twips.
const DEFAULT_MARGIN = 1440; // In twips.
const DEFAULT_GUTTER = 0; // In twips.
const DEFAULT_HEADER_HEIGHT = 720; // In twips.
const DEFAULT_FOOTER_HEIGHT = 720; // In twips.
const DEFAULT_WIDTH = 11905.511811024; // In twips.
const DEFAULT_HEIGHT = 16837.79527559; // In twips.
const DEFAULT_MARGIN = 1440; // In twips.
const DEFAULT_GUTTER = 0; // In twips.
const DEFAULT_HEADER_HEIGHT = 720; // In twips.
const DEFAULT_FOOTER_HEIGHT = 720; // In twips.
const DEFAULT_COLUMN_COUNT = 1;
const DEFAULT_COLUMN_SPACING = 720; // In twips.
const DEFAULT_COLUMN_SPACING = 720; // In twips.
/**
* Page Orientation

20
tests/PhpWord/Style/SectionTest.php
View File

@ -33,14 +33,14 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
$oSettings = new Section();
$this->assertEquals('portrait', $oSettings->getOrientation());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
$this->assertEquals('A4', $oSettings->getPaperSize());
$oSettings->setSettingValue('orientation', 'landscape');
$this->assertEquals('landscape', $oSettings->getOrientation());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
$iVal = rand(1, 1000);
$oSettings->setSettingValue('borderSize', $iVal);
@ -110,7 +110,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
// Section Settings
$oSettings = new Section();
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
$iVal = rand(1, 1000);
$oSettings->setSettingValue('pageSizeW', $iVal);
$this->assertEquals($iVal, $oSettings->getPageSizeW());
@ -124,7 +124,7 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
// Section Settings
$oSettings = new Section();
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
$iVal = rand(1, 1000);
$oSettings->setSettingValue('pageSizeH', $iVal);
$this->assertEquals($iVal, $oSettings->getPageSizeH());
@ -140,8 +140,8 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
$oSettings->setLandscape();
$this->assertEquals('landscape', $oSettings->getOrientation());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeW(), '', 0.000000001);
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeH(), '', 0.000000001);
}
/**
@ -154,8 +154,8 @@ class SettingsTest extends \PHPUnit_Framework_TestCase
$oSettings->setPortrait();
$this->assertEquals('portrait', $oSettings->getOrientation());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW());
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH());
$this->assertEquals(Section::DEFAULT_WIDTH, $oSettings->getPageSizeW(), '', 0.000000001);
$this->assertEquals(Section::DEFAULT_HEIGHT, $oSettings->getPageSizeH(), '', 0.000000001);
}
/**