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

Handle duplication of footprint ref and value. 

Fixes https://gitlab.com/kicad/code/kicad/issues/3828
This commit is contained in:
Jeff Young 2020-02-02 23:46:26 +00:00
parent a04fdf64da
commit 2286652abe
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
pcbnew/class_module.cpp
View File

@ -1295,23 +1295,24 @@ void MODULE::SetOrientation( double newangle )
CalculateBoundingBox(); CalculateBoundingBox();
} }
BOARD_ITEM* MODULE::Duplicate( const BOARD_ITEM* aItem, BOARD_ITEM* MODULE::Duplicate( const BOARD_ITEM* aItem, bool aIncrementPadNumbers,
bool aIncrementPadNumbers,
bool aAddToModule ) bool aAddToModule )
{ {
BOARD_ITEM* new_item = NULL; BOARD_ITEM* new_item = NULL;
D_PAD* new_pad = NULL;
MODULE_ZONE_CONTAINER* new_zone = NULL; MODULE_ZONE_CONTAINER* new_zone = NULL;
switch( aItem->Type() ) switch( aItem->Type() )
{ {
case PCB_PAD_T: case PCB_PAD_T:
{ {
new_pad = new D_PAD( *static_cast<const D_PAD*>( aItem ) ); D_PAD* new_pad = new D_PAD( *static_cast<const D_PAD*>( aItem ) );
if( aAddToModule ) if( aAddToModule )
m_pads.push_back( new_pad ); m_pads.push_back( new_pad );
if( aIncrementPadNumbers && !new_pad->IsAperturePad() )
new_pad->IncrementPadName( true, true );
new_item = new_pad; new_item = new_pad;
break; break;
} }
@ -1329,26 +1330,30 @@ BOARD_ITEM* MODULE::Duplicate( const BOARD_ITEM* aItem,
case PCB_MODULE_TEXT_T: case PCB_MODULE_TEXT_T:
{ {
const TEXTE_MODULE* old_text = static_cast<const TEXTE_MODULE*>( aItem ); TEXTE_MODULE* new_text = new TEXTE_MODULE( *static_cast<const TEXTE_MODULE*>( aItem ) );
// do not duplicate value or reference fields if( new_text->GetType() == TEXTE_MODULE::TEXT_is_REFERENCE )
// (there can only be one of each)
if( old_text->GetType() == TEXTE_MODULE::TEXT_is_DIVERS )
{ {
TEXTE_MODULE* new_text = new TEXTE_MODULE( *old_text ); new_text->SetText( wxT( "%R" ) );
new_text->SetType( TEXTE_MODULE::TEXT_is_DIVERS );
if( aAddToModule )
Add( new_text );
new_item = new_text;
} }
else if( new_text->GetType() == TEXTE_MODULE::TEXT_is_VALUE )
{
new_text->SetText( wxT( "%V" ) );
new_text->SetType( TEXTE_MODULE::TEXT_is_DIVERS );
}
if( aAddToModule )
Add( new_text );
new_item = new_text;
break; break;
} }
case PCB_MODULE_EDGE_T: case PCB_MODULE_EDGE_T:
{ {
EDGE_MODULE* new_edge = new EDGE_MODULE( EDGE_MODULE* new_edge = new EDGE_MODULE( *static_cast<const EDGE_MODULE*>(aItem) );
*static_cast<const EDGE_MODULE*>(aItem) );
if( aAddToModule ) if( aAddToModule )
Add( new_edge ); Add( new_edge );
@ -1363,16 +1368,10 @@ BOARD_ITEM* MODULE::Duplicate( const BOARD_ITEM* aItem,
default: default:
// Un-handled item for duplication // Un-handled item for duplication
wxASSERT_MSG( false, "Duplication not supported for items of class " wxFAIL_MSG( "Duplication not supported for items of class " + aItem->GetClass() );
+ aItem->GetClass() );
break; break;
} }
if( aIncrementPadNumbers && new_pad && !new_pad->IsAperturePad() )
{
new_pad->IncrementPadName( true, true );
}
return new_item; return new_item;
} }