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

FABMASTER: Handle polygons better 

Polygons in non-etch layers need special handling to ensure they get
treated the same.

Fixes https://gitlab.com/kicad/code/kicad/issues/7731
This commit is contained in:
Seth Hillbrand 2021-02-26 14:00:19 -08:00
parent 824a942f55
commit 75c525af4f
2 changed files with 51 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pcbnew/plugins/fabmaster/import_fabmaster.cpp
View File

@ -2433,24 +2433,15 @@ bool FABMASTER::loadEtch( BOARD* aBoard, const std::unique_ptr<FABMASTER::TRACE>
} }
bool FABMASTER::loadPolygon( BOARD* aBoard, const std::unique_ptr<FABMASTER::TRACE>& aLine) SHAPE_POLY_SET FABMASTER::loadShapePolySet( const graphic_element& aElement )
{ {
if( aLine->segment.size() < 3 ) SHAPE_POLY_SET poly_outline;
return false;
PCB_LAYER_ID layer = Cmts_User;
int last_subseq = 0; int last_subseq = 0;
int hole_idx = -1; int hole_idx = -1;
SHAPE_POLY_SET poly_outline;
poly_outline.NewOutline(); poly_outline.NewOutline();
auto new_layer = getLayer( aLine->layer ); for( const auto& seg : aElement )
if( IsValidLayer( new_layer ) )
layer = new_layer;
for( const auto& seg : aLine->segment )
{ {
if( seg->subseq > 0 || seg->subseq != last_subseq ) if( seg->subseq > 0 || seg->subseq != last_subseq )
hole_idx = poly_outline.AddHole( SHAPE_LINE_CHAIN{} ); hole_idx = poly_outline.AddHole( SHAPE_LINE_CHAIN{} );
@ -2474,6 +2465,23 @@ bool FABMASTER::loadPolygon( BOARD* aBoard, const std::unique_ptr<FABMASTER::TRA
} }
poly_outline.Fracture( SHAPE_POLY_SET::POLYGON_MODE::PM_FAST ); poly_outline.Fracture( SHAPE_POLY_SET::POLYGON_MODE::PM_FAST );
return poly_outline;
}
bool FABMASTER::loadPolygon( BOARD* aBoard, const std::unique_ptr<FABMASTER::TRACE>& aLine)
{
if( aLine->segment.size() < 3 )
return false;
PCB_LAYER_ID layer = Cmts_User;
auto new_layer = getLayer( aLine->layer );
if( IsValidLayer( new_layer ) )
layer = new_layer;
SHAPE_POLY_SET poly_outline = loadShapePolySet( aLine->segment );
if( poly_outline.OutlineCount() < 1 || poly_outline.COutline( 0 ).PointCount() < 3 ) if( poly_outline.OutlineCount() < 1 || poly_outline.COutline( 0 ).PointCount() < 3 )
return false; return false;
@ -2680,16 +2688,39 @@ bool FABMASTER::loadGraphics( BOARD* aBoard )
{ {
PCB_LAYER_ID layer; PCB_LAYER_ID layer;
if( geom.subclass == "SILKSCREEN_TOP" )
layer = F_SilkS;
else if( geom.subclass == "SILKSCREEN_BOTTOM" )
layer = B_SilkS;
// The pin numbers are not useful for us outside of the footprints // The pin numbers are not useful for us outside of the footprints
else if( geom.subclass == "PIN_NUMBER" ) if( geom.subclass == "PIN_NUMBER" )
continue; continue;
else
layer = getLayer( geom.subclass );
if( layer == UNDEFINED_LAYER )
layer = Cmts_User; layer = Cmts_User;
if( !geom.elements->empty() )
{
/// Zero-width segments/arcs are polygon outlines
if( ( *( geom.elements->begin() ) )->width == 0 )
{
SHAPE_POLY_SET poly_outline = loadShapePolySet( *( geom.elements ) );
if( poly_outline.OutlineCount() < 1 || poly_outline.COutline( 0 ).PointCount() < 3 )
continue;
PCB_SHAPE* new_poly = new PCB_SHAPE( aBoard );
new_poly->SetShape( S_POLYGON );
new_poly->SetLayer( layer );
new_poly->SetPolyShape( poly_outline );
new_poly->SetWidth( 0 );
if( layer == F_SilkS || layer == B_SilkS )
new_poly->SetFilled( true );
aBoard->Add( new_poly, ADD_MODE::APPEND );
}
}
for( auto& seg : *geom.elements ) for( auto& seg : *geom.elements )
{ {
switch( seg->shape ) switch( seg->shape )

2
pcbnew/plugins/fabmaster/import_fabmaster.h
View File

@ -568,6 +568,8 @@ private:
bool loadPolygon( BOARD* aBoard, const std::unique_ptr<FABMASTER::TRACE>& aLine); bool loadPolygon( BOARD* aBoard, const std::unique_ptr<FABMASTER::TRACE>& aLine);
bool loadFootprints( BOARD* aBoard ); bool loadFootprints( BOARD* aBoard );
SHAPE_POLY_SET loadShapePolySet( const graphic_element& aLine);
}; };