haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure that GetConnectedItems searches from the root item. 

Fixes https://gitlab.com/kicad/code/kicad/issues/10583
This commit is contained in:
Jeff Young 2022-02-06 17:26:30 +00:00
parent b1cc784582
commit e59aaf05c6
5 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -315,9 +315,9 @@ const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUST
} }
const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUSTER_SEARCH_MODE aMode, const CN_CONNECTIVITY_ALGO::CLUSTERS
const KICAD_T aTypes[], CN_CONNECTIVITY_ALGO::SearchClusters( CLUSTER_SEARCH_MODE aMode, const KICAD_T aTypes[],
int aSingleNet ) int aSingleNet, CN_ITEM* rootItem )
{ {
bool withinAnyNet = ( aMode != CSM_PROPAGATE ); bool withinAnyNet = ( aMode != CSM_PROPAGATE );
@ -330,7 +330,7 @@ const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUST
searchConnections(); searchConnections();
auto addToSearchList = auto addToSearchList =
[&item_set, withinAnyNet, aSingleNet, aTypes]( CN_ITEM *aItem ) [&item_set, withinAnyNet, aSingleNet, aTypes, rootItem ]( CN_ITEM *aItem )
{ {
if( withinAnyNet && aItem->Net() <= 0 ) if( withinAnyNet && aItem->Net() <= 0 )
return; return;
@ -352,7 +352,7 @@ const CN_CONNECTIVITY_ALGO::CLUSTERS CN_CONNECTIVITY_ALGO::SearchClusters( CLUST
} }
} }
if( !found ) if( !found && aItem != rootItem )
return; return;
aItem->SetVisited( false ); aItem->SetVisited( false );

2
pcbnew/connectivity/connectivity_algo.h
View File

@ -214,7 +214,7 @@ public:
bool Add( BOARD_ITEM* aItem ); bool Add( BOARD_ITEM* aItem );
const CLUSTERS SearchClusters( CLUSTER_SEARCH_MODE aMode, const KICAD_T aTypes[], const CLUSTERS SearchClusters( CLUSTER_SEARCH_MODE aMode, const KICAD_T aTypes[],
int aSingleNet ); int aSingleNet, CN_ITEM* rootItem = nullptr );
const CLUSTERS SearchClusters( CLUSTER_SEARCH_MODE aMode ); const CLUSTERS SearchClusters( CLUSTER_SEARCH_MODE aMode );
/** /**

30
pcbnew/connectivity/connectivity_data.cpp
View File

@ -438,23 +438,29 @@ void CONNECTIVITY_DATA::Clear()
} }
const std::vector<BOARD_CONNECTED_ITEM*> CONNECTIVITY_DATA::GetConnectedItems( const std::vector<BOARD_CONNECTED_ITEM*>
const BOARD_CONNECTED_ITEM* aItem, CONNECTIVITY_DATA::GetConnectedItems( const BOARD_CONNECTED_ITEM* aItem, const KICAD_T aTypes[],
const KICAD_T aTypes[], bool aIgnoreNetcodes ) const
bool aIgnoreNetcodes ) const
{ {
std::vector<BOARD_CONNECTED_ITEM*> rv; constexpr KICAD_T types[] = { PCB_TRACE_T, PCB_ARC_T, PCB_PAD_T, PCB_VIA_T, PCB_ZONE_T,
const auto clusters = m_connAlgo->SearchClusters( PCB_FOOTPRINT_T, EOT };
aIgnoreNetcodes ?
CN_CONNECTIVITY_ALGO::CSM_PROPAGATE :
CN_CONNECTIVITY_ALGO::CSM_CONNECTIVITY_CHECK, aTypes,
aIgnoreNetcodes ? -1 : aItem->GetNetCode() );
for( auto cl : clusters ) std::vector<BOARD_CONNECTED_ITEM*> rv;
CN_CONNECTIVITY_ALGO::CLUSTER_SEARCH_MODE searchMode;
if( aIgnoreNetcodes )
searchMode = CN_CONNECTIVITY_ALGO::CSM_PROPAGATE;
else
searchMode = CN_CONNECTIVITY_ALGO::CSM_CONNECTIVITY_CHECK;
const auto clusters = m_connAlgo->SearchClusters( searchMode, types,
aIgnoreNetcodes ? -1 : aItem->GetNetCode() );
for( const std::shared_ptr<CN_CLUSTER>& cl : clusters )
{ {
if( cl->Contains( aItem ) ) if( cl->Contains( aItem ) )
{ {
for( const auto item : *cl ) for( const CN_ITEM* item : *cl )
{ {
if( item->Valid() ) if( item->Valid() )
rv.push_back( item->Parent() ); rv.push_back( item->Parent() );

2
pcbnew/dialogs/dialog_track_via_properties.cpp
View File

@ -672,7 +672,7 @@ bool DIALOG_TRACK_VIA_PROPERTIES::TransferDataFromWindow()
for( EDA_ITEM* item : m_items ) for( EDA_ITEM* item : m_items )
{ {
const KICAD_T ourTypes[] = { PCB_TRACE_T, PCB_PAD_T, PCB_VIA_T, PCB_FOOTPRINT_T, EOT }; const KICAD_T ourTypes[] = { PCB_TRACE_T, PCB_ARC_T, PCB_PAD_T, PCB_VIA_T, PCB_FOOTPRINT_T, EOT };
BOARD_CONNECTED_ITEM* boardItem = static_cast<BOARD_CONNECTED_ITEM*>( item ); BOARD_CONNECTED_ITEM* boardItem = static_cast<BOARD_CONNECTED_ITEM*>( item );
auto connectedItems = connectivity->GetConnectedItems( boardItem, ourTypes, true ); auto connectedItems = connectivity->GetConnectedItems( boardItem, ourTypes, true );

7
pcbnew/drc/drc_test_provider_zone_connections.cpp
View File

@ -106,11 +106,11 @@ bool DRC_TEST_PROVIDER_ZONE_CONNECTIONS::Run()
if( m_drcEngine->IsErrorLimitExceeded( DRCE_STARVED_THERMAL ) ) if( m_drcEngine->IsErrorLimitExceeded( DRCE_STARVED_THERMAL ) )
return true; return true;
// Quick test for connected: // Quick test for "connected":
if( pad->GetNetCode() != zone->GetNetCode() || pad->GetNetCode() <= 0 ) if( pad->GetNetCode() != zone->GetNetCode() || pad->GetNetCode() <= 0 )
continue; continue;
// More thorough test for connected: // More thorough test for "connected", but still not layer-specific:
const KICAD_T type_zone[] = { PCB_ZONE_T, EOT }; const KICAD_T type_zone[] = { PCB_ZONE_T, EOT };
if( !alg::contains( connectivity->GetConnectedItems( pad, type_zone ), zone ) ) if( !alg::contains( connectivity->GetConnectedItems( pad, type_zone ), zone ) )
@ -156,7 +156,8 @@ bool DRC_TEST_PROVIDER_ZONE_CONNECTIONS::Run()
} }
} }
if( spokes < minCount ) // Note that spokes > 0 is our final "connected" test.
if( spokes > 0 && spokes < minCount )
{ {
std::shared_ptr<DRC_ITEM> drce = DRC_ITEM::Create( DRCE_STARVED_THERMAL ); std::shared_ptr<DRC_ITEM> drce = DRC_ITEM::Create( DRCE_STARVED_THERMAL );