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

Fix knockout text bounding boxes and hit testing. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12133
This commit is contained in:
Jeff Young 2022-08-05 23:57:37 +01:00
parent 6a9b821b5c
commit 509d233d97
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/eda_shape.cpp
View File

@ -781,7 +781,7 @@ bool EDA_SHAPE::hitTest( const VECTOR2I& aPosition, int aAccuracy ) const
for( const VECTOR2I& pt : GetRectCorners() ) for( const VECTOR2I& pt : GetRectCorners() )
poly.Append( pt ); poly.Append( pt );
return poly.Collide( VECTOR2I( aPosition ), maxdist ); return poly.Collide( aPosition, maxdist );
} }
else // Open rect hit-test else // Open rect hit-test
{ {
@ -795,9 +795,9 @@ bool EDA_SHAPE::hitTest( const VECTOR2I& aPosition, int aAccuracy ) const
case SHAPE_T::POLY: case SHAPE_T::POLY:
if( IsFilled() ) if( IsFilled() )
return m_poly.Collide( VECTOR2I( aPosition ), maxdist ); return m_poly.Collide( aPosition, maxdist );
else else
return m_poly.CollideEdge( VECTOR2I( aPosition ), nullptr, maxdist ); return m_poly.CollideEdge( aPosition, nullptr, maxdist );
default: default:
UNIMPLEMENTED_FOR( SHAPE_T_asString() ); UNIMPLEMENTED_FOR( SHAPE_T_asString() );

25
pcbnew/pcb_text.cpp
View File

@ -148,10 +148,22 @@ void PCB_TEXT::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_IT
} }
int PCB_TEXT::getKnockoutMargin() const
{
VECTOR2I textSize( GetTextWidth(), GetTextHeight() );
int thickness = GetTextThickness();
return thickness * 1.5 + GetKnockoutTextMargin( textSize, thickness );
}
const EDA_RECT PCB_TEXT::GetBoundingBox() const const EDA_RECT PCB_TEXT::GetBoundingBox() const
{ {
EDA_RECT rect = GetTextBox(); EDA_RECT rect = GetTextBox();
if( IsKnockout() )
rect.Inflate( getKnockoutMargin() );
if( !GetTextAngle().IsZero() ) if( !GetTextAngle().IsZero() )
rect = rect.GetBoundingBoxRotated( GetTextPos(), GetTextAngle() ); rect = rect.GetBoundingBoxRotated( GetTextPos(), GetTextAngle() );
@ -161,7 +173,18 @@ const EDA_RECT PCB_TEXT::GetBoundingBox() const
bool PCB_TEXT::TextHitTest( const VECTOR2I& aPoint, int aAccuracy ) const bool PCB_TEXT::TextHitTest( const VECTOR2I& aPoint, int aAccuracy ) const
{ {
return EDA_TEXT::TextHitTest( aPoint, aAccuracy ); if( IsKnockout() )
{
SHAPE_POLY_SET poly;
TransformBoundingBoxWithClearanceToPolygon( &poly, getKnockoutMargin() );
return poly.Collide( aPoint, aAccuracy );
}
else
{
return EDA_TEXT::TextHitTest( aPoint, aAccuracy );
}
} }

3
pcbnew/pcb_text.h
View File

@ -153,6 +153,9 @@ public:
#if defined(DEBUG) #if defined(DEBUG)
virtual void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); } virtual void Show( int nestLevel, std::ostream& os ) const override { ShowDummy( os ); }
#endif #endif
protected:
int getKnockoutMargin() const;
}; };
#endif // #define PCB_TEXT_H #endif // #define PCB_TEXT_H