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

PCB_GENERATOR_Ts are PCB_GROUP_Ts too. 

Also, an item must already be in a commit to add it to a group.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/17595
This commit is contained in:
Jeff Young 2024-06-05 10:47:50 +01:00
parent 944835eefc
commit 9fb07d886e
2 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/board_commit.cpp
View File

@ -291,7 +291,7 @@ void BOARD_COMMIT::Push( const wxString& aMessage, int aCommitFlags )
} }
} }
if( boardItem->Type() == PCB_GROUP_T ) if( boardItem->Type() == PCB_GROUP_T || boardItem->Type() == PCB_GENERATOR_T )
addedGroup = static_cast<PCB_GROUP*>( boardItem ); addedGroup = static_cast<PCB_GROUP*>( boardItem );
if( m_isBoardEditor && autofillZones && boardItem->Type() != PCB_MARKER_T ) if( m_isBoardEditor && autofillZones && boardItem->Type() != PCB_MARKER_T )
@ -352,24 +352,6 @@ void BOARD_COMMIT::Push( const wxString& aMessage, int aCommitFlags )
case PCB_MARKER_T: // a marker used to show something case PCB_MARKER_T: // a marker used to show something
case PCB_ZONE_T: case PCB_ZONE_T:
case PCB_FOOTPRINT_T: case PCB_FOOTPRINT_T:
if( view )
view->Remove( boardItem );
if( !( changeFlags & CHT_DONE ) )
{
if( parentFP )
{
parentFP->Remove( boardItem );
}
else
{
board->Remove( boardItem, REMOVE_MODE::BULK );
bulkRemovedItems.push_back( boardItem );
}
}
break;
case PCB_GROUP_T: case PCB_GROUP_T:
if( view ) if( view )
view->Remove( boardItem ); view->Remove( boardItem );

5
pcbnew/generators/pcb_tuning_pattern.cpp
View File

@ -1456,17 +1456,16 @@ void PCB_TUNING_PATTERN::EditPush( GENERATOR_TOOL* aTool, BOARD* aBoard, BOARD_C
for( BOARD_ITEM* item : routerAddedItems ) for( BOARD_ITEM* item : routerAddedItems )
{ {
aCommit->Add( item );
if( PCB_TRACK* track = dynamic_cast<PCB_TRACK*>( item ) ) if( PCB_TRACK* track = dynamic_cast<PCB_TRACK*>( item ) )
{ {
if( bounds.PointInside( track->GetStart(), epsilon ) if( bounds.PointInside( track->GetStart(), epsilon )
&& bounds.PointInside( track->GetEnd(), epsilon ) ) && bounds.PointInside( track->GetEnd(), epsilon ) )
{ {
AddItem( item );
aCommit->Stage( item, CHT_GROUP ); aCommit->Stage( item, CHT_GROUP );
} }
} }
aCommit->Add( item );
} }
} }