AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 00:21:25 +00:00
Files Issues Releases Activity

PNS router: rename IsCopperLayer( int aLayer ) to avoid a collision.

Browse Source 
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
This commit is contained in:
jean-pierre charras 2024-09-29 09:34:47 +02:00
parent e923d6307c
commit 6cfff7156a
5 changed files with 17 additions and 8 deletions

16
pcbnew/router/pns_kicad_iface.cpp
View File

@ -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 ) bool PNS_KICAD_IFACE_BASE::syncTextItem( PNS::NODE* aWorld, PCB_TEXT* aText, PCB_LAYER_ID aLayer )
{ {
if( !IsCopperLayer( aLayer ) ) if( !IsKicadCopperLayer( aLayer ) )
return false; return false;
std::unique_ptr<PNS::SOLID> solid = std::make_unique<PNS::SOLID>(); 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 if( aItem->GetLayer() == Edge_Cuts
|| aItem->GetLayer() == Margin || aItem->GetLayer() == Margin
|| IsCopperLayer( aItem->GetLayer() ) ) || IsKicadCopperLayer( aItem->GetLayer() ) )
{ {
std::vector<SHAPE*> shapes = aItem->MakeEffectiveShapes(); 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 ); 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 );
} }

3
pcbnew/router/pns_kicad_iface.h
View File

@ -61,7 +61,8 @@ public:
bool IsFlashedOnLayer( const PNS::ITEM* aItem, int aLayer ) const override; bool IsFlashedOnLayer( const PNS::ITEM* aItem, int aLayer ) const override;
bool IsFlashedOnLayer( const PNS::ITEM* aItem, const PNS_LAYER_RANGE& 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 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 HideItem( PNS::ITEM* aItem ) override {}
void DisplayItem( const PNS::ITEM* aItem, int aClearance, bool aEdit = false, void DisplayItem( const PNS::ITEM* aItem, int aClearance, bool aEdit = false,
int aFlags = 0 ) override {} int aFlags = 0 ) override {}

2
pcbnew/router/pns_router.h
View File

@ -97,7 +97,7 @@ enum DRAG_MODE
virtual bool IsItemVisible( const PNS::ITEM* aItem ) const = 0; 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, int aLayer ) const = 0;
virtual bool IsFlashedOnLayer( const PNS::ITEM* aItem, const PNS_LAYER_RANGE& 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, virtual void DisplayItem( const ITEM* aItem, int aClearance, bool aEdit = false,
int aFlags = 0 ) = 0; int aFlags = 0 ) = 0;
virtual void DisplayPathLine( const SHAPE_LINE_CHAIN& aLine, int aImportance ) = 0; virtual void DisplayPathLine( const SHAPE_LINE_CHAIN& aLine, int aImportance ) = 0;

2
pcbnew/router/pns_tool_base.cpp
View File

@ -146,7 +146,7 @@ ITEM* TOOL_BASE::pickSingleItem( const VECTOR2I& aWhere, NET_HANDLE aNet, int aL
if( !item->IsRoutable() ) if( !item->IsRoutable() )
continue; continue;
if( !m_iface->IsCopperLayer( item->Layers().Start() ) ) if( !m_iface->IsPNSCopperLayer( item->Layers().Start() ) )
continue; continue;
if( !m_iface->IsAnyLayerVisible( item->Layers() ) ) if( !m_iface->IsAnyLayerVisible( item->Layers() ) )

2
pcbnew/router/router_tool.cpp
View File

@ -1160,7 +1160,7 @@ bool ROUTER_TOOL::prepareInteractive( VECTOR2D aStartPosition )
PCB_LAYER_ID pcbLayer = getStartLayer( m_startItem ); PCB_LAYER_ID pcbLayer = getStartLayer( m_startItem );
int pnsLayer = m_iface->GetPNSLayerFromBoardLayer( pcbLayer ); int pnsLayer = m_iface->GetPNSLayerFromBoardLayer( pcbLayer );
if( !IsCopperLayer( pcbLayer ) ) if( !::IsCopperLayer( pcbLayer ) )
{ {
editFrame->ShowInfoBarError( _( "Tracks on Copper layers only." ) ); editFrame->ShowInfoBarError( _( "Tracks on Copper layers only." ) );
return false; return false;