haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a corner case for arc bounding box calculation.

This commit is contained in:
Maciej Suminski 2015-09-03 10:42:52 +02:00
parent 8fedc57499
commit 8dbf6beed6
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcbnew/class_drawsegment.cpp
View File

@ -430,6 +430,8 @@ const EDA_RECT DRAWSEGMENT::GetBoundingBox() const
case S_ARC: case S_ARC:
{ {
bbox.Merge( m_End ); bbox.Merge( m_End );
// TODO perhaps the above line can be replaced with this one, so we do not include the center
//bbox.SetOrigin( m_End );
wxPoint end = m_End; wxPoint end = m_End;
RotatePoint( &end, m_Start, -m_Angle ); RotatePoint( &end, m_Start, -m_Angle );
bbox.Merge( end ); bbox.Merge( end );
@ -441,16 +443,26 @@ const EDA_RECT DRAWSEGMENT::GetBoundingBox() const
// 3 right-top // 3 right-top
unsigned int quarter = 0; // assume right-bottom unsigned int quarter = 0; // assume right-bottom
if( m_End.y < m_Start.y ) // change to left-top if( m_End.x < m_Start.x )
quarter |= 3; {
if( m_End.y <= m_Start.y )
if( m_End.x < m_Start.x ) // for left side, the LSB is 2nd bit negated quarter = 2;
quarter ^= 1; else // ( m_End.y > m_Start.y )
quarter = 1;
}
else if( m_End.x >= m_Start.x )
{
if( m_End.y < m_Start.y )
quarter = 3;
else if( m_End.x == m_Start.x )
quarter = 1;
}
int radius = GetRadius(); int radius = GetRadius();
int angle = (int) GetArcAngleStart() % 900 + m_Angle; int angle = (int) GetArcAngleStart() % 900 + m_Angle;
bool directionCW = ( m_Angle > 0 ); // Is the direction of arc clockwise? bool directionCW = ( m_Angle > 0 ); // Is the direction of arc clockwise?
// Make the angle positive, so we go clockwise and merge points belonging to the arc
if( !directionCW ) if( !directionCW )
{ {
angle = 900 - angle; angle = 900 - angle;