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

Don't include annotations in boundingbox when not including text. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15411

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15411
This commit is contained in:
Jeff Young 2023-08-26 18:44:47 +01:00
parent 22256c97f3
commit bc3c8b19c6
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/footprint.cpp
View File

@ -1008,10 +1008,19 @@ const BOX2I FOOTPRINT::GetBoundingBox( bool aIncludeText, bool aIncludeInvisible
continue; continue;
} }
// Treat dimension objects as text // If we're not including text then drop annotations as well
if( !aIncludeText && BaseType( item->Type() ) == PCB_DIMENSION_T ) if( !aIncludeText )
{
if( BaseType( item->Type() ) == PCB_DIMENSION_T )
continue; continue;
if( item->GetLayer() == Cmts_User || item->GetLayer() == Dwgs_User
|| item->GetLayer() == Eco1_User || item->GetLayer() == Eco2_User )
{
continue;
}
}
bbox.Merge( item->GetBoundingBox() ); bbox.Merge( item->GetBoundingBox() );
} }

2
pcbnew/footprint_edit_frame.cpp
View File

@ -699,7 +699,7 @@ const BOX2I FOOTPRINT_EDIT_FRAME::GetDocumentExtents( bool aIncludeAllVisible )
{ {
for( const BOARD_ITEM* item : footprint->GraphicalItems() ) for( const BOARD_ITEM* item : footprint->GraphicalItems() )
{ {
if( item->Type() == PCB_TEXT_T ) if( item->Type() == PCB_TEXT_T || item->Type() == PCB_TEXTBOX_T )
continue; continue;
hasGraphicalItem = true; hasGraphicalItem = true;