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

Give up trying to find a one-size-fits-all boudningBox for text. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11636
This commit is contained in:
Jeff Young 2022-05-18 12:43:58 +01:00
parent 5edc03e85b
commit cc86d3da2a
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/pcb_painter.cpp
View File

@ -1681,7 +1681,7 @@ void PCB_PAINTER::draw( const PCB_TEXT* aText, int aLayer )
font->Draw( &callback_gal, resolvedText, aText->GetDrawPos(), attrs ); font->Draw( &callback_gal, resolvedText, aText->GetDrawPos(), attrs );
SHAPE_POLY_SET finalPoly; SHAPE_POLY_SET finalPoly;
int margin = attrs.m_StrokeWidth * 1.5; int margin = attrs.m_StrokeWidth * 2.5;
aText->TransformBoundingBoxWithClearanceToPolygon( &finalPoly, margin ); aText->TransformBoundingBoxWithClearanceToPolygon( &finalPoly, margin );
finalPoly.BooleanSubtract( knockouts, SHAPE_POLY_SET::PM_FAST ); finalPoly.BooleanSubtract( knockouts, SHAPE_POLY_SET::PM_FAST );

31
pcbnew/zone_filler.cpp
View File

@ -35,6 +35,10 @@
#include <pcb_shape.h> #include <pcb_shape.h>
#include <pcb_target.h> #include <pcb_target.h>
#include <pcb_track.h> #include <pcb_track.h>
#include <pcb_text.h>
#include <pcb_textbox.h>
#include <fp_text.h>
#include <fp_textbox.h>
#include <connectivity/connectivity_data.h> #include <connectivity/connectivity_data.h>
#include <convert_basic_shapes_to_polygon.h> #include <convert_basic_shapes_to_polygon.h>
#include <board_commit.h> #include <board_commit.h>
@ -517,6 +521,33 @@ void ZONE_FILLER::addHoleKnockout( PAD* aPad, int aGap, SHAPE_POLY_SET& aHoles )
void ZONE_FILLER::addKnockout( BOARD_ITEM* aItem, PCB_LAYER_ID aLayer, int aGap, void ZONE_FILLER::addKnockout( BOARD_ITEM* aItem, PCB_LAYER_ID aLayer, int aGap,
bool aIgnoreLineWidth, SHAPE_POLY_SET& aHoles ) bool aIgnoreLineWidth, SHAPE_POLY_SET& aHoles )
{ {
// Text has a complicated relationship with its boudingBox due to ascenders, descenders,
// diacriticals, etc. Some things want a fairly tight bounding box, and some things don't.
// Since there's no uniformly "correct" answer, we pad the bounding box here to limit
// shorting as much as possible. (Note, however, that it will be caught by DRC either way,
// as it's not reliant on the bounding box.)
switch( aItem->Type() )
{
case PCB_TEXT_T:
aGap += static_cast<PCB_TEXT*>( aItem )->GetTextThickness();
break;
case PCB_TEXTBOX_T:
aGap += static_cast<PCB_TEXTBOX*>( aItem )->GetTextThickness();
break;
case PCB_FP_TEXT_T:
aGap += static_cast<FP_TEXT*>( aItem )->GetTextThickness();
break;
case PCB_FP_TEXTBOX_T:
aGap += static_cast<FP_TEXTBOX*>( aItem )->GetTextThickness();
break;
default:
break;
}
switch( aItem->Type() ) switch( aItem->Type() )
{ {
case PCB_SHAPE_T: case PCB_SHAPE_T: