Layer handling for copper sliver exclusions.

Fixes https://gitlab.com/kicad/code/kicad/issues/10147

include/board_item.h

@@ -50,9 +50,9 @@ class PCB_GROUP;
 class BOARD_ITEM : public EDA_ITEM
 {
 public:
-    BOARD_ITEM( BOARD_ITEM* aParent, KICAD_T idtype ) :
+    BOARD_ITEM( BOARD_ITEM* aParent, KICAD_T idtype, PCB_LAYER_ID aLayer = F_Cu ) :
             EDA_ITEM( aParent, idtype ),
-            m_layer( F_Cu ),
+            m_layer( aLayer ),
             m_group( nullptr )
     {
     }

pcbnew/pcb_marker.cpp

@@ -44,8 +44,9 @@
 
 
 
-PCB_MARKER::PCB_MARKER( std::shared_ptr<RC_ITEM> aItem, const VECTOR2I& aPosition ) :
-    BOARD_ITEM( nullptr, PCB_MARKER_T ),  // parent set during BOARD::Add()
+PCB_MARKER::PCB_MARKER( std::shared_ptr<RC_ITEM> aItem, const VECTOR2I& aPosition,
+                        PCB_LAYER_ID aLayer ) :
+    BOARD_ITEM( nullptr, PCB_MARKER_T, aLayer ),  // parent set during BOARD::Add()
     MARKER_BASE( SCALING_FACTOR, aItem )
 {
     if( m_rcItem )
@@ -85,18 +86,26 @@ PCB_MARKER::~PCB_MARKER()
 
 wxString PCB_MARKER::Serialize() const
 {
+    wxString lastItem;
+
+    if( m_rcItem->GetErrorCode() == DRCE_COPPER_SLIVER )
+        lastItem = LayerName( m_layer );
+    else
+        lastItem = m_rcItem->GetAuxItemID().AsString();
+
     return wxString::Format( wxT( "%s|%d|%d|%s|%s" ),
                              m_rcItem->GetSettingsKey(),
                              m_Pos.x,
                              m_Pos.y,
                              m_rcItem->GetMainItemID().AsString(),
-                             m_rcItem->GetAuxItemID().AsString() );
+                             lastItem );
 }
 
 
 PCB_MARKER* PCB_MARKER::Deserialize( const wxString& data )
 {
     wxArrayString props = wxSplit( data, '|' );
+    PCB_LAYER_ID  markerLayer = F_Cu;
     VECTOR2I      markerPos( (int) strtol( props[1].c_str(), nullptr, 10 ),
                              (int) strtol( props[2].c_str(), nullptr, 10 ) );
 
@@ -105,9 +114,25 @@ PCB_MARKER* PCB_MARKER::Deserialize( const wxString& data )
     if( !drcItem )
         return nullptr;
 
-    drcItem->SetItems( KIID( props[3] ), KIID( props[4] ) );
+    if( drcItem->GetErrorCode() == DRCE_COPPER_SLIVER )
+    {
+        drcItem->SetItems( KIID( props[3] ) );
+
+        for( int layer = 0; layer < PCB_LAYER_ID_COUNT; ++layer )
+        {
+            if( LayerName( ToLAYER_ID( layer ) ) == props[4] )
+            {
+                markerLayer = ToLAYER_ID( layer );
+                break;
+            }
+        }
+    }
+    else
+    {
+        drcItem->SetItems( KIID( props[3] ), KIID( props[4] ) );
+    }
 
-    return new PCB_MARKER( drcItem, markerPos );
+    return new PCB_MARKER( drcItem, markerPos, markerLayer );
 }
 
 

pcbnew/pcb_marker.h

@@ -41,7 +41,7 @@ class MSG_PANEL_ITEM;
 class PCB_MARKER : public BOARD_ITEM, public MARKER_BASE
 {
 public:
-    PCB_MARKER( std::shared_ptr<RC_ITEM> aItem, const VECTOR2I& aPosition );
+    PCB_MARKER( std::shared_ptr<RC_ITEM> aItem, const VECTOR2I& aPos, PCB_LAYER_ID aLayer = F_Cu );
     ~PCB_MARKER();
 
     static inline bool ClassOf( const EDA_ITEM* aItem )