From 4df5f9969a9a45350a72263e26d05d75acd01123 Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sat, 28 Oct 2023 12:12:21 +0100 Subject: [PATCH] Remove unnecessarily restrictive IsCopper() checks. Fixes https://gitlab.com/kicad/code/kicad/-/issues/11588 --- pcbnew/plugins/eagle/eagle_plugin.cpp | 36 +++++++++++---------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/pcbnew/plugins/eagle/eagle_plugin.cpp b/pcbnew/plugins/eagle/eagle_plugin.cpp index 4504390d4a..9d660597de 100644 --- a/pcbnew/plugins/eagle/eagle_plugin.cpp +++ b/pcbnew/plugins/eagle/eagle_plugin.cpp @@ -904,31 +904,26 @@ void EAGLE_PLUGIN::loadPlain( wxXmlNode* aGraphics ) ERECT r( gr ); PCB_LAYER_ID layer = kicad_layer( r.layer ); + ZONE* zone = new ZONE( m_board ); - if( IsCopperLayer( layer ) ) - { - // use a "netcode = 0" type ZONE: - ZONE* zone = new ZONE( m_board ); - m_board->Add( zone, ADD_MODE::APPEND ); + m_board->Add( zone, ADD_MODE::APPEND ); - zone->SetLayer( layer ); - zone->SetNetCode( NETINFO_LIST::UNCONNECTED ); + zone->SetLayer( layer ); + zone->SetNetCode( NETINFO_LIST::UNCONNECTED ); - ZONE_BORDER_DISPLAY_STYLE outline_hatch = ZONE_BORDER_DISPLAY_STYLE::DIAGONAL_EDGE; + ZONE_BORDER_DISPLAY_STYLE outline_hatch = ZONE_BORDER_DISPLAY_STYLE::DIAGONAL_EDGE; - const int outlineIdx = -1; // this is the id of the copper zone main outline - zone->AppendCorner( VECTOR2I( kicad_x( r.x1 ), kicad_y( r.y1 ) ), outlineIdx ); - zone->AppendCorner( VECTOR2I( kicad_x( r.x2 ), kicad_y( r.y1 ) ), outlineIdx ); - zone->AppendCorner( VECTOR2I( kicad_x( r.x2 ), kicad_y( r.y2 ) ), outlineIdx ); - zone->AppendCorner( VECTOR2I( kicad_x( r.x1 ), kicad_y( r.y2 ) ), outlineIdx ); + const int outlineIdx = -1; // this is the id of the copper zone main outline + zone->AppendCorner( VECTOR2I( kicad_x( r.x1 ), kicad_y( r.y1 ) ), outlineIdx ); + zone->AppendCorner( VECTOR2I( kicad_x( r.x2 ), kicad_y( r.y1 ) ), outlineIdx ); + zone->AppendCorner( VECTOR2I( kicad_x( r.x2 ), kicad_y( r.y2 ) ), outlineIdx ); + zone->AppendCorner( VECTOR2I( kicad_x( r.x1 ), kicad_y( r.y2 ) ), outlineIdx ); - if( r.rot ) - zone->Rotate( zone->GetPosition(), EDA_ANGLE( r.rot->degrees, DEGREES_T ) ); + if( r.rot ) + zone->Rotate( zone->GetPosition(), EDA_ANGLE( r.rot->degrees, DEGREES_T ) ); - // this is not my fault: - zone->SetBorderDisplayStyle( outline_hatch, ZONE::GetDefaultHatchPitch(), - true ); - } + // this is not my fault: + zone->SetBorderDisplayStyle( outline_hatch, ZONE::GetDefaultHatchPitch(), true ); m_xpath->pop(); } @@ -1452,9 +1447,6 @@ ZONE* EAGLE_PLUGIN::loadPolygon( wxXmlNode* aPolyNode ) return nullptr; } - if( !IsCopperLayer( layer ) && !keepout ) - return nullptr; - // use a "netcode = 0" type ZONE: std::unique_ptr zone = std::make_unique( m_board );