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

Immediate update of no-net objects when they're connected to something else. 

Fixes https://gitlab.com/kicad/code/kicad/issues/13601
This commit is contained in:
Jeff Young 2023-01-23 11:38:47 +00:00
parent 4a55b7998a
commit c430c88f9d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -572,14 +572,16 @@ void CN_CONNECTIVITY_ALGO::propagateConnections( BOARD_COMMIT* aCommit, PROPAGAT
{
if( resolveConflicts )
{
wxLogTrace( wxT( "CN" ), wxT( "Conflicting nets in cluster %p; chose %d (%s)" ),
wxLogTrace( wxT( "CN" ),
wxT( "Conflicting nets in cluster %p; chose %d (%s)" ),
cluster.get(),
cluster->OriginNet(),
cluster->OriginNetName() );
}
else
{
wxLogTrace( wxT( "CN" ), wxT( "Conflicting nets in cluster %p; skipping update" ),
wxLogTrace( wxT( "CN" ),
wxT( "Conflicting nets in cluster %p; skipping update" ),
cluster.get() );
}
}
@ -589,12 +591,13 @@ void CN_CONNECTIVITY_ALGO::propagateConnections( BOARD_COMMIT* aCommit, PROPAGAT
for( CN_ITEM* item : *cluster )
{
bool isFreePad = item->Parent()->Type() == PCB_PAD_T
&& static_cast<PAD*>( item->Parent() )->IsFreePad();
if( ( resolveConflicts && item->CanChangeNet() ) || isFreePad )
if( item->Valid() && item->CanChangeNet()
&& item->Parent()->GetNetCode() != cluster->OriginNet() )
{
if( item->Valid() && item->Parent()->GetNetCode() != cluster->OriginNet() )
bool isFreePad = item->Parent()->Type() == PCB_PAD_T
&& static_cast<PAD*>( item->Parent() )->IsFreePad();
if( !cluster->IsConflicting() || resolveConflicts || isFreePad )
{
MarkNetAsDirty( item->Parent()->GetNetCode() );
MarkNetAsDirty( cluster->OriginNet() );