On Tue, 2008-09-30 at 10:31 -0700, Ben Jackson wrote:
> On Tue, Sep 30, 2008 at 02:10:25PM +0100, Peter Clifton wrote:
> As for the other problem, I agree with your assessment that the bounding
> box is probably wrong, which likely has other bad consequences.
And here is the fix.
Anyone care to comment on its validity before I push this?
(I didn't like the casting back to integer - not sure about rounding in
those cases).
--
Peter Clifton
Electrical Engineering Division,
Engineering Department,
University of Cambridge,
9, JJ Thomson Avenue,
Cambridge
CB3 0FA
Tel: +44 (0)7729 980173 - (No signal in the lab!)
>From e5fb73dc4565379f1d0c9ed1b16c9f6cdb9a6279 Mon Sep 17 00:00:00 2001
From: Peter Clifton <[EMAIL PROTECTED]>
Date: Tue, 30 Sep 2008 19:53:51 +0100
Subject: [PATCH] Fix bounding boxes for rotated square ended pads.
Bounding box compution only worked for round ended pads before.
In addition, the "move" code previously called SetLineBoundingBox
for pads, which computes the wrong result.
---
src/misc.c | 42 ++++++++++++++++++++++++++++++++++++++----
src/move.h | 6 +++++-
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/src/misc.c b/src/misc.c
index 65dfc04..2153a1a 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -173,16 +173,50 @@ void
SetPadBoundingBox (PadTypePtr Pad)
{
BDimension width;
+ BDimension deltax;
+ BDimension deltay;
/* the bounding box covers the extent of influence
* so it must include the clearance values too
*/
width = (Pad->Thickness + Pad->Clearance + 1) / 2;
width = MAX (width, (Pad->Mask + 1) / 2);
- Pad->BoundingBox.X1 = MIN (Pad->Point1.X, Pad->Point2.X) - width;
- Pad->BoundingBox.X2 = MAX (Pad->Point1.X, Pad->Point2.X) + width;
- Pad->BoundingBox.Y1 = MIN (Pad->Point1.Y, Pad->Point2.Y) - width;
- Pad->BoundingBox.Y2 = MAX (Pad->Point1.Y, Pad->Point2.Y) + width;
+ deltax = Pad->Point2.X - Pad->Point1.X;
+ deltay = Pad->Point2.Y - Pad->Point1.Y;
+
+ if (TEST_FLAG (SQUAREFLAG, Pad) && deltax != 0 && deltay != 0)
+ {
+ /* slanted square pad */
+ float tx, ty, theta;
+ BDimension btx, bty;
+
+ theta = atan2 (deltay, deltax);
+
+ /* T is a vector half a thickness long, in the direction of
+ one of the corners. */
+ tx = width * cos (theta + M_PI/4) * sqrt(2.0);
+ ty = width * sin (theta + M_PI/4) * sqrt(2.0);
+
+ /* cast back to this integer type */
+ btx = tx;
+ bty = ty;
+
+ Pad->BoundingBox.X1 = MIN (MIN (Pad->Point1.X - btx, Pad->Point1.X - bty),
+ MIN (Pad->Point2.X + btx, Pad->Point2.X + bty));
+ Pad->BoundingBox.X2 = MAX (MAX (Pad->Point1.X - btx, Pad->Point1.X - bty),
+ MAX (Pad->Point2.X + btx, Pad->Point2.X + bty));
+ Pad->BoundingBox.Y1 = MIN (MIN (Pad->Point1.Y + btx, Pad->Point1.Y - bty),
+ MIN (Pad->Point2.Y - btx, Pad->Point2.Y + bty));
+ Pad->BoundingBox.Y2 = MAX (MAX (Pad->Point1.Y + btx, Pad->Point1.Y - bty),
+ MAX (Pad->Point2.Y - btx, Pad->Point2.Y + bty));
+ }
+ else
+ {
+ Pad->BoundingBox.X1 = MIN (Pad->Point1.X, Pad->Point2.X) - width;
+ Pad->BoundingBox.X2 = MAX (Pad->Point1.X, Pad->Point2.X) + width;
+ Pad->BoundingBox.Y1 = MIN (Pad->Point1.Y, Pad->Point2.Y) - width;
+ Pad->BoundingBox.Y2 = MAX (Pad->Point1.Y, Pad->Point2.Y) + width;
+ }
}
/* ---------------------------------------------------------------------------
diff --git a/src/move.h b/src/move.h
index b6b7231..f060ff5 100644
--- a/src/move.h
+++ b/src/move.h
@@ -72,7 +72,11 @@
SetLineBoundingBox ((l)); \
}
#define MOVE_PAD_LOWLEVEL(p,dx,dy) \
- MOVE_LINE_LOWLEVEL((LineTypePtr)(p),(dx),(dy))
+ { \
+ MOVE((p)->Point1.X,(p)->Point1.Y,(dx),(dy)) \
+ MOVE((p)->Point2.X,(p)->Point2.Y,(dx),(dy)) \
+ SetPadBoundingBox ((p)); \
+ }
#define MOVE_TEXT_LOWLEVEL(t,dx,dy) \
{ \
MOVE_BOX_LOWLEVEL(&((t)->BoundingBox),(dx),(dy)); \
--
1.5.6.3
_______________________________________________
geda-dev mailing list
[email protected]
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
