Plot gerber: fix two issues:
- ensure the metadata GBR_NETINFO_CMP is added to all PCB_SHAPE living in a footprint - fix a too zealous plot of negative objects on the silkscreen layers, when merging layers to silkscreen layers.
This commit is contained in:
parent
aa7f9a0fe5
commit
ca0e57f036
|
@ -207,6 +207,9 @@ void PlotOneBoardLayer( BOARD *aBoard, PLOTTER* aPlotter, PCB_LAYER_ID aLayer,
|
||||||
|
|
||||||
// Plot the mask
|
// Plot the mask
|
||||||
PlotStandardLayer( aBoard, aPlotter, layer_mask, plotOpt );
|
PlotStandardLayer( aBoard, aPlotter, layer_mask, plotOpt );
|
||||||
|
|
||||||
|
// Disable the negative polarity
|
||||||
|
aPlotter->SetLayerPolarity( true );
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -660,7 +660,6 @@ void BRDITEMS_PLOTTER::PlotPcbText( const EDA_TEXT* aText, PCB_LAYER_ID aLayer,
|
||||||
COLOR4D color = getColor( aLayer );
|
COLOR4D color = getColor( aLayer );
|
||||||
m_plotter->SetColor( color );
|
m_plotter->SetColor( color );
|
||||||
|
|
||||||
//VECTOR2I size = aText->GetTextSize();
|
|
||||||
VECTOR2I pos = aText->GetTextPos();
|
VECTOR2I pos = aText->GetTextPos();
|
||||||
|
|
||||||
TEXT_ATTRIBUTES attrs = aText->GetAttributes();
|
TEXT_ATTRIBUTES attrs = aText->GetAttributes();
|
||||||
|
@ -668,9 +667,6 @@ void BRDITEMS_PLOTTER::PlotPcbText( const EDA_TEXT* aText, PCB_LAYER_ID aLayer,
|
||||||
attrs.m_Angle = aText->GetDrawRotation();
|
attrs.m_Angle = aText->GetDrawRotation();
|
||||||
attrs.m_Multiline = false;
|
attrs.m_Multiline = false;
|
||||||
|
|
||||||
//if( aText->IsMirrored() )
|
|
||||||
// size.x = -size.x;
|
|
||||||
|
|
||||||
m_plotter->SetCurrentLineWidth( attrs.m_StrokeWidth );
|
m_plotter->SetCurrentLineWidth( attrs.m_StrokeWidth );
|
||||||
|
|
||||||
if( aIsKnockout )
|
if( aIsKnockout )
|
||||||
|
@ -802,7 +798,10 @@ void BRDITEMS_PLOTTER::PlotPcbShape( const PCB_SHAPE* aShape )
|
||||||
GBR_METADATA gbr_metadata;
|
GBR_METADATA gbr_metadata;
|
||||||
|
|
||||||
if( parentFP )
|
if( parentFP )
|
||||||
|
{
|
||||||
gbr_metadata.SetCmpReference( parentFP->GetReference() );
|
gbr_metadata.SetCmpReference( parentFP->GetReference() );
|
||||||
|
gbr_metadata.SetNetAttribType( GBR_NETLIST_METADATA::GBR_NETINFO_CMP );
|
||||||
|
}
|
||||||
|
|
||||||
if( aShape->GetLayer() == Edge_Cuts )
|
if( aShape->GetLayer() == Edge_Cuts )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue