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

pcbnew: improve handling of trailing '/' in hierarchical sheet paths in DRC memberOfSheet() function

Browse Source
This commit is contained in:
Tomasz Wlostowski 2024-01-09 18:03:13 +01:00
parent cb4b26b39b
commit 64afa302c9
1 changed files with 14 additions and 6 deletions

20
pcbnew/pcbexpr_functions.cpp
View File

@ -927,19 +927,27 @@ static void memberOfSheetFunc( LIBEVAL::CONTEXT* aCtx, void* self )
result->SetDeferredEval(
[item, arg]() -> double
{
FOOTPRINT* fp = dyn_cast<FOOTPRINT*>( item );
FOOTPRINT* fp = item->GetParentFootprint();
if( !fp )
fp = item->GetParentFootprint();
if( !fp && item->Type() == PCB_FOOTPRINT_T )
fp = static_cast<FOOTPRINT*>( item );
if( !fp )
return 0.0;
if( fp->GetSheetname().Matches( arg->AsString() ) )
wxString sheetName = fp->GetSheetname();
wxString refName = arg->AsString();
if( sheetName.EndsWith( wxT("/") ) )
sheetName.RemoveLast();
if( refName.EndsWith( wxT("/") ) )
refName.RemoveLast();
if( sheetName.Matches( refName ) )
return 1.0;
if( ( arg->AsString().Matches( wxT( "/" ) ) || arg->AsString().IsEmpty() )
&& fp->GetSheetname() == wxT( "Root" ) )
if( ( refName.Matches( wxT( "/" ) ) || refName.IsEmpty() )
&& sheetName.IsEmpty() )
{
return 1.0;
}