From 6cfff7156a0da0cc7e8502bbfad525a2d39001c0 Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sun, 29 Sep 2024 09:34:47 +0200
Subject: [PATCH] PNS router: rename IsCopperLayer( int aLayer ) to avoid a
collision.
IsCopperLayer( int aLayer ) can be ::IsCopperLayer( int aLayer ) or
PNS_KICAD_IFACE_BASE::IsCopperLayer( int aLayer ) in pns_kicad_iface.cpp
This is error prone.
So, to avoid mistakes, PNS_KICAD_IFACE_BASE uses now 2 functions:
- IsPNSCopperLayer( int aPNSLayer )
- IsKicadCopperLayer( PCB_LAYER_ID aPcbnewLayer )
Fixes https://gitlab.com/kicad/code/kicad/-/issues/18800
---
pcbnew/router/pns_kicad_iface.cpp | 16 ++++++++++++----
pcbnew/router/pns_kicad_iface.h | 3 ++-
pcbnew/router/pns_router.h | 2 +-
pcbnew/router/pns_tool_base.cpp | 2 +-
pcbnew/router/router_tool.cpp | 2 +-
5 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/pcbnew/router/pns_kicad_iface.cpp b/pcbnew/router/pns_kicad_iface.cpp
index 8971cfef6c..2a7c284e7d 100644
--- a/pcbnew/router/pns_kicad_iface.cpp
+++ b/pcbnew/router/pns_kicad_iface.cpp
@@ -1350,7 +1350,7 @@ bool PNS_KICAD_IFACE_BASE::syncZone( PNS::NODE* aWorld, ZONE* aZone, SHAPE_POLY_
bool PNS_KICAD_IFACE_BASE::syncTextItem( PNS::NODE* aWorld, PCB_TEXT* aText, PCB_LAYER_ID aLayer )
{
- if( !IsCopperLayer( aLayer ) )
+ if( !IsKicadCopperLayer( aLayer ) )
return false;
std::unique_ptr<PNS::SOLID> solid = std::make_unique<PNS::SOLID>();
@@ -1383,7 +1383,7 @@ bool PNS_KICAD_IFACE_BASE::syncGraphicalItem( PNS::NODE* aWorld, PCB_SHAPE* aIte
{
if( aItem->GetLayer() == Edge_Cuts
|| aItem->GetLayer() == Margin
- || IsCopperLayer( aItem->GetLayer() ) )
+ || IsKicadCopperLayer( aItem->GetLayer() ) )
{
std::vector<SHAPE*> shapes = aItem->MakeEffectiveShapes();
@@ -1436,9 +1436,17 @@ void PNS_KICAD_IFACE_BASE::SetBoard( BOARD* aBoard )
wxLogTrace( wxT( "PNS" ), wxT( "m_board = %p" ), m_board );
}
-bool PNS_KICAD_IFACE_BASE::IsCopperLayer( int aLayer ) const
+
+bool PNS_KICAD_IFACE_BASE::IsPNSCopperLayer( int aPNSLayer ) const
{
- return ::IsCopperLayer( GetBoardLayerFromPNSLayer( aLayer ) );
+ return ::IsCopperLayer( GetBoardLayerFromPNSLayer( aPNSLayer ) );
+}
+
+
+
+bool PNS_KICAD_IFACE_BASE::IsKicadCopperLayer( PCB_LAYER_ID aKicadLayer ) const
+{
+ return ::IsCopperLayer( aKicadLayer );
}
diff --git a/pcbnew/router/pns_kicad_iface.h b/pcbnew/router/pns_kicad_iface.h
index 3af38ab5ce..b11d1d6ad1 100644
--- a/pcbnew/router/pns_kicad_iface.h
+++ b/pcbnew/router/pns_kicad_iface.h
@@ -61,7 +61,8 @@ public:
bool IsFlashedOnLayer( const PNS::ITEM* aItem, int aLayer ) const override;
bool IsFlashedOnLayer( const PNS::ITEM* aItem, const PNS_LAYER_RANGE& aLayer ) const override;
bool IsItemVisible( const PNS::ITEM* aItem ) const override { return true; };
- bool IsCopperLayer( int aLayer ) const override;
+ bool IsPNSCopperLayer( int aPNSLayer ) const override;
+ bool IsKicadCopperLayer( PCB_LAYER_ID aPcbnewLayer ) const;
void HideItem( PNS::ITEM* aItem ) override {}
void DisplayItem( const PNS::ITEM* aItem, int aClearance, bool aEdit = false,
int aFlags = 0 ) override {}
diff --git a/pcbnew/router/pns_router.h b/pcbnew/router/pns_router.h
index 65cf79ac6e..a838b8015d 100644
--- a/pcbnew/router/pns_router.h
+++ b/pcbnew/router/pns_router.h
@@ -97,7 +97,7 @@ enum DRAG_MODE
virtual bool IsItemVisible( const PNS::ITEM* aItem ) const = 0;
virtual bool IsFlashedOnLayer( const PNS::ITEM* aItem, int aLayer ) const = 0;
virtual bool IsFlashedOnLayer( const PNS::ITEM* aItem, const PNS_LAYER_RANGE& aLayer ) const = 0;
- virtual bool IsCopperLayer( int aLayer ) const = 0;
+ virtual bool IsPNSCopperLayer( int aPNSLayer ) const = 0;
virtual void DisplayItem( const ITEM* aItem, int aClearance, bool aEdit = false,
int aFlags = 0 ) = 0;
virtual void DisplayPathLine( const SHAPE_LINE_CHAIN& aLine, int aImportance ) = 0;
diff --git a/pcbnew/router/pns_tool_base.cpp b/pcbnew/router/pns_tool_base.cpp
index 82d32922a8..303688f84d 100644
--- a/pcbnew/router/pns_tool_base.cpp
+++ b/pcbnew/router/pns_tool_base.cpp
@@ -146,7 +146,7 @@ ITEM* TOOL_BASE::pickSingleItem( const VECTOR2I& aWhere, NET_HANDLE aNet, int aL
if( !item->IsRoutable() )
continue;
- if( !m_iface->IsCopperLayer( item->Layers().Start() ) )
+ if( !m_iface->IsPNSCopperLayer( item->Layers().Start() ) )
continue;
if( !m_iface->IsAnyLayerVisible( item->Layers() ) )
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index a6ca3e88ea..2aa6cf05e5 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -1160,7 +1160,7 @@ bool ROUTER_TOOL::prepareInteractive( VECTOR2D aStartPosition )
PCB_LAYER_ID pcbLayer = getStartLayer( m_startItem );
int pnsLayer = m_iface->GetPNSLayerFromBoardLayer( pcbLayer );
- if( !IsCopperLayer( pcbLayer ) )
+ if( !::IsCopperLayer( pcbLayer ) )
{
editFrame->ShowInfoBarError( _( "Tracks on Copper layers only." ) );
return false;