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

CADSTAR PCB: Handle multi-layer library coppers correctly 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16486
This commit is contained in:
Roberto Fernandez Bautista 2024-01-03 19:56:31 +01:00
parent 0e4fe545a4
commit 94cb513c0e
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pcbnew/pcb_io/cadstar/cadstar_pcb_archive_loader.cpp
View File

@ -847,14 +847,27 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryFigures( const SYMDEF_PCB& aComponen
void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryCoppers( const SYMDEF_PCB& aComponent, void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryCoppers( const SYMDEF_PCB& aComponent,
FOOTPRINT* aFootprint ) FOOTPRINT* aFootprint )
{ {
int totalCopperPads = 0; bool compCopperError = false;
for( COMPONENT_COPPER compCopper : aComponent.ComponentCoppers ) for( COMPONENT_COPPER compCopper : aComponent.ComponentCoppers )
{ {
int lineThickness = getKiCadLength( getCopperCode( compCopper.CopperCodeID ).CopperWidth ); int lineThickness = getKiCadLength( getCopperCode( compCopper.CopperCodeID ).CopperWidth );
PCB_LAYER_ID copperLayer = getKiCadLayer( compCopper.LayerID ); LSET layers = getKiCadLayerSet( compCopper.LayerID );
LSET copperLayers = LSET::AllCuMask() & layers;
LSET remainingLayers = layers;
if( compCopper.AssociatedPadIDs.size() > 0 && LSET::AllCuMask().Contains( copperLayer ) if( !compCopperError && copperLayers.count() > 1 && compCopper.AssociatedPadIDs.size() > 0 )
{
// TODO: Fix when we have full padstacks
wxLogError( _( "Footprint definition '%s' has component copper associated to a pad on "
"multiple layers. Custom padstacks are not supported in KiCad. The "
"copper items have been imported as graphical elements." ),
aComponent.BuildLibName() );
compCopperError = true;
}
if( compCopper.AssociatedPadIDs.size() > 0 && copperLayers.count() == 1
&& compCopper.Shape.Type == SHAPE_TYPE::SOLID ) && compCopper.Shape.Type == SHAPE_TYPE::SOLID )
{ {
// The copper is associated with pads and in an electrical layer which means it can // The copper is associated with pads and in an electrical layer which means it can
@ -883,7 +896,7 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryCoppers( const SYMDEF_PCB& aComponen
std::unique_ptr<PAD> pad = std::make_unique<PAD>( aFootprint ); std::unique_ptr<PAD> pad = std::make_unique<PAD>( aFootprint );
pad->SetKeepTopBottom( false ); // TODO: correct? This seems to be KiCad default on import pad->SetKeepTopBottom( false ); // TODO: correct? This seems to be KiCad default on import
pad->SetAttribute( PAD_ATTRIB::SMD ); pad->SetAttribute( PAD_ATTRIB::SMD );
pad->SetLayerSet( LSET( 1, copperLayer ) ); pad->SetLayerSet( copperLayers );
pad->SetNumber( anchorPad.Identifier.IsEmpty() pad->SetNumber( anchorPad.Identifier.IsEmpty()
? wxString::Format( wxT( "%ld" ), anchorPad.ID ) ? wxString::Format( wxT( "%ld" ), anchorPad.ID )
: anchorPad.Identifier ); : anchorPad.Identifier );
@ -922,17 +935,22 @@ void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryCoppers( const SYMDEF_PCB& aComponen
// when finding pads by PAD_ID. See loadNets() // when finding pads by PAD_ID. See loadNets()
m_librarycopperpads[aComponent.ID][anchorPad.ID].push_back( aFootprint->Pads().size() ); m_librarycopperpads[aComponent.ID][anchorPad.ID].push_back( aFootprint->Pads().size() );
totalCopperPads++;
remainingLayers ^= copperLayers; // don't process copper layers again!
} }
else
if( remainingLayers.any() )
{ {
drawCadstarShape( compCopper.Shape, copperLayer, lineThickness, for( const PCB_LAYER_ID& layer : remainingLayers.Seq() )
{
drawCadstarShape( compCopper.Shape, layer, lineThickness,
wxString::Format( wxT( "Component %s:%s -> Copper element" ), wxString::Format( wxT( "Component %s:%s -> Copper element" ),
aComponent.ReferenceName, aComponent.Alternate ), aComponent.ReferenceName, aComponent.Alternate ),
aFootprint ); aFootprint );
} }
} }
} }
}
void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryAreas( const SYMDEF_PCB& aComponent, void CADSTAR_PCB_ARCHIVE_LOADER::loadLibraryAreas( const SYMDEF_PCB& aComponent,