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

no point in removing from netclass incrementally since an entire list rebuild is done below

This commit is contained in:
dickelbeck 2009-08-17 12:11:09 +00:00
parent 85dc98a58a
commit d21ced6288
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/class_netclass.cpp
View File

@ -163,12 +163,13 @@ void BOARD::SynchronizeNetsAndNetClasses()
} }
// Add netclass name and pointer to nets. If a net is in more than one netclass, // Add netclass name and pointer to nets. If a net is in more than one netclass,
// remove it from all but the first netclass in which it resides. // set the net's name and pointer to only the first netclass. Subsequent
// and therefore bogus netclass memberships will be deleted in logic below this loop.
for( NETCLASSES::iterator clazz=m_NetClasses.begin(); clazz!=m_NetClasses.end(); ++clazz ) for( NETCLASSES::iterator clazz=m_NetClasses.begin(); clazz!=m_NetClasses.end(); ++clazz )
{ {
NETCLASS* netclass = clazz->second; NETCLASS* netclass = clazz->second;
for( NETCLASS::iterator member = netclass->begin(); member!=netclass->end(); ) for( NETCLASS::iterator member = netclass->begin(); member!=netclass->end(); ++member )
{ {
const wxString& netname = *member; const wxString& netname = *member;
@ -177,22 +178,9 @@ void BOARD::SynchronizeNetsAndNetClasses()
// think is a sequential search. // think is a sequential search.
NETINFO_ITEM* net = FindNet( netname ); NETINFO_ITEM* net = FindNet( netname );
if( !net ) // NET 'netname' does not exist, remove it from 'netclass' if( net && net->GetClassName() == NETCLASS::Default )
{
NETCLASS::iterator e = member++;
netclass->Remove( e );
}
else if( net->GetClassName() != NETCLASS::Default )
{
// 'net' is already in a non-default net class. This makes its
// entry in 'netclass' bogus, delete it.
NETCLASS::iterator e = member++;
netclass->Remove( e );
}
else
{ {
net->SetClass( netclass ); net->SetClass( netclass );
++member;
} }
} }
} }