Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change group shape extents to reflect content width/height. #451

Merged
merged 1 commit into from
Feb 5, 2018
Merged

Change group shape extents to reflect content width/height. #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/PhpPresentation/Shape/Group.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ public function getExtentX()
{
if ($this->extentX === null) {
$extents = GeometryCalculator::calculateExtents($this);
$this->extentX = $extents[GeometryCalculator::X];
$this->extentY = $extents[GeometryCalculator::Y];
$this->extentX = $extents[GeometryCalculator::X] - $this->getOffsetX();
$this->extentY = $extents[GeometryCalculator::Y] - $this->getOffsetY();
}

return $this->extentX;
Expand All @@ -161,8 +161,8 @@ public function getExtentY()
{
if ($this->extentY === null) {
$extents = GeometryCalculator::calculateExtents($this);
$this->extentX = $extents[GeometryCalculator::X];
$this->extentY = $extents[GeometryCalculator::Y];
$this->extentX = $extents[GeometryCalculator::X] - $this->getOffsetX();
$this->extentY = $extents[GeometryCalculator::Y] - $this->getOffsetY();
}

return $this->extentY;
Expand Down
36 changes: 20 additions & 16 deletions tests/PhpPresentation/Tests/Shape/GroupTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,25 +56,25 @@ public function testAdd()
public function testExtentX()
{
$object = new Group();
$line1 = new Line(10, 20, 30, 40);
$line1 = new Line(10, 20, 30, 50);
$object->addShape($line1);

$this->assertEquals(30, $object->getExtentX());
$this->assertEquals(20, $object->getExtentX());
}

public function testExtentY()
{
$object = new Group();
$line1 = new Line(10, 20, 30, 40);
$line1 = new Line(10, 20, 30, 50);
$object->addShape($line1);

$this->assertEquals(40, $object->getExtentY());
$this->assertEquals(30, $object->getExtentY());
}

public function testOffsetX()
{
$object = new Group();
$line1 = new Line(10, 20, 30, 40);
$line1 = new Line(10, 20, 30, 50);
$object->addShape($line1);

$this->assertEquals(10, $object->getOffsetX());
Expand All @@ -86,7 +86,7 @@ public function testOffsetX()
public function testOffsetY()
{
$object = new Group();
$line1 = new Line(10, 20, 30, 40);
$line1 = new Line(10, 20, 30, 50);
$object->addShape($line1);

$this->assertEquals(20, $object->getOffsetY());
Expand All @@ -102,11 +102,13 @@ public function testExtentsAndOffsetsForOneShape()
// from the extents to produce a raw width and height.
$offsetX = 100;
$offsetY = 100;
$extentX = 1000;
$extentY = 450;
$endX = 1000;
$endY = 450;
$extentX = $endX - $offsetX;
$extentY = $endY - $offsetY;

$object = new Group();
$line1 = new Line($offsetX, $offsetY, $extentX, $extentY);
$line1 = new Line($offsetX, $offsetY, $endX, $endY);
$object->addShape($line1);

$this->assertEquals($offsetX, $object->getOffsetX());
Expand All @@ -123,16 +125,18 @@ public function testExtentsAndOffsetsForTwoShapes()
// combined with the above.
$offsetX = 100;
$offsetY = 100;
$extentX = 1000;
$extentY = 450;
$endX = 1000;
$endY = 450;
$increase = 50;
$extentX = ($endX - $offsetX) + $increase;
$extentY = ($endY - $offsetY) + $increase;

$line1 = new Line($offsetX, $offsetY, $extentX, $extentY);
$line1 = new Line($offsetX, $offsetY, $endX, $endY);
$line2 = new Line(
$offsetX+$increase,
$offsetY+$increase,
$extentX+$increase,
$extentY+$increase
$endX+$increase,
$endY+$increase
);

$object = new Group();
Expand All @@ -142,7 +146,7 @@ public function testExtentsAndOffsetsForTwoShapes()

$this->assertEquals($offsetX, $object->getOffsetX());
$this->assertEquals($offsetY, $object->getOffsetY());
$this->assertEquals($extentX+$increase, $object->getExtentX());
$this->assertEquals($extentY+$increase, $object->getExtentY());
$this->assertEquals($extentX, $object->getExtentX());
$this->assertEquals($extentY, $object->getExtentY());
}
}