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

Fix aperture macro and arc bounding boxes (Fixes lp:1730249)

This commit is contained in:
Jon Evans 2017-11-12 11:44:00 -05:00 committed by jean-pierre charras
parent 2337b83ba6
commit cabc92bd48
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gerbview/class_gerber_draw_item.cpp
View File

@ -247,7 +247,8 @@ const EDA_RECT GERBER_DRAW_ITEM::GetBoundingBox() const
{ {
// Note: using a larger-than-necessary BB to simplify computation // Note: using a larger-than-necessary BB to simplify computation
double radius = GetLineLength( m_Start, m_ArcCentre ); double radius = GetLineLength( m_Start, m_ArcCentre );
bbox.Inflate( radius, radius ); bbox.Move( m_ArcCentre - m_Start );
bbox.Inflate( radius + m_Size.x, radius + m_Size.x );
break; break;
} }
@ -280,6 +281,7 @@ const EDA_RECT GERBER_DRAW_ITEM::GetBoundingBox() const
} }
case GBR_SPOT_MACRO: case GBR_SPOT_MACRO:
{ {
code->GetMacro()->GetApertureMacroShape( this, m_Start );
bbox = code->GetMacro()->GetBoundingBox(); bbox = code->GetMacro()->GetBoundingBox();
break; break;
} }
@ -699,6 +701,7 @@ bool GERBER_DRAW_ITEM::HitTest( const wxPoint& aRefPos ) const
return poly.Contains( VECTOR2I( ref_pos ), 0 ); return poly.Contains( VECTOR2I( ref_pos ), 0 );
case GBR_SPOT_RECT: case GBR_SPOT_RECT:
case GBR_ARC:
return GetBoundingBox().Contains( aRefPos ); return GetBoundingBox().Contains( aRefPos );
case GBR_SPOT_MACRO: case GBR_SPOT_MACRO:
@ -781,7 +784,23 @@ unsigned int GERBER_DRAW_ITEM::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) cons
// DCodes will be shown only if zoom is appropriate // DCodes will be shown only if zoom is appropriate
if( IsDCodeLayer( aLayer ) ) if( IsDCodeLayer( aLayer ) )
{ {
return ( 100000000 / ( m_Size.x + 1 ) ); int size = 0;
switch( m_Shape )
{
case GBR_SPOT_MACRO:
size = GetDcodeDescr()->GetMacro()->GetBoundingBox().GetWidth();
break;
case GBR_ARC:
size = GetLineLength( m_Start, m_ArcCentre );
break;
default:
size = m_Size.x;
}
return ( 100000000 / ( size + 1 ) );
} }
// Other layers are shown without any conditions // Other layers are shown without any conditions