realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Correctly handle mandatory fields when adding/removing.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/19819
This commit is contained in:
Jeff Young 2025-02-02 17:50:30 +00:00
parent 4eb0e70ddf
commit 96022ee169
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pcbnew/footprint.cpp
View File

@ -1069,10 +1069,21 @@ void FOOTPRINT::Add( BOARD_ITEM* aBoardItem, ADD_MODE aMode, bool aSkipConnectiv
switch( aBoardItem->Type() )
{
case PCB_FIELD_T:
// Always append fields
m_fields.push_back( static_cast<PCB_FIELD*>( aBoardItem ) );
{
PCB_FIELD* field = static_cast<PCB_FIELD*>( aBoardItem );
if( field->IsMandatory() )
{
wxASSERT( m_fields[ field->GetId() ] == nullptr );
m_fields[ field->GetId() ] = field;
}
else
{
m_fields.push_back( static_cast<PCB_FIELD*>( aBoardItem ) );
}
break;
}
case PCB_TEXT_T:
case PCB_DIM_ALIGNED_T:
@ -1133,16 +1144,26 @@ void FOOTPRINT::Remove( BOARD_ITEM* aBoardItem, REMOVE_MODE aMode )
{
case PCB_FIELD_T:
{
for( auto it = m_fields.begin(); it != m_fields.end(); ++it )
PCB_FIELD* field = static_cast<PCB_FIELD*>( aBoardItem );
if( field->IsMandatory() )
{
if( *it == aBoardItem )
m_fields[ field->GetId() ] = nullptr;
}
else
{
for( auto it = m_fields.begin(); it != m_fields.end(); ++it )
{
m_fields.erase( it );
break;
if( *it == field )
{
m_fields.erase( it );
break;
}
}
}
break;
}
break;
case PCB_TEXT_T:
case PCB_DIM_ALIGNED_T: