fix regression in raster marker collision box placement - refs #2295

This commit is contained in:
Dane Springmeyer 2014-07-30 22:50:01 -07:00
parent f1cffaeb1f
commit d685307250
7 changed files with 3 additions and 5 deletions

View file

@ -54,9 +54,6 @@ public:
done_(false) done_(false)
{ {
rewind(); rewind();
coord2d center = size.center();
tr_ = agg::trans_affine_translation(-center.x, -center.y) * tr_;
} }
virtual ~markers_point_placement() {} virtual ~markers_point_placement() {}
@ -103,8 +100,9 @@ public:
} }
angle = 0; angle = 0;
agg::trans_affine matrix = tr_;
box2d<double> box = perform_transform(angle, x, y); matrix.translate(x,y);
box2d<double> box = size_ * matrix;
if (!allow_overlap_ && !detector_.has_placement(box)) if (!allow_overlap_ && !detector_.has_placement(box))
{ {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 18 KiB